Merge pull request #39 from chu11/bisonfix

libgenders/Makefile.am: Add make target for genders_query.tab.c
chaos · Oct 31, 2019 · 4016565 · 4016565
2 parents 0f10a13 + 841ebbd
commit 4016565
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-31  Albert Chu  <[email protected]>
+
+	* src/libgenders/Makefile.am: Add make target for
+	query_parse.tab.c.
+
 2019-10-30  Albert Chu  <[email protected]>
 
 	* src/libgenders/genders_parsing.c: Fix corner case in which lines

diff --git a/META b/META
@@ -6,4 +6,4 @@
   Meta:		1
   Name:		genders
   Version:	1.27
-  Release:	1
+  Release:	2
diff --git a/configure b/configure
@@ -3281,7 +3281,7 @@ fi
 # release, then set age to 0.
 #
 LIBGENDERS_CURRENT=3
-LIBGENDERS_REVISION=2
+LIBGENDERS_REVISION=3
 LIBGENDERS_AGE=3
 LIBGENDERS_VERSION_INFO=$LIBGENDERS_CURRENT:$LIBGENDERS_REVISION:$LIBGENDERS_AGE
 

diff --git a/configure.ac b/configure.ac
@@ -37,7 +37,7 @@ AM_MAINTAINER_MODE
 # release, then set age to 0.
 #                                               
 LIBGENDERS_CURRENT=3
-LIBGENDERS_REVISION=2
+LIBGENDERS_REVISION=3
 LIBGENDERS_AGE=3
 LIBGENDERS_VERSION_INFO=$LIBGENDERS_CURRENT:$LIBGENDERS_REVISION:$LIBGENDERS_AGE
 AC_SUBST([LIBGENDERS_VERSION_INFO])

diff --git a/src/libgenders/Makefile.am b/src/libgenders/Makefile.am
@@ -37,6 +37,10 @@ genders_query_parse.c: genders_query.c $(srcdir)/genders_query_parse.l
 genders_query.c: $(srcdir)/genders_query.y
 	$(YACC) -d -b genders_query $(srcdir)/genders_query.y
 
+# achu: -o option in yacc/bison is not portable, use -b instead
+genders_query.tab.c: $(srcdir)/genders_query.y
+	$(YACC) -d -b genders_query $(srcdir)/genders_query.y
+
 CLEANFILES = genders_query_parse.c genders_query.tab.c genders_query.tab.h
 
 EXTRA_DIST = genders.map genders_query_parse.l genders_query.y

diff --git a/src/libgenders/Makefile.in b/src/libgenders/Makefile.in
@@ -772,6 +772,10 @@ genders_query_parse.c: genders_query.c $(srcdir)/genders_query_parse.l
 genders_query.c: $(srcdir)/genders_query.y
 	$(YACC) -d -b genders_query $(srcdir)/genders_query.y
 
+# achu: -o option in yacc/bison is not portable, use -b instead
+genders_query.tab.c: $(srcdir)/genders_query.y
+	$(YACC) -d -b genders_query $(srcdir)/genders_query.y
+
 ../libcommon/libcommon.la: force-dependency-check
 	@cd `dirname $@` && make `basename $@`