Author: mladen.turk(a)jboss.com Date: 2007-12-14 07:39:44 -0500 (Fri, 14 Dec 2007) New Revision: 1214 Added: trunk/httpd2/ Removed: trunk/httpd/ Modified: trunk/httpd2/NMAKEmakefile Log: Move stapp 1 Copied: trunk/httpd2 (from rev 1213, trunk/httpd) Modified: trunk/httpd2/NMAKEmakefile =================================================================== --- trunk/httpd/NMAKEmakefile 2007-12-14 11:54:33 UTC (rev 1213) +++ trunk/httpd2/NMAKEmakefile 2007-12-14 12:39:44 UTC (rev 1214) @@ -1,89 +1,89 @@ -# 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 - -!IF !DEFINED(PREFIX) || "$(PREFIX)" == "" -PREFIX = $(SRCDIR)\dist\WINNT-$(CPU) -!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 -BUILDOUT = $(PREFIX)\bin - -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) $(BUILDOUT) $(BUILDDEP) $(BUILDBIN) - -$(BUILDLIB) : - @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" - -$(BUILDOUT) : - @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)" - -$(WORKDIR) : - @$(MAKEWORKDIR) - -$(BUILDDEP) : - $(MAKE) -f NMAKElibhttpd PREFIX=$(PREFIX) install - -{$(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) $(BUILDOUT) $(WORKDIR) $(BUILDBIN) - @xcopy "$(WORKDIR)\*.exe" "$(BUILDOUT)" /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 + +!IF !DEFINED(PREFIX) || "$(PREFIX)" == "" +PREFIX = $(SRCDIR)\dist\WINNT-$(CPU) +!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 +BUILDOUT = $(PREFIX)\bin + +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) $(BUILDOUT) $(BUILDDEP) $(BUILDBIN) + +$(BUILDLIB) : + @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" + +$(BUILDOUT) : + @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)" + +$(WORKDIR) : + @$(MAKEWORKDIR) + +$(BUILDDEP) : + $(MAKE) -f NMAKElibhttpd PREFIX=$(PREFIX) install + +{$(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) $(BUILDOUT) $(WORKDIR) $(BUILDBIN) + @xcopy "$(WORKDIR)\*.exe" "$(BUILDOUT)" /Y /Q 2>NUL