apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1308127 - /apr/apr/trunk/Makefile.in
Date Sun, 01 Apr 2012 14:46:16 GMT
Author: minfrin
Date: Sun Apr  1 14:46:16 2012
New Revision: 1308127

URL: http://svn.apache.org/viewvc?rev=1308127&view=rev
Log:
Pass through the EXTRA_OBJECTS into the build. Allows the DSO modules to be
built statically.

Modified:
    apr/apr/trunk/Makefile.in

Modified: apr/apr/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/Makefile.in?rev=1308127&r1=1308126&r2=1308127&view=diff
==============================================================================
--- apr/apr/trunk/Makefile.in (original)
+++ apr/apr/trunk/Makefile.in Sun Apr  1 14:46:16 2012
@@ -32,6 +32,7 @@ APR_CONFIG = apr-$(APR_MAJOR_VERSION)-co
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
+EXTRA_OBJECTS = @EXTRA_OBJECTS@
 APR_DSO_MODULES = @APR_DSO_MODULES@
 LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS)
$(APRUTIL_LDFLAGS) -release $(APR_MAJOR_VERSION) -module -rpath $(APR_DSO_LIBDIR)
 APR_DSO_LIBDIR = @APR_DSO_LIBDIR@
@@ -119,8 +120,8 @@ install: install-modules $(TARGETS)
 	    done \
 	fi
 
-$(TARGET_LIB): $(OBJECTS)
-	$(LINK) @lib_target@ $(ALL_LIBS) $(APRUTIL_EXPORT_LIBS)
+$(TARGET_LIB): $(OBJECTS) $(EXTRA_OBJECTS)
+	$(LINK) @lib_target@ $(EXTRA_OBJECTS) $(ALL_LIBS) $(APRUTIL_EXPORT_LIBS)
 
 install-modules: install-modules-@APR_HAVE_MODULES@
 



Mime
View raw message