From cbe756f902819413994d9bfcdb241590ce36dca4 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Thu, 11 Aug 2005 10:44:52 +0000 Subject: [PATCH] * amd/Makefile.am: f/lex libraries are incompatible with multiple scanners, so don't link Amd with libl.a/libfl.a. --- ChangeLog | 9 ++++++--- amd/Makefile.am | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7981df..1347043 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-08-11 Erez Zadok + + * amd/Makefile.am: f/lex libraries are incompatible with multiple + scanners, so don't link Amd with libl.a/libfl.a. + 2005-08-10 Daniel P. Ottavio * amd/sun_map_tok.l: Clean up regular expression so HPUX stops @@ -13,7 +18,7 @@ non-flex lex to parse strings instead of files. Added some casts to strlcpy usage to silence warnings. Moved the % options because HPUX was complaining, - + 2005-08-08 Daniel P. Ottavio * amd/sun_map_tok.l: Applied some definition goop to handle the @@ -11480,5 +11485,3 @@ Wed Dec 10 22:19:29 1996 Erez "HWank1" Zadok ******************************************************************* *** Initial ChangeLog Entry *** ******************************************************************* - LocalWords: Erez - \ No newline at end of file diff --git a/amd/Makefile.am b/amd/Makefile.am index a8b0fb8..2cfc28a 100644 --- a/amd/Makefile.am +++ b/amd/Makefile.am @@ -129,7 +129,9 @@ amd_LDADD = $(EXTRA_amd_OBJECTS) get_args.o ../libamu/libamu.la EXTRA_sun2amd_OBJECTS = @AMD_INFO_OBJS@ sun2amd_LDADD = $(EXTRA_sun2amd_OBJECTS) ../libamu/libamu.la # must manually add f/lex library to LIBS, and not to LDADD. -LIBS = @LIBS@ @LEXLIB@ @WRAPLIB@ +##LIBS = @LIBS@ @LEXLIB@ @WRAPLIB@ +# f/lex libraries are incomatible with multiple scanners: don't include +LIBS = @LIBS@ @WRAPLIB@ # additional files to distribute and clean EXTRA_DIST = ops_TEMPLATE.c $(man_MANS) $(TESTS) -- 2.43.0