jbossnative-commits
December 2007
jbossnative-commits@lists.jboss.org
- 2 participants
- 107 discussions
JBoss Native SVN: r1238 - trunk/httpd/httpd-2.2/modules/filters.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-18 05:07:23 -0500 (Tue, 18 Dec 2007)
New Revision: 1238
Added:
trunk/httpd/httpd-2.2/modules/filters/NMAKEdeflate
trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile
Log:
Add deflate module with statically linked zlib
Added: trunk/httpd/httpd-2.2/modules/filters/NMAKEdeflate
===================================================================
--- trunk/httpd/httpd-2.2/modules/filters/NMAKEdeflate (rev 0)
+++ trunk/httpd/httpd-2.2/modules/filters/NMAKEdeflate 2007-12-18 10:07:23 UTC (rev 1238)
@@ -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 deflate module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_deflate
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD) zlib-1.lib
+CFLAGS = $(CFLAGS) -DHAVE_ZUTIL_H -DZLIB_WINAPI
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="deflate_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_deflate.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/modules/filters/NMAKEdeflate
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile (rev 0)
+++ trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile 2007-12-18 10:07:23 UTC (rev 1238)
@@ -0,0 +1,43 @@
+# 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 filter modules makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
+
+MODULES = \
+ $(SRCDIR)\NMAKEdeflate
+
+$(MODULES):
+ @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+
+$(WORKDIR):
+ @$(MAKEWORKDIR)
+
+install: $(WORKDIR) $(MODULES)
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
Property changes on: trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile
___________________________________________________________________
Name: svn:eol-style
+ native
16 years, 4 months
- 1
- 0
JBoss Native SVN: r1237 - trunk/httpd/httpd-2.2/modules/dav/fs.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-18 05:06:07 -0500 (Tue, 18 Dec 2007)
New Revision: 1237
Modified:
trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEdavfs
Log:
No need to copy the .lib
Modified: trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEdavfs
===================================================================
--- trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEdavfs 2007-12-18 09:58:54 UTC (rev 1236)
+++ trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEdavfs 2007-12-18 10:06:07 UTC (rev 1237)
@@ -63,4 +63,3 @@
mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
install: $(BUILDBIN)
- @xcopy "$(WORKDIR)\$(PROJECT).lib" "$(BUILDLIB)" /Y /Q
16 years, 4 months
- 1
- 0
JBoss Native SVN: r1236 - in trunk/httpd/httpd-2.2: srclib/zlib and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-18 04:58:54 -0500 (Tue, 18 Dec 2007)
New Revision: 1236
Modified:
trunk/httpd/httpd-2.2/NMAKElibhttpd
trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile
Log:
Add zlib to the build dependencies
Modified: trunk/httpd/httpd-2.2/NMAKElibhttpd
===================================================================
--- trunk/httpd/httpd-2.2/NMAKElibhttpd 2007-12-18 09:39:45 UTC (rev 1235)
+++ trunk/httpd/httpd-2.2/NMAKElibhttpd 2007-12-18 09:58:54 UTC (rev 1236)
@@ -105,10 +105,11 @@
BUILDAPR = $(BUILDOUT)\libapr-1.dll
BUILDAPI = $(BUILDOUT)\libapriconv-1.dll
BUILDAPU = $(BUILDOUT)\libaprutil-1.dll
+BUILDZLIB = $(BUILDLIB)\zlib-1.lib
BUILDPCRE = $(BUILDLIB)\pcre.lib
BUILDTCHR = $(SRCDIR)\server\$(WORKDIR_EXE)\gen_test_char.exe
-all: $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDBIN)
+all: $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDZLIB) $(BUILDBIN)
$(WORKDIR):
@$(MAKEWORKDIR)
@@ -141,6 +142,11 @@
@$(MAKE) -nologo -f NMAKEmakefile PCRE_STATIC=1 PREFIX=$(PREFIX) install
cd ..\..
+$(BUILDZLIB):
+ cd $(SRCDIR)\srclib\zlib
+ @$(MAKE) -nologo -f NMAKEmakefile ZLIB_DECLARE_STATIC=1 PREFIX=$(PREFIX) install
+ cd ..\..
+
$(BUILDTCHR):
cd $(SRCDIR)\server
@$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX)
@@ -196,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) $(OBJECTS) $(BUILDRES)
+$(BUILDBIN): $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDZLIB) $(OBJECTS) $(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/srclib/zlib/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile 2007-12-18 09:39:45 UTC (rev 1235)
+++ trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile 2007-12-18 09:58:54 UTC (rev 1236)
@@ -1,4 +1,4 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
+# Copyright 2001-2007 The Apache Software Foundation or its licensors, as
# applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,7 @@
# ASM=1 Use Masm
# DEBUG=1 Build DEBUG version of Zlib
#
-# Originally contributed by Mladen Turk <mturk jboss.com>
+# Originally contributed by Mladen Turk <mturk redhat.com>
#
# ====================================================================
#
@@ -29,17 +29,18 @@
!IF !DEFINED(ZLIB_DECLARE_STATIC) || "$(ZLIB_DECLARE_STATIC)" == ""
TARGET=DLL
PROJECT = libzlib-1
-CFLAGS = -DZLIB_DLL -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS)
+CFLAGS = -DZLIB_DLL $(CFLAGS)
!ELSE
TARGET=LIB
PROJECT = zlib-1
-CFLAGS = -DZLIB_WINAPI -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS)
+CFLAGS = -DZLIB_WINAPI $(CFLAGS)
!ENDIF
!IF "$(CPU)" != "I386"
CFLAGS = -GS- $(CFLAGS)
!ENDIF
+CFLAGS = $(CFLAGS) -D_CRT_SECURE_NO_DEPRECATE
# CFLAGS = -wd4996 $(CFLAGS)
!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
@@ -93,7 +94,7 @@
BUILDBIN = $(WORKDIR)\$(PROJECT).lib
!ENDIF
-all : $(BUILDINS) $(WORKDIR) $(BUILDBIN)
+all : $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN)
$(WORKDIR) :
@$(MAKEWORKDIR)
@@ -135,7 +136,7 @@
clean:
@$(CLEANTARGET)
-install: $(BUILDINS) $(WORKDIR) $(BUILDBIN)
+install: $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(WORKDIR) $(BUILDBIN)
@xcopy "$(SRCDIR)\zlib.h" "$(BUILDINC)" /Y /Q
@xcopy "$(SRCDIR)\zconf.h" "$(BUILDINC)" /Y /Q
@xcopy "$(SRCDIR)\zutil.h" "$(BUILDINC)" /Y /Q
16 years, 4 months
- 1
- 0
JBoss Native SVN: r1235 - in trunk/httpd/httpd-2.2/modules/dav: fs and 1 other directories.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-18 04:39:45 -0500 (Tue, 18 Dec 2007)
New Revision: 1235
Added:
trunk/httpd/httpd-2.2/modules/dav/fs/
trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEdavfs
trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/dav/main/
trunk/httpd/httpd-2.2/modules/dav/main/NMAKEdav
trunk/httpd/httpd-2.2/modules/dav/main/NMAKEmakefile
Log:
Add dav module makefiles
Added: trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEdavfs
===================================================================
--- trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEdavfs (rev 0)
+++ trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEdavfs 2007-12-18 09:39:45 UTC (rev 1235)
@@ -0,0 +1,66 @@
+# 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 dav_fs module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_dav_fs
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD) mod_dav.lib
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="dav_fs for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\dbm.obj \
+ $(WORKDIR)\lock.obj \
+ $(WORKDIR)\repos.obj \
+ $(WORKDIR)\mod_dav_fs.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)
+ @xcopy "$(WORKDIR)\$(PROJECT).lib" "$(BUILDLIB)" /Y /Q
Property changes on: trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEdavfs
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEmakefile (rev 0)
+++ trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEmakefile 2007-12-18 09:39:45 UTC (rev 1235)
@@ -0,0 +1,42 @@
+# 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 dav fs modules makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\..\..\NMAKEcommon.inc>
+!include <..\..\..\NMAKEhttpd.inc>
+
+MODULES = \
+ $(SRCDIR)\NMAKEdavfs
+
+$(MODULES):
+ @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+
+$(WORKDIR):
+ @$(MAKEWORKDIR)
+
+install: $(WORKDIR) $(MODULES)
Property changes on: trunk/httpd/httpd-2.2/modules/dav/fs/NMAKEmakefile
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/dav/main/NMAKEdav
===================================================================
--- trunk/httpd/httpd-2.2/modules/dav/main/NMAKEdav (rev 0)
+++ trunk/httpd/httpd-2.2/modules/dav/main/NMAKEdav 2007-12-18 09:39:45 UTC (rev 1235)
@@ -0,0 +1,70 @@
+# 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 dav module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_dav
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+CFLAGS = $(CFLAGS) -DDAV_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="dav_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\liveprop.obj \
+ $(WORKDIR)\props.obj \
+ $(WORKDIR)\providers.obj \
+ $(WORKDIR)\std_liveprop.obj \
+ $(WORKDIR)\util.obj \
+ $(WORKDIR)\util_lock.obj \
+ $(WORKDIR)\mod_dav.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)
+ @xcopy "$(WORKDIR)\$(PROJECT).lib" "$(BUILDLIB)" /Y /Q
Property changes on: trunk/httpd/httpd-2.2/modules/dav/main/NMAKEdav
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/dav/main/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/dav/main/NMAKEmakefile (rev 0)
+++ trunk/httpd/httpd-2.2/modules/dav/main/NMAKEmakefile 2007-12-18 09:39:45 UTC (rev 1235)
@@ -0,0 +1,43 @@
+# 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 dav main modules makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\..\..\NMAKEcommon.inc>
+!include <..\..\..\NMAKEhttpd.inc>
+
+MODULES = \
+ $(SRCDIR)\NMAKEdav
+
+$(MODULES):
+ @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+
+$(WORKDIR):
+ @$(MAKEWORKDIR)
+
+install: $(WORKDIR) $(MODULES)
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
Property changes on: trunk/httpd/httpd-2.2/modules/dav/main/NMAKEmakefile
___________________________________________________________________
Name: svn:eol-style
+ native
16 years, 4 months
- 1
- 0
JBoss Native SVN: r1234 - trunk/httpd/httpd-2.2/modules/cache.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-18 04:24:34 -0500 (Tue, 18 Dec 2007)
New Revision: 1234
Added:
trunk/httpd/httpd-2.2/modules/cache/NMAKEcache
trunk/httpd/httpd-2.2/modules/cache/NMAKEdiskcache
trunk/httpd/httpd-2.2/modules/cache/NMAKEfilecache
trunk/httpd/httpd-2.2/modules/cache/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/cache/NMAKEmemcache
Log:
Add cache module makefiles
Added: trunk/httpd/httpd-2.2/modules/cache/NMAKEcache
===================================================================
--- trunk/httpd/httpd-2.2/modules/cache/NMAKEcache (rev 0)
+++ trunk/httpd/httpd-2.2/modules/cache/NMAKEcache 2007-12-18 09:24:34 UTC (rev 1234)
@@ -0,0 +1,68 @@
+# 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 cache module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_cache
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+CFLAGS = $(CFLAGS) -DCACHE_DECLARE_EXPORT -DMOD_CACHE_EXPORTS
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="cache_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\cache_cache.obj \
+ $(WORKDIR)\cache_hash.obj \
+ $(WORKDIR)\cache_pqueue.obj \
+ $(WORKDIR)\cache_storage.obj \
+ $(WORKDIR)\cache_util.obj \
+ $(WORKDIR)\mod_cache.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/modules/cache/NMAKEcache
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/cache/NMAKEdiskcache
===================================================================
--- trunk/httpd/httpd-2.2/modules/cache/NMAKEdiskcache (rev 0)
+++ trunk/httpd/httpd-2.2/modules/cache/NMAKEdiskcache 2007-12-18 09:24:34 UTC (rev 1234)
@@ -0,0 +1,62 @@
+# 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 disk_cache module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_disk_cache
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD) $(WORKDIR)\mod_cache.lib
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="disk_cache_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_disk_cache.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/modules/cache/NMAKEdiskcache
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/cache/NMAKEfilecache
===================================================================
--- trunk/httpd/httpd-2.2/modules/cache/NMAKEfilecache (rev 0)
+++ trunk/httpd/httpd-2.2/modules/cache/NMAKEfilecache 2007-12-18 09:24:34 UTC (rev 1234)
@@ -0,0 +1,62 @@
+# 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 file_cache module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_file_cache
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD) $(WORKDIR)\mod_cache.lib
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="file_cache_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_file_cache.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/modules/cache/NMAKEfilecache
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/cache/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/cache/NMAKEmakefile (rev 0)
+++ trunk/httpd/httpd-2.2/modules/cache/NMAKEmakefile 2007-12-18 09:24:34 UTC (rev 1234)
@@ -0,0 +1,46 @@
+# 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 database modules makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
+
+MODULES = \
+ $(SRCDIR)\NMAKEcache \
+ $(SRCDIR)\NMAKEdiskcache \
+ $(SRCDIR)\NMAKEfilecache \
+ $(SRCDIR)\NMAKEmemcache
+
+$(MODULES):
+ @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+
+$(WORKDIR):
+ @$(MAKEWORKDIR)
+
+install: $(WORKDIR) $(MODULES)
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
Property changes on: trunk/httpd/httpd-2.2/modules/cache/NMAKEmakefile
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/cache/NMAKEmemcache
===================================================================
--- trunk/httpd/httpd-2.2/modules/cache/NMAKEmemcache (rev 0)
+++ trunk/httpd/httpd-2.2/modules/cache/NMAKEmemcache 2007-12-18 09:24:34 UTC (rev 1234)
@@ -0,0 +1,62 @@
+# 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 mem_cache module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_mem_cache
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD) $(WORKDIR)\mod_cache.lib
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="mem_cache_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_mem_cache.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/modules/cache/NMAKEmemcache
___________________________________________________________________
Name: svn:eol-style
+ native
16 years, 4 months
- 1
- 0
JBoss Native SVN: r1233 - in trunk/httpd/httpd-2.2/modules: arch/win32 and 1 other directories.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-18 04:12:34 -0500 (Tue, 18 Dec 2007)
New Revision: 1233
Modified:
trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthnfile
trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthnzldap
trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzdbm
trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzdefault
trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzgroupfile
trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzhost
trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzuser
trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEisapi
trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/database/NMAKEdbd
Log:
Remove extra trailing backslash
Modified: trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthnfile
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthnfile 2007-12-18 09:06:55 UTC (rev 1232)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthnfile 2007-12-18 09:12:34 UTC (rev 1233)
@@ -47,7 +47,7 @@
RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authn_file_module for Apache"
OBJECTS = \
- $(WORKDIR)\mod_authn_file.obj \
+ $(WORKDIR)\mod_authn_file.obj
{$(SRCDIR)}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
Modified: trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthnzldap
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthnzldap 2007-12-18 09:06:55 UTC (rev 1232)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthnzldap 2007-12-18 09:12:34 UTC (rev 1233)
@@ -47,7 +47,7 @@
RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authnz_ldap_module for Apache"
OBJECTS = \
- $(WORKDIR)\mod_authnz_ldap.obj \
+ $(WORKDIR)\mod_authnz_ldap.obj
{$(SRCDIR)}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
Modified: trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzdbm
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzdbm 2007-12-18 09:06:55 UTC (rev 1232)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzdbm 2007-12-18 09:12:34 UTC (rev 1233)
@@ -47,7 +47,7 @@
RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authz_dbm_module for Apache"
OBJECTS = \
- $(WORKDIR)\mod_authz_dbm.obj \
+ $(WORKDIR)\mod_authz_dbm.obj
{$(SRCDIR)}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
Modified: trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzdefault
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzdefault 2007-12-18 09:06:55 UTC (rev 1232)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzdefault 2007-12-18 09:12:34 UTC (rev 1233)
@@ -47,7 +47,7 @@
RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authz_default_module for Apache"
OBJECTS = \
- $(WORKDIR)\mod_authz_default.obj \
+ $(WORKDIR)\mod_authz_default.obj
{$(SRCDIR)}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
Modified: trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzgroupfile
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzgroupfile 2007-12-18 09:06:55 UTC (rev 1232)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzgroupfile 2007-12-18 09:12:34 UTC (rev 1233)
@@ -47,7 +47,7 @@
RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authz_groupfile_module for Apache"
OBJECTS = \
- $(WORKDIR)\mod_authz_groupfile.obj \
+ $(WORKDIR)\mod_authz_groupfile.obj
{$(SRCDIR)}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
Modified: trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzhost
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzhost 2007-12-18 09:06:55 UTC (rev 1232)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzhost 2007-12-18 09:12:34 UTC (rev 1233)
@@ -47,7 +47,7 @@
RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authz_host_module for Apache"
OBJECTS = \
- $(WORKDIR)\mod_authz_host.obj \
+ $(WORKDIR)\mod_authz_host.obj
{$(SRCDIR)}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
Modified: trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzuser
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzuser 2007-12-18 09:06:55 UTC (rev 1232)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzuser 2007-12-18 09:12:34 UTC (rev 1233)
@@ -47,7 +47,7 @@
RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authz_user_module for Apache"
OBJECTS = \
- $(WORKDIR)\mod_authz_user.obj \
+ $(WORKDIR)\mod_authz_user.obj
{$(SRCDIR)}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
Modified: trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEisapi
===================================================================
--- trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEisapi 2007-12-18 09:06:55 UTC (rev 1232)
+++ trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEisapi 2007-12-18 09:12:34 UTC (rev 1233)
@@ -15,7 +15,7 @@
#
# ====================================================================
#
-# NMAKEmakefile dbd module makefile.
+# NMAKEmakefile isapi module makefile.
#
# Originally contributed by Mladen Turk <mturk redhat.com>
#
@@ -47,7 +47,7 @@
RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="isapi_module for Apache"
OBJECTS = \
- $(WORKDIR)\mod_isapi.obj \
+ $(WORKDIR)\mod_isapi.obj
{$(SRCDIR)}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
Modified: trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEmakefile 2007-12-18 09:06:55 UTC (rev 1232)
+++ trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEmakefile 2007-12-18 09:12:34 UTC (rev 1233)
@@ -15,7 +15,7 @@
#
# ====================================================================
#
-# NMAKEmakefile Master HTTPD database modules makefile.
+# NMAKEmakefile Master HTTPD arch/win32 modules makefile.
#
# Originally contributed by Mladen Turk <mturk redhat.com>
#
Modified: trunk/httpd/httpd-2.2/modules/database/NMAKEdbd
===================================================================
--- trunk/httpd/httpd-2.2/modules/database/NMAKEdbd 2007-12-18 09:06:55 UTC (rev 1232)
+++ trunk/httpd/httpd-2.2/modules/database/NMAKEdbd 2007-12-18 09:12:34 UTC (rev 1233)
@@ -47,7 +47,7 @@
RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="dbd_module for Apache"
OBJECTS = \
- $(WORKDIR)\mod_dbd.obj \
+ $(WORKDIR)\mod_dbd.obj
{$(SRCDIR)}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
16 years, 4 months
- 1
- 0
JBoss Native SVN: r1232 - in trunk/httpd/httpd-2.2/modules/arch: win32 and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-18 04:06:55 -0500 (Tue, 18 Dec 2007)
New Revision: 1232
Added:
trunk/httpd/httpd-2.2/modules/arch/win32/
trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEisapi
trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEmakefile
Log:
Add arch/win32 module makefiles
Added: trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEisapi
===================================================================
--- trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEisapi (rev 0)
+++ trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEisapi 2007-12-18 09:06:55 UTC (rev 1232)
@@ -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 dbd module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_isapi
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+CFLAGS = $(CFLAGS) -DDBD_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="isapi_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_isapi.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/modules/arch/win32/NMAKEisapi
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEmakefile (rev 0)
+++ trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEmakefile 2007-12-18 09:06:55 UTC (rev 1232)
@@ -0,0 +1,43 @@
+# 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 database modules makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\..\..\NMAKEcommon.inc>
+!include <..\..\..\NMAKEhttpd.inc>
+
+MODULES = \
+ $(SRCDIR)\NMAKEisapi
+
+$(MODULES):
+ @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+
+$(WORKDIR):
+ @$(MAKEWORKDIR)
+
+install: $(WORKDIR) $(MODULES)
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
Property changes on: trunk/httpd/httpd-2.2/modules/arch/win32/NMAKEmakefile
___________________________________________________________________
Name: svn:eol-style
+ native
16 years, 4 months
- 1
- 0
JBoss Native SVN: r1231 - trunk/httpd/httpd-2.2/modules/aaa.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-18 04:02:23 -0500 (Tue, 18 Dec 2007)
New Revision: 1231
Added:
trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthnanon
trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthndbd
trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthndbm
trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthndefault
trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthnfile
trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthnzldap
trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzdbm
trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzdefault
trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzgroupfile
trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzhost
trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzuser
Modified:
trunk/httpd/httpd-2.2/modules/aaa/NMAKEmakefile
Log:
Add AAA modules make files
Added: trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthnanon
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthnanon (rev 0)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthnanon 2007-12-18 09:02:23 UTC (rev 1231)
@@ -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 authn_anon module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_authn_anon
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+CFLAGS = $(CFLAGS) -DAAA_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authn_anon_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_authn_anon.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/modules/aaa/NMAKEauthnanon
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthndbd
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthndbd (rev 0)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthndbd 2007-12-18 09:02:23 UTC (rev 1231)
@@ -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 authn_dbd module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_authn_dbd
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD) mod_dbd.lib
+CFLAGS = $(CFLAGS) -DAAA_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I..\database
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authn_dbd_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_authn_dbd.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/modules/aaa/NMAKEauthndbd
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthndbm
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthndbm (rev 0)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthndbm 2007-12-18 09:02:23 UTC (rev 1231)
@@ -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 authn_dbm module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_authn_dbm
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+CFLAGS = $(CFLAGS) -DAAA_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authn_dbm_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_authn_dbm.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/modules/aaa/NMAKEauthndbm
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthndefault
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthndefault (rev 0)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthndefault 2007-12-18 09:02:23 UTC (rev 1231)
@@ -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 authn_default module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_authn_default
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+CFLAGS = $(CFLAGS) -DAAA_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authn_default_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_authn_default.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/modules/aaa/NMAKEauthndefault
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthnfile
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthnfile (rev 0)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthnfile 2007-12-18 09:02:23 UTC (rev 1231)
@@ -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 authn_file module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_authn_file
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+CFLAGS = $(CFLAGS) -DAAA_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authn_file_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_authn_file.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/modules/aaa/NMAKEauthnfile
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthnzldap
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthnzldap (rev 0)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthnzldap 2007-12-18 09:02:23 UTC (rev 1231)
@@ -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 authnz_ldap module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_authnz_ldap
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+CFLAGS = $(CFLAGS) -DAAA_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authnz_ldap_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_authnz_ldap.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/modules/aaa/NMAKEauthnzldap
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzdbm
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzdbm (rev 0)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzdbm 2007-12-18 09:02:23 UTC (rev 1231)
@@ -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 authz_dbm module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_authz_dbm
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+CFLAGS = $(CFLAGS) -DAAA_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I..\database
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authz_dbm_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_authz_dbm.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/modules/aaa/NMAKEauthzdbm
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzdefault
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzdefault (rev 0)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzdefault 2007-12-18 09:02:23 UTC (rev 1231)
@@ -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 authz_default module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_authz_default
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+CFLAGS = $(CFLAGS) -DAAA_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I..\database
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authz_default_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_authz_default.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/modules/aaa/NMAKEauthzdefault
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzgroupfile
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzgroupfile (rev 0)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzgroupfile 2007-12-18 09:02:23 UTC (rev 1231)
@@ -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 authz_groupfile module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_authz_groupfile
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+CFLAGS = $(CFLAGS) -DAAA_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I..\database
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authz_groupfile_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_authz_groupfile.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/modules/aaa/NMAKEauthzgroupfile
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzhost
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzhost (rev 0)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzhost 2007-12-18 09:02:23 UTC (rev 1231)
@@ -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 authz_host module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_authz_host
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+CFLAGS = $(CFLAGS) -DAAA_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I..\database
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authz_host_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_authz_host.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/modules/aaa/NMAKEauthzhost
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzuser
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzuser (rev 0)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthzuser 2007-12-18 09:02:23 UTC (rev 1231)
@@ -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 authz_user module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_authz_user
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+CFLAGS = $(CFLAGS) -DAAA_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I..\database
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authz_user_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_authz_user.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/modules/aaa/NMAKEauthzuser
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/httpd/httpd-2.2/modules/aaa/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEmakefile 2007-12-18 08:37:54 UTC (rev 1230)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEmakefile 2007-12-18 09:02:23 UTC (rev 1231)
@@ -32,7 +32,18 @@
MODULES = \
$(SRCDIR)\NMAKEauthbasic \
- $(SRCDIR)\NMAKEauthdigest
+ $(SRCDIR)\NMAKEauthdigest \
+ $(SRCDIR)\NMAKEauthnanon \
+ $(SRCDIR)\NMAKEauthndbd \
+ $(SRCDIR)\NMAKEauthndbm \
+ $(SRCDIR)\NMAKEauthndefault \
+ $(SRCDIR)\NMAKEauthnfile \
+ $(SRCDIR)\NMAKEauthnzldap \
+ $(SRCDIR)\NMAKEauthzdbm \
+ $(SRCDIR)\NMAKEauthzdefault \
+ $(SRCDIR)\NMAKEauthzgroupfile \
+ $(SRCDIR)\NMAKEauthzhost \
+ $(SRCDIR)\NMAKEauthzuser
$(MODULES):
@$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
16 years, 4 months
- 1
- 0
JBoss Native SVN: r1230 - in trunk/httpd/httpd-2.2: modules and 2 other directories.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-18 03:37:54 -0500 (Tue, 18 Dec 2007)
New Revision: 1230
Added:
trunk/httpd/httpd-2.2/modules/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthbasic
trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthdigest
trunk/httpd/httpd-2.2/modules/aaa/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/database/NMAKEdbd
trunk/httpd/httpd-2.2/modules/database/NMAKEmakefile
Modified:
trunk/httpd/httpd-2.2/NMAKEhttpd.inc
trunk/httpd/httpd-2.2/NMAKElibhttpd
trunk/httpd/httpd-2.2/NMAKEmakefile
Log:
Add modules makefiles to the build
Modified: trunk/httpd/httpd-2.2/NMAKEhttpd.inc
===================================================================
--- trunk/httpd/httpd-2.2/NMAKEhttpd.inc 2007-12-17 21:45:58 UTC (rev 1229)
+++ trunk/httpd/httpd-2.2/NMAKEhttpd.inc 2007-12-18 08:37:54 UTC (rev 1230)
@@ -44,38 +44,21 @@
PCRE = pcre.lib
LIBHTTPD = libhttpd.lib
-$(BUILDINC) :
- @if not exist "$(BUILDINC)\arch\win32\$(NULL)" mkdir "$(BUILDINC)\arch\win32"
+DISTSUBDIRS = \
+ $(PREFIX)\include\arch\win32\~ \
+ $(PREFIX)\lib\~ \
+ $(PREFIX)\bin\~ \
+ $(PREFIX)\modules\~ \
+ $(PREFIX)\manual\~ \
+ $(PREFIX)\htdocs\~ \
+ $(PREFIX)\icons\~ \
+ $(PREFIX)\cgi-bin\~ \
+ $(PREFIX)\logs\~ \
+ $(PREFIX)\error\include\~ \
+ $(PREFIX)\conf\extra\~
-$(BUILDLIB) :
- @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
+$(DISTSUBDIRS):
+ @if not exist "$(@D)\$(NULL)" mkdir $(@D)
-$(BUILDOUT) :
- @if not exist "$(BUILDOUT)\$(NULL)" mkdir "$(BUILDOUT)"
-
-$(BUILDMOD) :
- @if not exist "$(BUILDMOD)\$(NULL)" mkdir "$(BUILDMOD)"
-
-$(BUILDMAN) :
- @if not exist "$(BUILDMAN)\$(NULL)" mkdir "$(BUILDMAN)"
-
-$(BUILDDOC) :
- @if not exist "$(BUILDDOC)\$(NULL)" mkdir "$(BUILDDOC)"
-
-$(BUILDICO) :
- @if not exist "$(BUILDICO)\$(NULL)" mkdir "$(BUILDICO)"
-
-$(BUILDCGI) :
- @if not exist "$(BUILDCGI)\$(NULL)" mkdir "$(BUILDCGI)"
-
-$(BUILDLOG) :
- @if not exist "$(BUILDLOG)\$(NULL)" mkdir "$(BUILDLOG)"
-
-$(BUILDCFG) :
- @if not exist "$(BUILDCFG)\extra\$(NULL)" mkdir "$(BUILDCFG)\extra"
-
-$(BUILDERR) :
- @if not exist "$(BUILDERR)\include\$(NULL)" mkdir "$(BUILDERR)\include"
-
-$(BUILDINS) : $(BUILDINC) $(BUILDLIB) $(BUILDOUT) $(BUILDMOD) $(BUILDMAN) $(BUILDDOC) $(BUILDCFG) $(BUILDERR) $(BUILDICO) $(BUILDCGI) $(BUILDLOG)
+$(BUILDINS): $(DISTSUBDIRS)
@copy /Y LICENSE $@ >NUL
Modified: trunk/httpd/httpd-2.2/NMAKElibhttpd
===================================================================
--- trunk/httpd/httpd-2.2/NMAKElibhttpd 2007-12-17 21:45:58 UTC (rev 1229)
+++ trunk/httpd/httpd-2.2/NMAKElibhttpd 2007-12-18 08:37:54 UTC (rev 1230)
@@ -55,6 +55,7 @@
$(WORKDIR)\eoc_bucket.obj \
$(WORKDIR)\error_bucket.obj \
$(WORKDIR)\mpm_common.obj \
+ $(WORKDIR)\provider.obj \
$(WORKDIR)\scoreboard.obj \
$(WORKDIR)\util.obj \
$(WORKDIR)\util_cfgtree.obj \
@@ -107,37 +108,40 @@
BUILDPCRE = $(BUILDLIB)\pcre.lib
BUILDTCHR = $(SRCDIR)\server\$(WORKDIR_EXE)\gen_test_char.exe
-all : $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDBIN)
+all: $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDBIN)
-$(WORKDIR) :
+$(WORKDIR):
@$(MAKEWORKDIR)
.SUFFIXES : .h
-$(BUILDAPR) :
+$(BUILDINS): $(DISTSUBDIRS)
+ @copy /Y LICENSE $@ >NUL
+
+$(BUILDAPR):
cd $(SRCDIR)\srclib\apr
@$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) install
@$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) APR_DECLARE_STATIC=1 install
cd ..\..
-$(BUILDAPU) :
+$(BUILDAPU):
cd $(SRCDIR)\srclib\apr-util
@$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) install
@$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) APR_DECLARE_STATIC=1 install
cd ..\..
-$(BUILDAPI) :
+$(BUILDAPI):
cd $(SRCDIR)\srclib\apr-iconv
@$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) install
@$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX) APR_DECLARE_STATIC=1 install
cd ..\..
-$(BUILDPCRE) :
+$(BUILDPCRE):
cd $(SRCDIR)\srclib\pcre
@$(MAKE) -nologo -f NMAKEmakefile PCRE_STATIC=1 PREFIX=$(PREFIX) install
cd ..\..
-$(BUILDTCHR) :
+$(BUILDTCHR):
cd $(SRCDIR)\server
@$(MAKE) -nologo -f NMAKEmakefile PREFIX=$(PREFIX)
cd ..
Modified: trunk/httpd/httpd-2.2/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/NMAKEmakefile 2007-12-17 21:45:58 UTC (rev 1229)
+++ trunk/httpd/httpd-2.2/NMAKEmakefile 2007-12-18 08:37:54 UTC (rev 1230)
@@ -55,25 +55,36 @@
RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).exe" /d LONG_NAME="Apache HTTP Server" /d ICON_FILE="apache.ico"
-BUILDDEP = $(BUILDBIN)\libhttpd.dll
+BUILDDEP = $(BUILDOUT)\libhttpd.dll
+BMODULES = $(SRCDIR)\modules\~
-all : $(BUILDINS) $(WORKDIR) $(BUILDBIN)
+all: $(BUILDINS) $(WORKDIR) $(BUILDBIN)
+ @echo Building $(BUILDBIN)
-$(WORKDIR) :
+$(WORKDIR):
@$(MAKEWORKDIR)
-$(BUILDDEP) :
+$(BUILDDEP):
@$(MAKE) -nologo -f NMAKElibhttpd PREFIX=$(PREFIX) install
+$(BMODULES):
+ @echo Building modules ...
+ @cd $(SRCDIR)\modules
+ @$(MAKE) -nologo -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) $(OBJECTS) $(BUILDRES)
+
+$(BUILDBIN): $(WORKDIR) $(BUILDDEP) $(BMODULES) $(OBJECTS) $(BUILDRES)
$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN)
IF EXIST $(BUILDMFT) \
mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
+
clean:
@$(CLEANTARGET)
Added: trunk/httpd/httpd-2.2/modules/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/NMAKEmakefile (rev 0)
+++ trunk/httpd/httpd-2.2/modules/NMAKEmakefile 2007-12-18 08:37:54 UTC (rev 1230)
@@ -0,0 +1,58 @@
+# 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 modules makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\NMAKEcommon.inc>
+!include <..\NMAKEhttpd.inc>
+
+SUBDIRS = \
+ database\~ \
+ aaa\~ \
+ arch\win32\~ \
+ cache\~ \
+ dav\main\~ \
+ dav\fs\~ \
+ echo\~ \
+ filters\~ \
+ generators\~ \
+ http\~ \
+ ldap\~ \
+ loggers\~ \
+ mappers\~ \
+ metadata\~ \
+ proxy\~ \
+ ssl\~ \
+ mod_jk\~
+
+all: $(SUBDIRS)
+
+$(SUBDIRS):
+ @if exist $(@D)\NMAKEmakefile <<nmaketmp.bat
+ @cd $(@D)
+ @$(MAKE) -nologo -A -f NMAKEmakefile PREFIX=$(PREFIX) install
+ @cd ..
+<<
Property changes on: trunk/httpd/httpd-2.2/modules/NMAKEmakefile
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthbasic
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthbasic (rev 0)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthbasic 2007-12-18 08:37:54 UTC (rev 1230)
@@ -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 auth_basic module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_auth_basic
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+CFLAGS = $(CFLAGS) -DAAA_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="auth_basic_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_auth_basic.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/modules/aaa/NMAKEauthbasic
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthdigest
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthdigest (rev 0)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEauthdigest 2007-12-18 08:37:54 UTC (rev 1230)
@@ -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 auth_digest module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_auth_digest
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+CFLAGS = $(CFLAGS) -DAAA_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="auth_digest_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_auth_digest.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/modules/aaa/NMAKEauthdigest
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/aaa/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/aaa/NMAKEmakefile (rev 0)
+++ trunk/httpd/httpd-2.2/modules/aaa/NMAKEmakefile 2007-12-18 08:37:54 UTC (rev 1230)
@@ -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=DLL
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
+
+MODULES = \
+ $(SRCDIR)\NMAKEauthbasic \
+ $(SRCDIR)\NMAKEauthdigest
+
+$(MODULES):
+ @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+
+$(WORKDIR):
+ @$(MAKEWORKDIR)
+
+install: $(WORKDIR) $(MODULES)
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
Property changes on: trunk/httpd/httpd-2.2/modules/aaa/NMAKEmakefile
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/database/NMAKEdbd
===================================================================
--- trunk/httpd/httpd-2.2/modules/database/NMAKEdbd (rev 0)
+++ trunk/httpd/httpd-2.2/modules/database/NMAKEdbd 2007-12-18 08:37:54 UTC (rev 1230)
@@ -0,0 +1,64 @@
+# 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 dbd module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_dbd
+
+!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 $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+CFLAGS = $(CFLAGS) -DDBD_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="dbd_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_dbd.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)
+ @xcopy "$(WORKDIR)\$(PROJECT).lib" "$(BUILDLIB)" /Y /Q
Property changes on: trunk/httpd/httpd-2.2/modules/database/NMAKEdbd
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/database/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/database/NMAKEmakefile (rev 0)
+++ trunk/httpd/httpd-2.2/modules/database/NMAKEmakefile 2007-12-18 08:37:54 UTC (rev 1230)
@@ -0,0 +1,43 @@
+# 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 database modules makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
+
+MODULES = \
+ $(SRCDIR)\NMAKEdbd
+
+$(MODULES):
+ @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+
+$(WORKDIR):
+ @$(MAKEWORKDIR)
+
+install: $(WORKDIR) $(MODULES)
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
Property changes on: trunk/httpd/httpd-2.2/modules/database/NMAKEmakefile
___________________________________________________________________
Name: svn:eol-style
+ native
16 years, 4 months
- 1
- 0
JBoss Native SVN: r1229 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-17 16:45:58 -0500 (Mon, 17 Dec 2007)
New Revision: 1229
Modified:
trunk/build/unix/buildbin.asf-jk.sh
Log:
Arrange the logic to "hack" config_vars.mk
Modified: trunk/build/unix/buildbin.asf-jk.sh
===================================================================
--- trunk/build/unix/buildbin.asf-jk.sh 2007-12-17 19:20:11 UTC (rev 1228)
+++ trunk/build/unix/buildbin.asf-jk.sh 2007-12-17 21:45:58 UTC (rev 1229)
@@ -69,21 +69,29 @@
exp_installbuild=`find $output_loc -type f -name config_vars.mk`
exp_installbuilddir=`dirname $exp_installbuild`
modules_dir=`find $output_loc -type d -name modules`
-sed "/^sbindir = / c\
-sbindir = ${sbindir}" $configdir/config_vars.mk > $$.mk
-sed "/^bindir = / c\
-bindir = ${bindir}" $$.mk > $$.mk2
-sed "/^APR_CONFIG = / c\
-APR_CONFIG = ${APR_CONFIG}" $$.mk2 > $$.mk
-sed "/^APU_CONFIG = / c\
-APU_CONFIG = ${APU_CONFIG}" $$.mk > $$.mk2
-sed "/^LIBTOOL = / c\
-LIBTOOL = ${LIBTOOL}" $$.mk2 > $$.mk
-sed "/^APR_INCLUDEDIR = / c\
-APR_INCLUDEDIR = ${APR_INCLUDEDIR}" $$.mk > $$.mk2
-sed "/^APU_INCLUDEDIR = / c\
-APU_INCLUDEDIR = ${APU_INCLUDEDIR}" $$.mk2 > $$.mk
+#
+# Fill the sed command file.
+echo "/^sbindir = / c\\" > $$.sed
+echo "sbindir = ${sbindir}" >> $$.sed
+echo "/^bindir = / c\\" >> $$.sed
+echo "bindir = ${bindir}" >> $$.sed
+echo "/^APR_CONFIG = / c\\" >> $$.sed
+echo "APR_CONFIG = ${APR_CONFIG}" >> $$.sed
+echo "/^APU_CONFIG = / c\\" >> $$.sed
+echo "APU_CONFIG = ${APU_CONFIG}" >> $$.sed
+echo "/^LIBTOOL = / c\\" >> $$.sed
+echo "LIBTOOL = ${LIBTOOL}" >> $$.sed
+echo "/^APR_INCLUDEDIR = / c\\" >> $$.sed
+echo "APR_INCLUDEDIR = ${APR_INCLUDEDIR}" >> $$.sed
+echo "/^APU_INCLUDEDIR = / c\\" >> $$.sed
+echo "APU_INCLUDEDIR = ${APU_INCLUDEDIR}" >> $$.sed
+echo "/^exp_installbuilddir = / c\\" >> $$.sed
+echo "exp_installbuilddir = ${exp_installbuilddir}/jk" >> $$.sed
+sed -f $$.sed $configdir/config_vars.mk > $configdir/config_vars.mk.jk
+mkdir -p $configdir/jk
+cp $configdir/config_vars.mk.jk $configdir/jk/config_vars.mk
+
echo "$native_sources; ./configure --with-apxs=${apxs}.jk"
./configure --with-apxs=${apxs}.jk
make
16 years, 4 months
- 1
- 0