Author: mladen.turk(a)jboss.com Date: 2007-12-18 09:26:00 -0500 (Tue, 18 Dec 2007) New Revision: 1241 Modified: trunk/httpd/httpd-2.2/NMAKEhttpd.inc trunk/httpd/httpd-2.2/NMAKElibhttpd trunk/httpd/httpd-2.2/server/NMAKEmakefile Log: Make sure we have correct binaries for cross compile Modified: trunk/httpd/httpd-2.2/NMAKEhttpd.inc =================================================================== --- trunk/httpd/httpd-2.2/NMAKEhttpd.inc 2007-12-18 11:07:16 UTC (rev 1240) +++ trunk/httpd/httpd-2.2/NMAKEhttpd.inc 2007-12-18 14:26:00 UTC (rev 1241) @@ -61,4 +61,3 @@ @if not exist "$(@D)\$(NULL)" mkdir $(@D) $(BUILDINS): $(DISTSUBDIRS) - @copy /Y LICENSE $@ >NUL Modified: trunk/httpd/httpd-2.2/NMAKElibhttpd =================================================================== --- trunk/httpd/httpd-2.2/NMAKElibhttpd 2007-12-18 11:07:16 UTC (rev 1240) +++ trunk/httpd/httpd-2.2/NMAKElibhttpd 2007-12-18 14:26:00 UTC (rev 1241) @@ -107,7 +107,7 @@ BUILDAPU = $(BUILDOUT)\libaprutil-1.dll BUILDZLIB = $(BUILDLIB)\zlib-1.lib BUILDPCRE = $(BUILDLIB)\pcre.lib -BUILDTCHR = $(SRCDIR)\server\$(WORKDIR_EXE)\gen_test_char.exe +BUILDTCHR = $(SRCDIR)\server\gen_test_char.exe all: $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDZLIB) $(BUILDBIN) @@ -120,40 +120,40 @@ @copy /Y LICENSE $@ >NUL $(BUILDAPR): - cd $(SRCDIR)\srclib\apr + @cd $(SRCDIR)\srclib\apr @$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) install @$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) APR_DECLARE_STATIC=1 install - cd ..\.. + @cd ..\.. $(BUILDAPU): - cd $(SRCDIR)\srclib\apr-util + @cd $(SRCDIR)\srclib\apr-util @$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) install @$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) APR_DECLARE_STATIC=1 install - cd ..\.. + @cd ..\.. $(BUILDAPI): - cd $(SRCDIR)\srclib\apr-iconv + @cd $(SRCDIR)\srclib\apr-iconv @$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) install @$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) APR_DECLARE_STATIC=1 install - cd ..\.. + @cd ..\.. $(BUILDPCRE): - cd $(SRCDIR)\srclib\pcre + @cd $(SRCDIR)\srclib\pcre @$(MAKE) -nologo -f NMAKEmakefile PCRE_STATIC=1 PREFIX=$(PREFIX) install - cd ..\.. + @cd ..\.. $(BUILDZLIB): - cd $(SRCDIR)\srclib\zlib + @cd $(SRCDIR)\srclib\zlib @$(MAKE) -nologo -f NMAKEmakefile ZLIB_DECLARE_STATIC=1 PREFIX=$(PREFIX) install - cd ..\.. + @cd ..\.. $(BUILDTCHR): - cd $(SRCDIR)\server - @$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) - cd .. + @cd $(SRCDIR)\server + @$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) install + @cd .. $(SRCDIR)\server\test_char.h : $(BUILDAPR) $(BUILDTCHR) - $(BUILDTCHR) > $@ + @$(BUILDTCHR) > $@ {$(SRCDIR)\server}.c{$(WORKDIR)}.obj: $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< @@ -202,7 +202,7 @@ $(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) $(BUILDZLIB) $(OBJECTS) $(BUILDRES) +$(BUILDBIN): $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDZLIB) $(OBJECTS) $(BUILDTCHR) $(BUILDRES) $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) IF EXIST $(BUILDMFT) \ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 Modified: trunk/httpd/httpd-2.2/server/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/server/NMAKEmakefile 2007-12-18 11:07:16 UTC (rev 1240) +++ trunk/httpd/httpd-2.2/server/NMAKEmakefile 2007-12-18 14:26:00 UTC (rev 1241) @@ -60,3 +60,6 @@ clean: @$(CLEANTARGET) + +install : $(WORKDIR) $(BUILDBIN) + @copy /Y $(BUILDBIN) $(SRCDIR)