[mapserver-commits] r12236 - trunk/mapserver/mapcache

[svn at osgeo.org]

Author: tbonfort
Date: 2011-08-26 04:09:40 -0700 (Fri, 26 Aug 2011)
New Revision: 12236

Added:
   trunk/mapserver/mapcache/Makefile
Removed:
   trunk/mapserver/mapcache/Makefile.in
Modified:
   trunk/mapserver/mapcache/configure.in
Log:
apr_table_get is already case insensitive, remove superfluous tests
thomas.bonfort | 2011-01-12 10:42:15 +0100 (Wed, 12 Jan 2011)

Added: trunk/mapserver/mapcache/Makefile
===================================================================
--- trunk/mapserver/mapcache/Makefile	                        (rev 0)
+++ trunk/mapserver/mapcache/Makefile	2011-08-26 11:09:40 UTC (rev 12236)
@@ -0,0 +1,20 @@
+include ./Makefile.inc
+
+all: configure .header
+	cd src; $(MAKE) $(MFLAGS)
+	
+install-module: .header
+	cd src; $(MAKE) install-module
+
+# make clean and rerun if essential files have been modified
+.header: include/geocache.h include/util.h include/errors.h Makefile Makefile.inc src/Makefile
+	$(MAKE) clean
+	@touch .header
+	
+clean:
+	cd src; $(MAKE) clean
+
+configure: configure.in
+	@autoconf
+	@echo "configure has been updated/created and should be (re)run before continuing"
+	@exit 1

Deleted: trunk/mapserver/mapcache/Makefile.in
===================================================================
--- trunk/mapserver/mapcache/Makefile.in	2011-08-26 11:09:35 UTC (rev 12235)
+++ trunk/mapserver/mapcache/Makefile.in	2011-08-26 11:09:40 UTC (rev 12236)
@@ -1,17 +0,0 @@
-include ./Makefile.inc
-
-all: .header force_look
-	cd src; $(MAKE) $(MFLAGS)
-	
-install-module:
-	cd src; $(MAKE) install-module
-
-.header: include/geocache.h include/util.h include/errors.h
-	$(MAKE) clean
-	touch .header
-	
-force_look:
-	true
-
-clean:
-	cd src; $(MAKE) clean

Modified: trunk/mapserver/mapcache/configure.in
===================================================================
--- trunk/mapserver/mapcache/configure.in	2011-08-26 11:09:35 UTC (rev 12235)
+++ trunk/mapserver/mapcache/configure.in	2011-08-26 11:09:40 UTC (rev 12236)
@@ -1,5 +1,5 @@
 # Required initializer
-AC_INIT(Makefile.in)
+AC_INIT(Makefile.inc.in)
 
 # don't let AC_PROG_CC force "-g -O2"
 : ${CFLAGS="-Wall"}
@@ -405,6 +405,6 @@
 CURL_CHECK
 
 # Write config.status and the Makefile
-AC_CONFIG_FILES(Makefile Makefile.inc)
+AC_CONFIG_FILES(Makefile.inc)
 
 AC_OUTPUT