[mapserver-commits] r12976 - in trunk/mapserver/mapcache: . apache

[svn at osgeo.org]

Author: tbonfort
Date: 2012-01-05 07:42:20 -0800 (Thu, 05 Jan 2012)
New Revision: 12976

Modified:
   trunk/mapserver/mapcache/Makefile
   trunk/mapserver/mapcache/apache/Makefile.in
Log:
building the apache module with apxs requires libmapcache.so to have been already installed


Modified: trunk/mapserver/mapcache/Makefile
===================================================================
--- trunk/mapserver/mapcache/Makefile	2012-01-05 13:35:37 UTC (rev 12975)
+++ trunk/mapserver/mapcache/Makefile	2012-01-05 15:42:20 UTC (rev 12976)
@@ -3,21 +3,25 @@
 all: .header
 	cd lib; $(MAKE) $(MFLAGS)
 	cd util; $(MAKE) $(MFLAGS)
-	cd apache; $(MAKE) $(MFLAGS)
 	cd cgi; $(MAKE) $(MFLAGS)
 	
 install: .header install-module install-lib install-util install-cgi
 
 install-util: .header install-lib
+	$(INSTALL) -d $(bindir)
 	cd util; $(MAKE) $(MFLAGS) install
 
 install-cgi: .header install-lib
 	cd cgi; $(MAKE) $(MFLAGS) install
 
 install-lib: .header
+	$(INSTALL) -d $(libdir)
 	cd lib; $(MAKE) $(MFLAGS) install
 
-install-module: .header install-lib
+module: .header
+	cd apache; $(MAKE) $(MFLAGS)
+
+install-module: .header install-lib module
 	cd apache; $(MAKE) $(MFLAGS) install
 
 # make clean and rerun if essential files have been modified

Modified: trunk/mapserver/mapcache/apache/Makefile.in
===================================================================
--- trunk/mapserver/mapcache/apache/Makefile.in	2012-01-05 13:35:37 UTC (rev 12975)
+++ trunk/mapserver/mapcache/apache/Makefile.in	2012-01-05 15:42:20 UTC (rev 12976)
@@ -7,11 +7,8 @@
 install: mod_mapcache.la
 	$(APXS) -i -a -n mapcache mod_mapcache.la
 
-.c.o:
-	$(LIBTOOL) --tag CC --mode=compile $(CC) $(ALL_ENABLED) $(CFLAGS) $(INCLUDES) -c $<
-
-mod_mapcache.la:  mod_mapcache.c ../lib/libmapcache.la
-	$(APXS) -Wc,"$(ALL_ENABLED) $(CFLAGS) $(INCLUDES)" -Wl,"$(LIBS)" -c mod_mapcache.c ../lib/libmapcache.la
+mod_mapcache.la:  mod_mapcache.c $(libdir)/libmapcache.la
+	$(APXS) -Wc,"$(ALL_ENABLED) $(CFLAGS) $(INCLUDES)" -Wl,"$(LIBS)" -c mod_mapcache.c $(libdir)/libmapcache.la
 	
 clean:
 	rm -f *.o