Skip to content

Commit 4016565

Browse files
authored
Merge pull request #39 from chu11/bisonfix
libgenders/Makefile.am: Add make target for genders_query.tab.c
2 parents 0f10a13 + 841ebbd commit 4016565

File tree

6 files changed

+16
-3
lines changed

6 files changed

+16
-3
lines changed

ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2019-10-31 Albert Chu <chu11@llnl.gov>
2+
3+
* src/libgenders/Makefile.am: Add make target for
4+
query_parse.tab.c.
5+
16
2019-10-30 Albert Chu <chu11@llnl.gov>
27

38
* src/libgenders/genders_parsing.c: Fix corner case in which lines

META

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
Meta: 1
77
Name: genders
88
Version: 1.27
9-
Release: 1
9+
Release: 2

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3281,7 +3281,7 @@ fi
32813281
# release, then set age to 0.
32823282
#
32833283
LIBGENDERS_CURRENT=3
3284-
LIBGENDERS_REVISION=2
3284+
LIBGENDERS_REVISION=3
32853285
LIBGENDERS_AGE=3
32863286
LIBGENDERS_VERSION_INFO=$LIBGENDERS_CURRENT:$LIBGENDERS_REVISION:$LIBGENDERS_AGE
32873287

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ AM_MAINTAINER_MODE
3737
# release, then set age to 0.
3838
#
3939
LIBGENDERS_CURRENT=3
40-
LIBGENDERS_REVISION=2
40+
LIBGENDERS_REVISION=3
4141
LIBGENDERS_AGE=3
4242
LIBGENDERS_VERSION_INFO=$LIBGENDERS_CURRENT:$LIBGENDERS_REVISION:$LIBGENDERS_AGE
4343
AC_SUBST([LIBGENDERS_VERSION_INFO])

src/libgenders/Makefile.am

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ genders_query_parse.c: genders_query.c $(srcdir)/genders_query_parse.l
3737
genders_query.c: $(srcdir)/genders_query.y
3838
$(YACC) -d -b genders_query $(srcdir)/genders_query.y
3939

40+
# achu: -o option in yacc/bison is not portable, use -b instead
41+
genders_query.tab.c: $(srcdir)/genders_query.y
42+
$(YACC) -d -b genders_query $(srcdir)/genders_query.y
43+
4044
CLEANFILES = genders_query_parse.c genders_query.tab.c genders_query.tab.h
4145

4246
EXTRA_DIST = genders.map genders_query_parse.l genders_query.y

src/libgenders/Makefile.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -772,6 +772,10 @@ genders_query_parse.c: genders_query.c $(srcdir)/genders_query_parse.l
772772
genders_query.c: $(srcdir)/genders_query.y
773773
$(YACC) -d -b genders_query $(srcdir)/genders_query.y
774774

775+
# achu: -o option in yacc/bison is not portable, use -b instead
776+
genders_query.tab.c: $(srcdir)/genders_query.y
777+
$(YACC) -d -b genders_query $(srcdir)/genders_query.y
778+
775779
../libcommon/libcommon.la: force-dependency-check
776780
@cd `dirname $@` && make `basename $@`
777781

0 commit comments

Comments
 (0)