Build libfl and libcompat using libtool; resolves #3586814

Signed-off-by: Will Estes <westes575@gmail.com>

diff --git a/.gitignore b/.gitignore
index defbe3524fccdb8b0a3ca36af350692385dc572b..1120ef6def2b7f6f74adfcb21d9d1768c66b92c0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -32,7 +32,11 @@ stamp-*
 config.rpath
 ylwrap
 *.o
-*.a
+.libs
+*.lo
+*.la
+libtool
+ltmain.sh
 *~
 *.orig
 *.rej

diff --git a/Makefile.am b/Makefile.am
index 6234aba518517c3fa56f208043e8c1d892b35073..d561f725f3128fd7ea6ad741397e741d64097ff9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,9 +39,9 @@ m4 = @M4@
 indent = @INDENT@
 
 bin_PROGRAMS = flex
-lib_LIBRARIES = \
-       libfl.a \
-       libfl_pic.a
+lib_LTLIBRARIES = \
+       libfl.la \
+       libfl_pic.la
 
 flex_SOURCES = \
        ccl.c \
@@ -67,20 +67,16 @@ flex_SOURCES = \
        regex.c
 
 
-LDADD = lib/libcompat.a
+LDADD = lib/libcompat.la
 
-libfl_a_SOURCES = \
+libfl_la_SOURCES = \
        libmain.c \
        libyywrap.c
 
-libfl_pic_a_SOURCES = \
+libfl_pic_la_SOURCES = \
        libmain.c \
        libyywrap.c
 
-libfl_pic_a_CFLAGS =  \
-       -fPIC         \
-       $(AM_CFLAGS)
-
 noinst_HEADERS = \
        flexdef.h \
        flexint.h \

diff --git a/configure.ac b/configure.ac
index 46fe221145a8d10f317adafaafc0b70651abc3b5..c29030f6cf466553ec5b57d8127ccf9f08ea129d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ AC_PROG_CC
 AC_PROG_CXX
 AM_PROG_CC_C_O
 AC_PROG_LN_S
-AC_PROG_RANLIB
+LT_INIT
 AC_PROG_AWK
 AC_PROG_INSTALL
 

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 53b4d488a3e1af6f7c251331ca0e2749f362d167..391465f9ff7720b2f182b3135c80fc1fcd9f8a3f 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LIBRARIES = libcompat.a
-libcompat_a_SOURCES = lib.c
-libcompat_a_LIBADD = $(LIBOBJS)
+noinst_LTLIBRARIES = libcompat.la
+libcompat_la_SOURCES = lib.c
+libcompat_la_LIBADD = $(LIBOBJS)