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.
westes · Nov 24, 2016 · 713f5a0 · 713f5a0
1 parent 11c445c
commit 713f5a0
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 15 deletions.
diff --git 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
@@ -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
diff --git 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