Author: mladen.turk(a)jboss.com Date: 2007-12-19 03:15:16 -0500 (Wed, 19 Dec 2007) New Revision: 1253 Added: trunk/httpd/httpd-2.2/support/ trunk/httpd/httpd-2.2/support/NMAKEhtcacheclean trunk/httpd/httpd-2.2/support/NMAKEhtdbm trunk/httpd/httpd-2.2/support/NMAKEhtdigest trunk/httpd/httpd-2.2/support/NMAKEhtpasswd trunk/httpd/httpd-2.2/support/NMAKElogresolve trunk/httpd/httpd-2.2/support/NMAKEmakefile trunk/httpd/httpd-2.2/support/NMAKErotatelogs trunk/httpd/httpd-2.2/support/win32/ trunk/httpd/httpd-2.2/support/win32/NMAKEapachemonitor trunk/httpd/httpd-2.2/support/win32/NMAKEmakefile trunk/httpd/httpd-2.2/support/win32/NMAKEwintty Modified: trunk/httpd/httpd-2.2/NMAKEmakefile Log: Add support utilities make files Modified: trunk/httpd/httpd-2.2/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/NMAKEmakefile 2007-12-19 07:31:36 UTC (rev 1252) +++ trunk/httpd/httpd-2.2/NMAKEmakefile 2007-12-19 08:15:16 UTC (rev 1253) @@ -57,6 +57,8 @@ BUILDDEP = $(BUILDOUT)\libhttpd.dll BMODULES = $(SRCDIR)\modules\~ +BSUPPORT = $(SRCDIR)\support\~ +BWINSUPP = $(SRCDIR)\support\win32\~ all: $(BUILDINS) $(WORKDIR) $(BUILDBIN) @echo Building $(BUILDBIN) @@ -73,14 +75,26 @@ @$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) all @cd .. +$(BSUPPORT): + @echo Building support utilities ... + @cd $(SRCDIR)\support + @$(MAKE) -nologo -A -f NMAKEmakefile PREFIX=$(PREFIX) all + @cd .. +$(BWINSUPP): + @echo Building Windows support utilities ... + @cd $(SRCDIR)\support\win32 + @$(MAKE) -nologo -A -f NMAKEmakefile PREFIX=$(PREFIX) all + @cd ..\.. + + {$(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) $(BMODULES) $(OBJECTS) $(BUILDRES) +$(BUILDBIN): $(WORKDIR) $(BUILDDEP) $(BMODULES) $(BSUPPORT) $(BWINSUPP) $(OBJECTS) $(BUILDRES) $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) IF EXIST $(BUILDMFT) \ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 Added: trunk/httpd/httpd-2.2/support/NMAKEhtcacheclean =================================================================== --- trunk/httpd/httpd-2.2/support/NMAKEhtcacheclean (rev 0) +++ trunk/httpd/httpd-2.2/support/NMAKEhtcacheclean 2007-12-19 08:15:16 UTC (rev 1253) @@ -0,0 +1,63 @@ +# 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 Apache htcacheclean command line utility makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=EXE +PROJECT = htcacheclean + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\NMAKEcommon.inc> +!include <..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(APR) $(APU) $(API) +CFLAGS = $(CFLAGS) -DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).exe +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d "APP_FILE" /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="Apache htcacheclean command line utility" + +OBJECTS = \ + $(WORKDIR)\htcacheclean.obj \ + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +install: $(BUILDBIN) Property changes on: trunk/httpd/httpd-2.2/support/NMAKEhtcacheclean ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/httpd-2.2/support/NMAKEhtdbm =================================================================== --- trunk/httpd/httpd-2.2/support/NMAKEhtdbm (rev 0) +++ trunk/httpd/httpd-2.2/support/NMAKEhtdbm 2007-12-19 08:15:16 UTC (rev 1253) @@ -0,0 +1,63 @@ +# 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 Apache htdbm command line utility makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=EXE +PROJECT = htdbm + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\NMAKEcommon.inc> +!include <..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(APR) $(APU) $(API) +CFLAGS = $(CFLAGS) -DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).exe +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d "APP_FILE" /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="Apache htdbm command line utility" + +OBJECTS = \ + $(WORKDIR)\htdbm.obj \ + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +install: $(BUILDBIN) Property changes on: trunk/httpd/httpd-2.2/support/NMAKEhtdbm ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/httpd-2.2/support/NMAKEhtdigest =================================================================== --- trunk/httpd/httpd-2.2/support/NMAKEhtdigest (rev 0) +++ trunk/httpd/httpd-2.2/support/NMAKEhtdigest 2007-12-19 08:15:16 UTC (rev 1253) @@ -0,0 +1,63 @@ +# 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 Apache htdigest command line utility makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=EXE +PROJECT = htdigest + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\NMAKEcommon.inc> +!include <..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(APR) $(APU) $(API) +CFLAGS = $(CFLAGS) -DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).exe +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d "APP_FILE" /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="Apache htdigest command line utility" + +OBJECTS = \ + $(WORKDIR)\htdigest.obj \ + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +install: $(BUILDBIN) Property changes on: trunk/httpd/httpd-2.2/support/NMAKEhtdigest ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/httpd-2.2/support/NMAKEhtpasswd =================================================================== --- trunk/httpd/httpd-2.2/support/NMAKEhtpasswd (rev 0) +++ trunk/httpd/httpd-2.2/support/NMAKEhtpasswd 2007-12-19 08:15:16 UTC (rev 1253) @@ -0,0 +1,63 @@ +# 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 Apache htpasswd command line utility makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=EXE +PROJECT = htpasswd + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\NMAKEcommon.inc> +!include <..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(APR) $(APU) $(API) +CFLAGS = $(CFLAGS) -DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).exe +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d "APP_FILE" /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="Apache htpasswd command line utility" + +OBJECTS = \ + $(WORKDIR)\htpasswd.obj \ + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +install: $(BUILDBIN) Property changes on: trunk/httpd/httpd-2.2/support/NMAKEhtpasswd ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/httpd-2.2/support/NMAKElogresolve =================================================================== --- trunk/httpd/httpd-2.2/support/NMAKElogresolve (rev 0) +++ trunk/httpd/httpd-2.2/support/NMAKElogresolve 2007-12-19 08:15:16 UTC (rev 1253) @@ -0,0 +1,63 @@ +# 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 Apache logresolve command line utility makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=EXE +PROJECT = logresolve + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\NMAKEcommon.inc> +!include <..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(APR) $(APU) $(API) +CFLAGS = $(CFLAGS) -DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).exe +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d "APP_FILE" /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="Apache logresolve command line utility" + +OBJECTS = \ + $(WORKDIR)\logresolve.obj \ + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +install: $(BUILDBIN) Property changes on: trunk/httpd/httpd-2.2/support/NMAKElogresolve ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/httpd-2.2/support/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/support/NMAKEmakefile (rev 0) +++ trunk/httpd/httpd-2.2/support/NMAKEmakefile 2007-12-19 08:15:16 UTC (rev 1253) @@ -0,0 +1,49 @@ +# 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 aaa modules makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=EXE +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\NMAKEcommon.inc> +!include <..\NMAKEhttpd.inc> + +UTILS = \ + $(SRCDIR)\NMAKEhtdbm \ + $(SRCDIR)\NMAKEhtcacheclean \ + $(SRCDIR)\NMAKEhtdigest \ + $(SRCDIR)\NMAKEhtpasswd \ + $(SRCDIR)\NMAKElogresolve \ + $(SRCDIR)\NMAKErotatelogs + + +$(UTILS): + @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + +$(WORKDIR): + @$(MAKEWORKDIR) + +all: $(WORKDIR) $(UTILS) + @xcopy "$(WORKDIR)\*.exe" "$(BUILDOUT)" /Y /Q 2>NUL Property changes on: trunk/httpd/httpd-2.2/support/NMAKEmakefile ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/httpd-2.2/support/NMAKErotatelogs =================================================================== --- trunk/httpd/httpd-2.2/support/NMAKErotatelogs (rev 0) +++ trunk/httpd/httpd-2.2/support/NMAKErotatelogs 2007-12-19 08:15:16 UTC (rev 1253) @@ -0,0 +1,63 @@ +# 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 Apache rotatelogs command line utility makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=EXE +PROJECT = rotatelogs + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\NMAKEcommon.inc> +!include <..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(APR) $(APU) $(API) +CFLAGS = $(CFLAGS) -DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).exe +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d "APP_FILE" /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="Apache rotatelogs command line utility" + +OBJECTS = \ + $(WORKDIR)\rotatelogs.obj \ + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +install: $(BUILDBIN) Property changes on: trunk/httpd/httpd-2.2/support/NMAKErotatelogs ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/httpd-2.2/support/win32/NMAKEapachemonitor =================================================================== --- trunk/httpd/httpd-2.2/support/win32/NMAKEapachemonitor (rev 0) +++ trunk/httpd/httpd-2.2/support/win32/NMAKEapachemonitor 2007-12-19 08:15:16 UTC (rev 1253) @@ -0,0 +1,67 @@ +# 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 ApacheMonitor makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=GUI +PROJECT = ApacheMonitor + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib ole32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib $(APR) $(APU) $(API) +CFLAGS = $(CFLAGS) -DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC -DSTRICT + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).exe +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d "APP_FILE" + +OBJECTS = \ + $(WORKDIR)\ApacheMonitor.obj \ + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(WORKDIR): + @$(MAKEWORKDIR) + +$(BUILDRES): ApacheMonitor.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ApacheMonitor.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +install: $(WORKDIR) $(BUILDBIN) + @xcopy "$(WORKDIR)\*.exe" "$(BUILDOUT)" /Y /Q 2>NUL Property changes on: trunk/httpd/httpd-2.2/support/win32/NMAKEapachemonitor ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/httpd-2.2/support/win32/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/support/win32/NMAKEmakefile (rev 0) +++ trunk/httpd/httpd-2.2/support/win32/NMAKEmakefile 2007-12-19 08:15:16 UTC (rev 1253) @@ -0,0 +1,44 @@ +# 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 aaa modules makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=EXE +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +WINUTILS = \ + $(SRCDIR)\NMAKEwintty \ + $(SRCDIR)\NMAKEapachemonitor + +$(WINUTILS): + @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + +$(WORKDIR): + @$(MAKEWORKDIR) + +all: $(WORKDIR) $(WINUTILS) + @xcopy "$(WORKDIR)\*.exe" "$(BUILDOUT)" /Y /Q 2>NUL Property changes on: trunk/httpd/httpd-2.2/support/win32/NMAKEmakefile ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/httpd-2.2/support/win32/NMAKEwintty =================================================================== --- trunk/httpd/httpd-2.2/support/win32/NMAKEwintty (rev 0) +++ trunk/httpd/httpd-2.2/support/win32/NMAKEwintty 2007-12-19 08:15:16 UTC (rev 1253) @@ -0,0 +1,63 @@ +# 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 Apache wintty console pipe makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=EXE +PROJECT = wintty + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(APR) $(APU) $(API) +CFLAGS = $(CFLAGS) -DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).exe +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d "APP_FILE" /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="Apache wintty console pipe" + +OBJECTS = \ + $(WORKDIR)\wintty.obj \ + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +install: $(BUILDBIN) Property changes on: trunk/httpd/httpd-2.2/support/win32/NMAKEwintty ___________________________________________________________________ Name: svn:eol-style + native