* amd/Makefile.am: f/lex libraries are incompatible with multiple

scanners, so don't link Amd with libl.a/libfl.a.

diff --git a/ChangeLog b/ChangeLog
index c7981df1c5093534717901ba7855c54683bb5fef..1347043653f39aebfe07f910958e17dd96862e5a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-11  Erez Zadok  <ezk@cs.sunysb.edu>
+
+       * 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  <dottavio@ic.sunysb.edu>
 
        * 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  <dottavio@ic.sunysb.edu>
 
        * 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  <ezk@shekel.mcl.cs.columbia.edu>
        *******************************************************************
        *** Initial ChangeLog Entry                                     ***
        *******************************************************************
-        LocalWords:  Erez
-       
\ No newline at end of file

diff --git a/amd/Makefile.am b/amd/Makefile.am
index a8b0fb8ce737353d0044c01a004c1144b3cf9e44..2cfc28aafe8d25fc28331c77183821bc1ca85b77 100644 (file)
--- 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)