fix build with improved make: lex/yacc interdependencies should be marked

as DEV_ONLY, because with a full dependency analysis, it will trigger
rebuild, and our flex doesn't understand this source.
This commit is contained in:
espie 2008-07-18 14:20:34 +00:00
parent d709c64567
commit bd913ef132
2 changed files with 52 additions and 0 deletions

View File

@ -0,0 +1,27 @@
$OpenBSD: patch-src_libicalss_Makefile_am,v 1.1 2008/07/18 14:20:34 espie Exp $
--- src/libicalss/Makefile.am.orig Fri Jul 18 16:14:42 2008
+++ src/libicalss/Makefile.am Fri Jul 18 16:15:23 2008
@@ -29,11 +29,7 @@ LEX_OUTPUT_ROOT = lex.ss
all: icalss.h
-# just to get it built
-$(srcdir)/icalgauge.c: icalssyacc.h
-$(srcdir)/icalsslexer.c: icalssyacc.h
-
if WITH_BDB4
BDB_INCLUDE=-I@BDB_DIR_INCLUDE@ -DWITH_BDB4
BDB_SOURCEFILES=icalbdbset.c icalbdbset.h icalbdbsetimpl.h
@@ -63,6 +59,11 @@ libicalss_la_LIBADD = $(BDB_LIBFILES)
if DEV
libicalss_la_DEVSOURCES = icalsslexer.l icalssyacc.y
+
+# just to get it built
+$(srcdir)/icalgauge.c: icalssyacc.h
+$(srcdir)/icalsslexer.c: icalssyacc.h
+
else
libicalss_la_DEVSOURCES = icalsslexer.c icalssyacc.c
endif

View File

@ -0,0 +1,25 @@
$OpenBSD: patch-src_libicalss_Makefile_in,v 1.1 2008/07/18 14:20:34 espie Exp $
--- src/libicalss/Makefile.in.orig Fri Jul 18 16:15:26 2008
+++ src/libicalss/Makefile.in Fri Jul 18 16:16:51 2008
@@ -274,6 +274,10 @@ libicalss_la_LDFLAGS = -version-info 27:6:27
libicalss_la_LIBADD = $(BDB_LIBFILES)
@DEV_FALSE@libicalss_la_DEVSOURCES = icalsslexer.c icalssyacc.c
@DEV_TRUE@libicalss_la_DEVSOURCES = icalsslexer.l icalssyacc.y
+@DEV_TRUE@# just to get it built
+@DEV_TRUE@$(srcdir)/icalgauge.c: icalssyacc.h
+@DEV_TRUE@$(srcdir)/icalsslexer.c: icalssyacc.h
+
libicalss_la_SOURCES = \
icalcalendar.c \
icalcalendar.h \
@@ -654,10 +658,6 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARI
all: icalss.h
-
-# just to get it built
-$(srcdir)/icalgauge.c: icalssyacc.h
-$(srcdir)/icalsslexer.c: icalssyacc.h
icalss.h: $(COMBINEDHEADERS)
echo '#ifdef __cplusplus' > icalss.h