From: Sandro Santilli <strk@keybit.net>
Date: Fri, 5 Sep 2014 15:25:51 +0000 (+0000)
Subject: Fix parser rules to run automatically if needed
X-Git-Tag: 2.2.0rc1~854
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=412dee8e19ea2798d3905cb267a3dccdfdc2eeed;p=postgis

Fix parser rules to run automatically if needed

git-svn-id: http://svn.osgeo.org/postgis/trunk@12950 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/liblwgeom/Makefile.in b/liblwgeom/Makefile.in
index 704ddb1ec..8e485024f 100644
--- a/liblwgeom/Makefile.in
+++ b/liblwgeom/Makefile.in
@@ -29,9 +29,6 @@ SOVER = @POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@.@POSTGIS_MICRO_VERSION@
 YACC=@YACC@
 LEX=@LEX@
 
-%c: %l
-	@echo "WARNING: Lexer not generated. Run 'make parser' to manually build lexer/parser."
-
 # Standalone LWGEOM objects
 SA_OBJS = \
 	stringbuffer.o \
@@ -110,6 +107,7 @@ SA_HEADERS = \
 	liblwgeom_internal.h \
 	lwgeom_log.h \
 	lwgeom_geos.h \
+  lwin_wkt_parse.h \
   varint.h
 
 all: liblwgeom.la
@@ -163,15 +161,11 @@ $(LT_SA_OBJS): %.lo: %.c
 $(LT_NM_OBJS): %.lo: %.c
 	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(NUMERICFLAGS) -c -o $@ $<
 
-# Manually generate WKT parser from Flex/Bison inputs
-# Bison 2.5, Flex 2.5.35
-parser:
+lwin_wkt_parse.c lwin_wkt_parse.h: lwin_wkt_parse.y
 	$(YACC) -o'lwin_wkt_parse.c' -d lwin_wkt_parse.y
-	$(LEX) -i lwin_wkt_lex.l
-#	$(YACC) --debug --verbose -o'$@' -d $<
-#	$(YACC) -o'$@' -d $^
-#	$(LEX) -i $<
 
+lwin_wkt_lex.c: lwin_wkt_lex.l
+	$(LEX) -i lwin_wkt_lex.l
 
 liblwgeom.h: liblwgeom.h.in
 	cd .. && ./config.status