12:37 p.m.
Author: mladen.turk(a)jboss.com
Date: 2007-12-13 13:37:43 -0500 (Thu, 13 Dec 2007)
New Revision: 1209
Modified:
trunk/httpd/NMAKEmakefile
Log:
Make libhttpd as only dependency (for now)
Modified: trunk/httpd/NMAKEmakefile
===================================================================
--- trunk/httpd/NMAKEmakefile 2007-12-13 18:26:33 UTC (rev 1208)
+++ trunk/httpd/NMAKEmakefile 2007-12-13 18:37:43 UTC (rev 1209)
@@ -1,117 +1,81 @@
-# Copyright 2001-2007 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ====================================================================
-#
-# NMAKEmakefile Master HTTPD makefile.
-# Usage:
-# DEBUG=1 Build DEBUG version of HTTPD
-#
-# Originally contributed by Mladen Turk <mturk redhat.com>
-#
-# ====================================================================
-#
-
-
-TARGET=EXE
-PROJECT = httpd
-
-!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
-SRCDIR = .
-!ENDIF
-
-!include <NMAKEcommon.inc>
-
-LDIRS = /libpath:"$(SRCDIR)\srclib\apr\$(WORKDIR_DLL)"
/libpath:"$(SRCDIR)\srclib\apr-iconv\$(WORKDIR_DLL)"
/libpath:"$(SRCDIR)\srclib\apr-util\$(WORKDIR_DLL)"
-LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib
libapr-1.lib libapriconv-1.lib libaprutil-1.lib
-
-INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\srclib\apr\include
-I$(SRCDIR)\srclib\apr-util\include
-PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
-OBJECTS = \
- $(WORKDIR)\main.obj
-
-HEADERS = \
- $(SRCDIR)\include\os.h \
- $(SRCDIR)\include\mpm.h \
- $(SRCDIR)\include\mpm_default.h
-
-BUILDLIB = $(PREFIX)\lib
-
-BUILDBIN = $(WORKDIR)\$(PROJECT).exe
-BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
-BUILDRES = $(WORKDIR)\$(PROJECT).res
-BUILDMAN = $(BUILDBIN).manifest
-
-RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).exe" /d LONG_NAME="Apache
HTTP Server" /d ICON_FILE="apache.ico"
-
-BUILDAPR = $(SRCDIR)\srclib\apr\$(WORKDIR_DLL)\libapr-1.dll
-BUILDAPI = $(SRCDIR)\srclib\apr-iconv\$(WORKDIR_DLL)\libapriconv-1.dll
-BUILDAPU = $(SRCDIR)\srclib\apr-util\$(WORKDIR_DLL)\libaprutil-1.dll
-BUILDPCRE = $(SRCDIR)\srclib\pcre\$(WORKDIR_LIB)\pcre.lib
-
-
-all : $(WORKDIR) $(BUILDLIB) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE)
$(BUILDBIN)
-
-$(BUILDLIB) :
- @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
-
-$(WORKDIR) :
- @$(MAKEWORKDIR)
-
-.SUFFIXES : .h
-
-$(BUILDAPR) :
- cd $(SRCDIR)\srclib\apr
- $(MAKE) -f NMAKEmakefile
- cd ..\..
-
-$(BUILDAPU) :
- cd $(SRCDIR)\srclib\apr-util
- $(MAKE) -f NMAKEmakefile
- cd ..\..
-
-$(BUILDAPI) :
- cd $(SRCDIR)\srclib\apr-iconv
- $(MAKE) -f NMAKEmakefile
- cd ..\..
-
-$(BUILDPCRE) :
- cd $(SRCDIR)\srclib\pcre
- $(MAKE) -f NMAKEmakefile PCRE_STATIC=1
- cd ..\..
-
-{$(SRCDIR)\server}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-$(SRCDIR)\include\os.h:
- @copy /Y $(SRCDIR)\os\win32\os.h $@ >NUL
-
-$(SRCDIR)\include\mpm.h:
- @copy /Y $(SRCDIR)\server\mpm\winnt\mpm.h $@ >NUL
-
-$(SRCDIR)\include\mpm_default.h:
- @copy /Y $(SRCDIR)\server\mpm\winnt\mpm_default.h $@ >NUL
-
-$(BUILDRES): build\win32\httpd.rc
- $(RC) $(RCFLAGS) /i "$(SRCDIR)\build\win32" /i "$(SRCDIR)\include"
/i "$(SRCDIR)\srclib\apr\include" /fo $(BUILDRES) build\win32\httpd.rc
-$(BUILDBIN): $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE)
$(OBJECTS) $(BUILDRES)
- $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB)
/out:$(BUILDBIN)
- IF EXIST $(BUILDMAN) \
- mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2
-clean:
- @$(CLEANTARGET)
-
-install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN)
- @xcopy "$(WORKDIR)\*.exe" "$(BUILDLIB)" /Y /Q 2>NUL
+# Copyright 2001-2007 The Apache Software Foundation or its licensors, as
+# applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ====================================================================
+#
+# NMAKEmakefile Master HTTPD makefile.
+# Usage:
+# DEBUG=1 Build DEBUG version of HTTPD
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+
+TARGET=EXE
+PROJECT = httpd
+
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <NMAKEcommon.inc>
+
+LDIRS = /libpath:"$(SRCDIR)\$(WORKDIR_DLL)"
/libpath:"$(SRCDIR)\srclib\apr\$(WORKDIR_DLL)"
/libpath:"$(SRCDIR)\srclib\apr-util\$(WORKDIR_DLL)"
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib
+LIBS = $(LIBS) libapr-1.lib libaprutil-1.lib libhttpd.lib
+
+INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\srclib\apr\include
-I$(SRCDIR)\srclib\apr-util\include
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+OBJECTS = \
+ $(WORKDIR)\main.obj
+
+BUILDLIB = $(PREFIX)\lib
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).exe
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMAN = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).exe" /d LONG_NAME="Apache
HTTP Server" /d ICON_FILE="apache.ico"
+
+BUILDDEP = $(WORKDIR_DLL)\libhttpd.dll
+
+all : $(WORKDIR) $(BUILDLIB) $(BUILDDEP) $(BUILDBIN)
+
+$(BUILDLIB) :
+ @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
+
+$(WORKDIR) :
+ @$(MAKEWORKDIR)
+
+$(BUILDDEP) :
+ $(MAKE) -f NMAKElibhttpd PREFIX=$(PREFIX)
+
+{$(SRCDIR)\server}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+$(BUILDRES): build\win32\httpd.rc
+ $(RC) $(RCFLAGS) /i "$(SRCDIR)\build\win32" /i "$(SRCDIR)\include"
/i "$(SRCDIR)\srclib\apr\include" /fo $(BUILDRES) build\win32\httpd.rc
+$(BUILDBIN): $(WORKDIR) $(BUILDDEP) $(OBJECTS) $(BUILDRES)
+ $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB)
/out:$(BUILDBIN)
+ IF EXIST $(BUILDMAN) \
+ mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2
+clean:
+ @$(CLEANTARGET)
+
+install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN)
+ @xcopy "$(WORKDIR)\*.exe" "$(BUILDLIB)" /Y /Q 2>NUL