[jbossnative-commits] JBoss Native SVN: r2713 - trunk/srclib/apr-util.
Author: mladen.turk(a)jboss.com
Date: 2011-01-11 06:48:18 -0500 (Tue, 11 Jan 2011)
New Revision: 2713
Modified:
trunk/srclib/apr-util/NMAKEmakefile
Log:
Add proper expat flags and axe extra obj files
Modified: trunk/srclib/apr-util/NMAKEmakefile
===================================================================
--- trunk/srclib/apr-util/NMAKEmakefile 2011-01-11 09:56:39 UTC (rev 2712)
+++ trunk/srclib/apr-util/NMAKEmakefile 2011-01-11 11:48:18 UTC (rev 2713)
@@ -41,6 +41,7 @@
!ENDIF
CFLAGS = $(CFLAGS) -DAPU_USE_SDBM -DVERSION=\"expat_1.95.2\"
+FEXPAT = -DCOMPILED_FROM_DSP -DXML_STATIC
!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
SRCDIR = .
@@ -97,9 +98,6 @@
$(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 \
@@ -218,10 +216,10 @@
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
{$(SRCDIR)\xml}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+ $(CC) $(CFLAGS) $(FEXPAT) $(INCLUDES) $(PDBFLAGS) $<
{$(SRCDIR)\xml\expat\lib}.c{$(WORKDIR)}.obj:
- $(CC) $(CFLAGS) -DHAVE_EXPAT_CONFIG_H $(INCLUDES) $(PDBFLAGS) $<
+ $(CC) $(CFLAGS) $(FEXPAT) $(INCLUDES) $(PDBFLAGS) $<
$(OBJECTS): $(SRCDIR)\include\*.h $(SRCDIR)\include\private\*.h