Author: mladen.turk(a)jboss.com
Date: 2008-10-12 11:15:59 -0400 (Sun, 12 Oct 2008)
New Revision: 1949
Added:
trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapu
trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapuldap
Modified:
trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile
Log:
Apr 1.3+ has modules for ldap
Added: trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapu
===================================================================
--- trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapu (rev 0)
+++ trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapu 2008-10-12 15:15:59 UTC (rev 1949)
@@ -0,0 +1,243 @@
+# Copyright 2001-2008 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 apr-util makefile.
+# Usage:
+# DLL=1 Build DLL version
+# DEBUG=1 Build DEBUG version of APR
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+
+!IF !DEFINED(APR_DECLARE_STATIC) || "$(APR_DECLARE_STATIC)" == ""
+TARGET=DLL
+CFLAGS = -DAPR_DECLARE_EXPORT -DAPU_DECLARE_EXPORT $(CFLAGS)
+PROJECT = libaprutil-1
+APR_LIB = libapr-1.lib
+API_LIB = libapriconv-1.lib
+API_CFLAGS = -DAPI_DECLARE_EXPORT
+!ELSE
+TARGET=LIB
+CFLAGS = -DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC $(CFLAGS)
+PROJECT = aprutil-1
+APR_LIB = apr-1.lib
+API_LIB = apriconv-1.lib
+API_CFLAGS = -DAPI_DECLARE_STATIC
+!ENDIF
+
+!IFDEF WITH_GNU_ICONV
+API_LIB = libiconv-1.lib
+!ELSE
+CFLAGS = $(CFLAGS) $(API_CFLAGS)
+!ENDIF
+
+CFLAGS = $(CFLAGS) -DAPU_USE_SDBM -DVERSION=\"expat_1.95.2\"
+
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
+
+!IFNDEF WITH_APR
+WITH_APR=..\apr
+!ENDIF
+
+!IFDEF WITH_GNU_ICONV
+WITH_API=..\libiconv
+!ENDIF
+!IFNDEF WITH_API
+WITH_API=..\apr-iconv
+!ENDIF
+
+LDIRS = /libpath:"$(WITH_APR)\$(WORKDIR)"
/libpath:"$(WITH_API)\$(WORKDIR)"
+
+!IF "$(TARGET)" == "DLL"
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib
$(APR_LIB) $(API_LIB)
+!ENDIF
+
+INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\include\private -I$(SRCDIR)\xml\expat\lib
-I$(WITH_APR)\include -I$(WITH_API)\include
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+OBJECTS = \
+ $(WORKDIR)\apr_brigade.obj \
+ $(WORKDIR)\apr_buckets.obj \
+ $(WORKDIR)\apr_buckets_alloc.obj \
+ $(WORKDIR)\apr_buckets_eos.obj \
+ $(WORKDIR)\apr_buckets_file.obj \
+ $(WORKDIR)\apr_buckets_flush.obj \
+ $(WORKDIR)\apr_buckets_heap.obj \
+ $(WORKDIR)\apr_buckets_mmap.obj \
+ $(WORKDIR)\apr_buckets_pipe.obj \
+ $(WORKDIR)\apr_buckets_pool.obj \
+ $(WORKDIR)\apr_buckets_refcount.obj \
+ $(WORKDIR)\apr_buckets_simple.obj \
+ $(WORKDIR)\apr_buckets_socket.obj \
+ $(WORKDIR)\apr_md4.obj \
+ $(WORKDIR)\apr_md5.obj \
+ $(WORKDIR)\apr_sha1.obj \
+ $(WORKDIR)\getuuid.obj \
+ $(WORKDIR)\uuid.obj \
+ $(WORKDIR)\apr_dbd.obj \
+ $(WORKDIR)\apr_dbd_pgsql.obj \
+ $(WORKDIR)\apr_dbd_sqlite2.obj \
+ $(WORKDIR)\apr_dbd_sqlite3.obj \
+ $(WORKDIR)\apr_dbm.obj \
+ $(WORKDIR)\apr_dbm_berkeleydb.obj \
+ $(WORKDIR)\apr_dbm_gdbm.obj \
+ $(WORKDIR)\apr_dbm_sdbm.obj \
+ $(WORKDIR)\sdbm.obj \
+ $(WORKDIR)\sdbm_hash.obj \
+ $(WORKDIR)\sdbm_lock.obj \
+ $(WORKDIR)\sdbm_pair.obj \
+ $(WORKDIR)\apr_base64.obj \
+ $(WORKDIR)\apr_hooks.obj \
+ $(WORKDIR)\apr_ldap_init.obj \
+ $(WORKDIR)\apr_ldap_url.obj \
+ $(WORKDIR)\apr_ldap_option.obj \
+ $(WORKDIR)\apr_date.obj \
+ $(WORKDIR)\apr_queue.obj \
+ $(WORKDIR)\apr_reslist.obj \
+ $(WORKDIR)\apr_rmm.obj \
+ $(WORKDIR)\apu_version.obj \
+ $(WORKDIR)\apr_strmatch.obj \
+ $(WORKDIR)\apr_uri.obj \
+ $(WORKDIR)\xlate.obj \
+ $(WORKDIR)\apr_xml.obj \
+ $(WORKDIR)\xmlparse.obj \
+ $(WORKDIR)\xmlrole.obj \
+ $(WORKDIR)\xmltok.obj
+
+# Include APU 1.3 sources
+!IF EXIST($(SRCDIR)\misc\apu_dso.c)
+OBJECTS = $(OBJECTS) \
+ $(WORKDIR)\apu_dso.obj \
+ $(WORKDIR)\apr_thread_pool.obj \
+ $(WORKDIR)\apr_memcache.obj \
+!ENDIF
+
+!IF EXIST($(SRCDIR)\LDAP\apr_ldap_stub.c)
+!IF "$(TARGET)" == "LIB"
+OBJECTS = $(OBJECTS) \
+ $(WORKDIR)\apr_ldap_rebind.obj \
+ $(WORKDIR)\apr_ldap_stub.obj
+!ENDIF
+!ENDIF
+
+HEADERS = \
+ $(SRCDIR)\include\apu.h \
+ $(SRCDIR)\include\apu_want.h \
+ $(SRCDIR)\include\apr_ldap.h \
+ $(SRCDIR)\include\private\apu_config.h \
+ $(SRCDIR)\include\private\apu_select_dbm.h \
+ $(SRCDIR)\xml\expat\lib\config.h \
+ $(SRCDIR)\xml\expat\lib\expat.h
+
+!IF "$(TARGET)" == "DLL"
+BUILDBIN = $(WORKDIR)\$(PROJECT).dll
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+!ELSE
+BUILDBIN = $(WORKDIR)\$(PROJECT).lib
+!ENDIF
+
+all : $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDBIN)
+
+$(WORKDIR) :
+ @$(MAKEWORKDIR)
+
+.SUFFIXES : .hw .h.in
+
+{$(SRCDIR)\include}.hw{$(SRCDIR)\include}.h:
+ @copy /Y $< $@ >NUL
+
+{$(SRCDIR)\xml\expat\lib}.h.in{$(SRCDIR)\xml\expat\lib}.h:
+ @copy /Y $< $@ >NUL
+
+{$(SRCDIR)\include\private}.hw{$(SRCDIR)\include\private}.h:
+ @copy /Y $< $@ >NUL
+
+$(SRCDIR)\xml\expat\lib\config.h :
+ @copy /Y $(SRCDIR)\xml\expat\lib\winconfig.h $@ >NUL
+
+{$(SRCDIR)\buckets}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\crypto}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\dbd}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\dbm}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\dbm\sdbm}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\encoding}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\hooks}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\ldap}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\misc}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\memcache}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\strmatch}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\uri}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\xlate}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\xml}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\xml\expat\lib}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+$(OBJECTS): $(SRCDIR)\include\*.h $(SRCDIR)\include\private\*.h
+
+!IF "$(TARGET)" == "DLL"
+$(BUILDRES): libaprutil.rc $(HEADERS)
+ $(RC) $(RCFLAGS) /i "$(WITH_APR)\include" /i "$(SRCDIR)\include" /d
"APU_VERSION_ONLY" /fo $(BUILDRES) libaprutil.rc
+$(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS) $(BUILDRES)
+ $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB)
/out:$(BUILDBIN)
+ IF EXIST $(BUILDMFT) \
+ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
+!ELSE
+$(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS)
+ $(LINK) $(LFLAGS) $(OBJECTS) $(LDIRS) /out:$(BUILDBIN)
+!ENDIF
+
+clean:
+ @$(CLEANTARGET)
+
+install: $(BUILDINS) $(WORKDIR) $(BUILDBIN)
Added: trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapuldap
===================================================================
--- trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapuldap (rev 0)
+++ trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapuldap 2008-10-12 15:15:59 UTC (rev 1949)
@@ -0,0 +1,102 @@
+# Copyright 2001-2008 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 apr-util ldap module makefile.
+# Usage:
+# DLL=1 Build DLL version
+# DEBUG=1 Build DEBUG version of APR
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+
+!IF !DEFINED(APR_DECLARE_STATIC) || "$(APR_DECLARE_STATIC)" == ""
+TARGET=DLL
+CFLAGS = -DAPR_DECLARE_EXPORT -DAPU_DECLARE_EXPORT $(CFLAGS)
+PROJECT = apr_ldap-1
+APR_LIB = libapr-1.lib
+APU_LIB = libaprutil-1.lib
+!ENDIF
+
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
+
+!IFNDEF WITH_APR
+WITH_APR=..\apr
+!ENDIF
+
+LDIRS = /libpath:"$(WITH_APR)\$(WORKDIR)" /libpath:"$(WORKDIR)"
+
+!IF "$(TARGET)" == "DLL"
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib
$(APR_LIB) $(APU_LIB)
+!ENDIF
+
+INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\include\private -I$(WITH_APR)\include
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+OBJECTS = \
+ $(WORKDIR)\apr_ldap_init.obj \
+ $(WORKDIR)\apr_ldap_option.obj \
+ $(WORKDIR)\apr_ldap_rebind.obj
+
+HEADERS = \
+ $(SRCDIR)\include\apr_ldap.h \
+
+!IF "$(TARGET)" == "DLL"
+BUILDBIN = $(WORKDIR)\$(PROJECT).dll
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+!ENDIF
+
+all : $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDBIN)
+
+$(WORKDIR) :
+ @$(MAKEWORKDIR)
+
+.SUFFIXES : .hw .h.in
+
+{$(SRCDIR)\include}.hw{$(SRCDIR)\include}.h:
+ @copy /Y $< $@ >NUL
+
+{$(SRCDIR)\ldap}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+$(OBJECTS): $(SRCDIR)\include\*.h $(SRCDIR)\include\private\*.h
+
+!IF "$(TARGET)" == "DLL"
+$(BUILDRES): $(PROJECT).rc $(HEADERS)
+ $(RC) $(RCFLAGS) /i "$(WITH_APR)\include" /i "$(SRCDIR)\include" /d
"APU_VERSION_ONLY" /d DLL_NAME="$(PROJECT)" /fo $(BUILDRES)
$(PROJECT).rc
+$(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS) $(BUILDRES)
+ $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB)
/out:$(BUILDBIN)
+ IF EXIST $(BUILDMFT) \
+ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
+!ENDIF
+
+clean:
+ @$(CLEANTARGET)
+
+!IF "$(TARGET)" == "DLL" &&
EXIST($(SRCDIR)\ldap\apr_ldap_stub.c)
+install: $(BUILDINS) $(WORKDIR) $(BUILDBIN)
+!ELSE
+install:
+!ENDIF
Modified: trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile 2008-10-12 14:09:22 UTC (rev
1948)
+++ trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile 2008-10-12 15:15:59 UTC (rev
1949)
@@ -1,4 +1,4 @@
-# Copyright 2001-2007 The Apache Software Foundation or its licensors, as
+# Copyright 2001-2008 The Apache Software Foundation or its licensors, as
# applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,41 +15,14 @@
#
# ====================================================================
#
-# NMAKEmakefile Master APR-UTIL makefile.
-# Usage:
-# DLL=1 Build DLL version
-# DEBUG=1 Build DEBUG version of APR
+# NMAKEmakefile Master apr-util makefile.
#
# Originally contributed by Mladen Turk <mturk redhat.com>
#
# ====================================================================
#
-
-!IF !DEFINED(APR_DECLARE_STATIC) || "$(APR_DECLARE_STATIC)" == ""
TARGET=DLL
-CFLAGS = -DAPR_DECLARE_EXPORT -DAPU_DECLARE_EXPORT $(CFLAGS)
-PROJECT = libaprutil-1
-APR_LIB = libapr-1.lib
-API_LIB = libapriconv-1.lib
-API_CFLAGS = -DAPI_DECLARE_EXPORT
-!ELSE
-TARGET=LIB
-CFLAGS = -DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC $(CFLAGS)
-PROJECT = aprutil-1
-APR_LIB = apr-1.lib
-API_LIB = apriconv-1.lib
-API_CFLAGS = -DAPI_DECLARE_STATIC
-!ENDIF
-
-!IFDEF WITH_GNU_ICONV
-API_LIB = libiconv-1.lib
-!ELSE
-CFLAGS = $(CFLAGS) $(API_CFLAGS)
-!ENDIF
-
-CFLAGS = $(CFLAGS) -DAPU_USE_SDBM -DVERSION=\"expat_1.95.2\"
-
!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
SRCDIR = .
!ENDIF
@@ -57,184 +30,17 @@
!include <..\..\NMAKEcommon.inc>
!include <..\..\NMAKEhttpd.inc>
-!IFNDEF WITH_APR
-WITH_APR=..\apr
-!ENDIF
+MODULES = \
+ $(SRCDIR)\NMAKEapu \
+ $(SRCDIR)\NMAKEapuldap
-!IFDEF WITH_GNU_ICONV
-WITH_API=..\libiconv
-!ENDIF
-!IFNDEF WITH_API
-WITH_API=..\apr-iconv
-!ENDIF
+$(MODULES):
+ @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
-LDIRS = /libpath:"$(WITH_APR)\$(WORKDIR)"
/libpath:"$(WITH_API)\$(WORKDIR)"
-
-!IF "$(TARGET)" == "DLL"
-LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib
$(APR_LIB) $(API_LIB)
-!ENDIF
-
-INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\include\private -I$(SRCDIR)\xml\expat\lib
-I$(WITH_APR)\include -I$(WITH_API)\include
-PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
-OBJECTS = \
- $(WORKDIR)\apr_brigade.obj \
- $(WORKDIR)\apr_buckets.obj \
- $(WORKDIR)\apr_buckets_alloc.obj \
- $(WORKDIR)\apr_buckets_eos.obj \
- $(WORKDIR)\apr_buckets_file.obj \
- $(WORKDIR)\apr_buckets_flush.obj \
- $(WORKDIR)\apr_buckets_heap.obj \
- $(WORKDIR)\apr_buckets_mmap.obj \
- $(WORKDIR)\apr_buckets_pipe.obj \
- $(WORKDIR)\apr_buckets_pool.obj \
- $(WORKDIR)\apr_buckets_refcount.obj \
- $(WORKDIR)\apr_buckets_simple.obj \
- $(WORKDIR)\apr_buckets_socket.obj \
- $(WORKDIR)\apr_md4.obj \
- $(WORKDIR)\apr_md5.obj \
- $(WORKDIR)\apr_sha1.obj \
- $(WORKDIR)\getuuid.obj \
- $(WORKDIR)\uuid.obj \
- $(WORKDIR)\apr_dbd.obj \
- $(WORKDIR)\apr_dbd_pgsql.obj \
- $(WORKDIR)\apr_dbd_sqlite2.obj \
- $(WORKDIR)\apr_dbd_sqlite3.obj \
- $(WORKDIR)\apr_dbm.obj \
- $(WORKDIR)\apr_dbm_berkeleydb.obj \
- $(WORKDIR)\apr_dbm_gdbm.obj \
- $(WORKDIR)\apr_dbm_sdbm.obj \
- $(WORKDIR)\sdbm.obj \
- $(WORKDIR)\sdbm_hash.obj \
- $(WORKDIR)\sdbm_lock.obj \
- $(WORKDIR)\sdbm_pair.obj \
- $(WORKDIR)\apr_base64.obj \
- $(WORKDIR)\apr_hooks.obj \
- $(WORKDIR)\apr_ldap_init.obj \
- $(WORKDIR)\apr_ldap_url.obj \
- $(WORKDIR)\apr_ldap_option.obj \
- $(WORKDIR)\apr_date.obj \
- $(WORKDIR)\apr_queue.obj \
- $(WORKDIR)\apr_reslist.obj \
- $(WORKDIR)\apr_rmm.obj \
- $(WORKDIR)\apu_version.obj \
- $(WORKDIR)\apr_strmatch.obj \
- $(WORKDIR)\apr_uri.obj \
- $(WORKDIR)\xlate.obj \
- $(WORKDIR)\apr_xml.obj \
- $(WORKDIR)\xmlparse.obj \
- $(WORKDIR)\xmlrole.obj \
- $(WORKDIR)\xmltok.obj
-
-# Include APU 1.3 sources
-!IF EXIST($(SRCDIR)\misc\apu_dso.c)
-OBJECTS = $(OBJECTS) \
- $(WORKDIR)\apu_dso.obj \
- $(WORKDIR)\apr_thread_pool.obj \
- $(WORKDIR)\apr_memcache.obj \
- $(WORKDIR)\apr_ldap_rebind.obj \
- $(WORKDIR)\apr_ldap_stub.obj
-!ENDIF
-
-HEADERS = \
- $(SRCDIR)\include\apu.h \
- $(SRCDIR)\include\apu_want.h \
- $(SRCDIR)\include\apr_ldap.h \
- $(SRCDIR)\include\private\apu_config.h \
- $(SRCDIR)\include\private\apu_select_dbm.h \
- $(SRCDIR)\xml\expat\lib\config.h \
- $(SRCDIR)\xml\expat\lib\expat.h
-
-!IF "$(TARGET)" == "DLL"
-BUILDBIN = $(WORKDIR)\$(PROJECT).dll
-BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
-BUILDRES = $(WORKDIR)\$(PROJECT).res
-BUILDMFT = $(BUILDBIN).manifest
-!ELSE
-BUILDBIN = $(WORKDIR)\$(PROJECT).lib
-!ENDIF
-
-all : $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDBIN)
-
-$(WORKDIR) :
+$(WORKDIR):
@$(MAKEWORKDIR)
-.SUFFIXES : .hw .h.in
-
-{$(SRCDIR)\include}.hw{$(SRCDIR)\include}.h:
- @copy /Y $< $@ >NUL
-
-{$(SRCDIR)\xml\expat\lib}.h.in{$(SRCDIR)\xml\expat\lib}.h:
- @copy /Y $< $@ >NUL
-
-{$(SRCDIR)\include\private}.hw{$(SRCDIR)\include\private}.h:
- @copy /Y $< $@ >NUL
-
-$(SRCDIR)\xml\expat\lib\config.h :
- @copy /Y $(SRCDIR)\xml\expat\lib\winconfig.h $@ >NUL
-
-{$(SRCDIR)\buckets}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)\crypto}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)\dbd}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)\dbm}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)\dbm\sdbm}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)\encoding}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)\hooks}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)\ldap}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)\misc}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)\memcache}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)\strmatch}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)\uri}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)\xlate}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)\xml}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)\xml\expat\lib}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-$(OBJECTS): $(SRCDIR)\include\*.h $(SRCDIR)\include\private\*.h
-
-!IF "$(TARGET)" == "DLL"
-$(BUILDRES): libaprutil.rc $(HEADERS)
- $(RC) $(RCFLAGS) /i "$(WITH_APR)\include" /i "$(SRCDIR)\include" /d
"APU_VERSION_ONLY" /fo $(BUILDRES) libaprutil.rc
-$(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS) $(BUILDRES)
- $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB)
/out:$(BUILDBIN)
- IF EXIST $(BUILDMFT) \
- mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
-!ELSE
-$(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS)
- $(LINK) $(LFLAGS) $(OBJECTS) $(LDIRS) /out:$(BUILDBIN)
-!ENDIF
-
-clean:
- @$(CLEANTARGET)
-
-install: $(BUILDINS) $(WORKDIR) $(BUILDBIN)
+install: $(WORKDIR) $(MODULES)
@xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q
@xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q
@xcopy "$(WORKDIR)\*.dll" "$(BUILDOUT)" /Y /Q 2>NUL