build: Link $(LIBOBJS) from src/ dir, remove libcompat.la.

The libcompat.la library was small and less friendly to bootstrapping
and cross compilation. Now, we will simply link individual object
files as needed, which is simpler.

diff --git a/configure.ac b/configure.ac
index 362740a99d77516e16af649ec0692f216bf213a2..bb8287fc85fbc1e6f05f6e86599b7eb96ddbc2c6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ AC_INIT([the fast lexical analyser generator],[2.6.3],[flex-help@lists.sourcefor
 AC_CONFIG_SRCDIR([src/scan.l])
 AC_CONFIG_AUX_DIR([build-aux])
 LT_INIT
-AM_INIT_AUTOMAKE([-Wno-portability foreign check-news std-options dist-lzip parallel-tests 1.14.1])
+AM_INIT_AUTOMAKE([-Wno-portability foreign check-news std-options dist-lzip parallel-tests subdir-objects 1.14.1])
 AC_CONFIG_HEADER([src/config.h])
 AC_CONFIG_LIBOBJ_DIR([lib])
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 011163e083ac8b75cbff5a99795014991d1fca2d..9ce06a81ea45b2883a6faf07a0d2136bb2a4e647 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1 @@
-noinst_LTLIBRARIES = libcompat.la
-libcompat_la_SOURCES = lib.c
-libcompat_la_LIBADD = $(LTLIBOBJS)
-
+# dummy

diff --git a/lib/lib.c b/lib/lib.c
deleted file mode 100644 (file)
index 4b4bf73..0000000
--- a/lib/lib.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Since building an empty library could cause problems, we provide a
- * function to go into the library. We could make this non-trivial by
- * moving something that flex treats as a library function into this
- * directory. */
-
-extern void do_nothing(void);
-
-void do_nothing(void){ return;}
-

diff --git a/src/Makefile.am b/src/Makefile.am
index b5b34d483b61397f40160a7cbac85ed87b0864d5..fdd3c92dcef649dbccfd5c5965e7b925a41dcb8c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -59,7 +59,7 @@ COMMON_SOURCES = \
        version.h \
        yylex.c
 
-LDADD = ../lib/libcompat.la @LIBINTL@
+LDADD = $(LIBOBJS) @LIBINTL@
 
 include_HEADERS = \
        FlexLexer.h