Browse Source

Broken autotools workaround

The autotolls has a known bug. It doesn't use dependencies while installation libtool
libraries.
pkun 11 years ago
parent
commit
0f9e7e730c
5 changed files with 9 additions and 40 deletions
  1. 2 3
      Makefile.am
  2. 5 1
      clish/module.am
  3. 0 36
      configure.ac
  4. 1 0
      konf/module.am
  5. 1 0
      tinyrl/module.am

+ 2 - 3
Makefile.am

@@ -31,9 +31,8 @@ EXTRA_DIST = \
 	CHANGES \
 	ISSUES
 
-include $(top_srcdir)/bin/module.am
-include $(top_srcdir)/clish/module.am
 include $(top_srcdir)/lub/module.am
 include $(top_srcdir)/tinyrl/module.am
 include $(top_srcdir)/konf/module.am
-
+include $(top_srcdir)/clish/module.am
+include $(top_srcdir)/bin/module.am

+ 5 - 1
clish/module.am

@@ -9,11 +9,15 @@ libclish_la_SOURCES = \
     clish/private.h
 
 libclish_la_LDFLAGS = @XML_LDFLAGS@
-libclish_la_CFLAGS = @LUB_CFLAGS@ @XML_CFLAGS@ $(DEBUG_CFLAGS)
+libclish_la_CFLAGS = @XML_CFLAGS@ $(DEBUG_CFLAGS)
 libclish_la_LIBADD = \
 	liblub.la \
 	libtinyrl.la \
 	libkonf.la @XML_LIBS@
+libclish_la_DEPENDENCIES = \
+	liblub.la \
+	libtinyrl.la \
+	libkonf.la
 
 nobase_include_HEADERS += \
 	clish/types.h \

+ 0 - 36
configure.ac

@@ -402,42 +402,6 @@ AC_SUBST(XML_LIBS)
 AC_SUBST(XML_LDFLAGS)
 AC_SUBST(XML_CFLAGS)
 
-################################
-# Check for the LUB library
-################################
-LUB_LIBS="-llub"
-LUB_CFLAGS=""
-
-if test "x$LUB_LIBS" = "x"; then
-    AC_MSG_ERROR([Cannot find the "Little Useful Bits" library])
-fi
-AC_SUBST(LUB_LIBS)
-AC_SUBST(LUB_CFLAGS)
-
-################################
-# Check for the KONF library
-################################
-KONF_LIBS="-lkonf"
-KONF_CFLAGS=""
-
-if test "x$KONF_LIBS" = "x"; then
-    AC_MSG_ERROR([Cannot find the "CLI config" library])
-fi
-AC_SUBST(KONF_LIBS)
-AC_SUBST(KONF_CFLAGS)
-
-################################
-# Check for the TINYRL library
-################################
-TINYRL_LIBS="-ltinyrl"
-TINYRL_CFLAGS=""
-
-if test "x$TINYRL_LIBS" = "x"; then
-    AC_MSG_ERROR([Cannot find the "Tiny Readline" library])
-fi
-AC_SUBST(TINYRL_LIBS)
-AC_SUBST(TINYRL_CFLAGS)
-
 ################################
 # Search for network functions (like connect())
 ################################

+ 1 - 0
konf/module.am

@@ -2,6 +2,7 @@
 lib_LTLIBRARIES += libkonf.la
 libkonf_la_SOURCES =
 libkonf_la_LIBADD = liblub.la
+libkonf_la_DEPENDENCIES = liblub.la
 
 nobase_include_HEADERS += \
 	konf/tree.h \

+ 1 - 0
tinyrl/module.am

@@ -1,6 +1,7 @@
 ## Process this file with automake to generate Makefile.in
 lib_LTLIBRARIES += libtinyrl.la
 libtinyrl_la_LIBADD = liblub.la
+libtinyrl_la_DEPENDENCIES = liblub.la
 
 libtinyrl_la_SOURCES = \
 	tinyrl/tinyrl.c \