[mapserver-commits] r13124 - trunk/mapserver/tinyows

[svn at osgeo.org]

Author: colivier
Date: 2012-02-08 17:33:25 -0800 (Wed, 08 Feb 2012)
New Revision: 13124

Modified:
   trunk/mapserver/tinyows/Makefile.in
   trunk/mapserver/tinyows/configure.in
Log:
remove ows_api.h generation
ol | 2008-03-02 19:44:43 +0100 (Sun, 02 Mar 2008)

Modified: trunk/mapserver/tinyows/Makefile.in
===================================================================
--- trunk/mapserver/tinyows/Makefile.in	2012-02-09 01:33:18 UTC (rev 13123)
+++ trunk/mapserver/tinyows/Makefile.in	2012-02-09 01:33:25 UTC (rev 13124)
@@ -9,33 +9,19 @@
 
 SRC = $(wildcard src/*/*.c)
 
-all: @API@ check_api
+all:
 	$(CC) $(CFLAGS) $(PGFLAGS) $(XMLFLAGS) $(SRC) -o tinyows
 
-
-check_api: 
-	@ls src/ows_api.h > /dev/null 2> /dev/null || (echo "You must run ./configure --enable-api first !" && exit 1)
-	
-
-api:
-	@echo  "ows_api.h generation"
-	@cat $(SRC) | indent -nbfda -nbfde -npsl -l1000 > .foo.c
-	@ctags --c-kinds=f -o .tags .foo.c
-	@echo "/* This file is generated by Makefile, don't edit */" > src/ows_api.h
-	@cat .tags | sed -e "/static/d" -e "/!_/d" -e "s/\(.*\)\/^\(.*\)/\2/" -e "s/\(.*\))\(.*\)/\1);/" >> src/ows_api.h
-	@rm -f .foo.c .tags
-
-
 svn-clean: clean doc-clean
 	@find . -name '*~' -exec rm {} \;
-	@rm -f src/ows_api.h configure
+	@rm -f configure
 
 clean: 
 	@rm -f tinyows ERROR Makefile src/ows_define.h
 
 
 install:
-	mkdir --parents $(PREFIX)/tinyows
+	mkdir -p $(PREFIX)/tinyows
 	cp tinyows $(PREFIX)/tinyows/
 	cp -rf schema $(PREFIX)/tinyows/
 	cp -i config.xml $(PREFIX)/tinyows/

Modified: trunk/mapserver/tinyows/configure.in
===================================================================
--- trunk/mapserver/tinyows/configure.in	2012-02-09 01:33:18 UTC (rev 13123)
+++ trunk/mapserver/tinyows/configure.in	2012-02-09 01:33:25 UTC (rev 13124)
@@ -10,27 +10,8 @@
 	AC_MSG_ERROR(postgresql must be installed)
 fi
 
-AC_ARG_ENABLE(api,
-        [  --enable-api        	  Generate api.h file (developpers only)],
-        ENABLE_API=1, ENABLE_API=0)
-
-if test [ $ENABLE_API == 1]; then
-        AC_CHECK_PROG(HAVE_CTAGS, ctags, yes, no)
-        if test [ $HAVE_CTAGS = no ]; then
-                AC_MSG_ERROR(exuberant ctags must be installed to deal with api.h generation)
-        fi
-
-	if test [ `ctags --version | grep Exuberant > /dev/null && echo 1 || echo 0` = 0 ]; then
-                AC_MSG_ERROR(exuberant ctags must be installed instead of emacs ctags)
-        fi
-
-	API=api
-fi
-
-	
 AC_CHECK_FUNCS()
 
-AC_SUBST(API)
 AC_OUTPUT(Makefile src/ows_define.h)
 
 rm -rf autom4te.cache