[lcd4linux @ 2003-10-04 07:54:17 by reinelt]

autoconf/automake/libtool fixes from Ronald Landheer-Cieslak

1 files changed, 17 insertions, 29 deletions

diff --git a/Makefile.am b/Makefile.am
index 8881956..459021e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,23 +2,19 @@
 
 AUTOMAKE_OPTIONS = gnu
 CLEANFILES = *~
+DRIVERS=@DRIVERS@
 
 bin_PROGRAMS = lcd4linux
-# deactivateing shared lib target for the moment until
-# libtool works cleanly...
-#lib_LTLIBRARIES = liblcd4linux.la
+lib_LTLIBRARIES = liblcd4linux.la
 
 AM_CFLAGS = $(X_CFLAGS) -D_GNU_SOURCE -Wall
 
 lcd4linux_LDFLAGS = $(X_LIBS)
-lcd4linux_LDADD = @DRIVERS@ @DRVLIBS@
+lcd4linux_LDADD = @DRIVERS@ @DRVLIBS@ liblcd4linux.la
 lcd4linux_DEPENDENCIES = @DRIVERS@
 
 lcd4linux_SOURCES = \
 lcd4linux.c \
-debug.c debug.h \
-cfg.c cfg.h \
-lock.c lock.h \
 pid.c pid.h \
 parser.c parser.h \
 processor.c processor.h \
@@ -29,19 +25,27 @@ seti.c seti.h \
 battery.c battery.h \
 dvb.c dvb.h \
 filter.c filter.h \
-udelay.c udelay.h \
+widget.c widget.h \
+exec.c exec.h \
+mail2.c \
+socket.c socket.h
+
+liblcd4linux_la_LDFLAGS = -version-info 9:11:9
+liblcd4linux_la_LIBADD=$(DRIVERS)
+
+liblcd4linux_la_SOURCES = \
 display.c display.h \
+debug.c debug.h \
+cfg.c cfg.h \
+lock.c lock.h \
 pixmap.c pixmap.h \
-widget.c widget.h \
 bar.c bar.h \
 icon.c icon.h \
 fontmap.c fontmap.h \
-exec.c exec.h \
-mail2.c \
-socket.c socket.h
+parport.c parport.h \
+udelay.c udelay.h 
 
 EXTRA_lcd4linux_SOURCES= \
-parport.c parport.h \
 BeckmannEgle.c \
 Crystalfontz.c \
 Cwlinux.c \
@@ -58,22 +62,6 @@ Skeleton.c \
 XWindow.c \
 Text.c
 
-# deactivated
-# liblcd4linux_la_LDFLAGS = -version-info 9:11:9
-
-# liblcd4linux_la_SOURCES = \
-display.c display.h \
-debug.c debug.h \
-cfg.c cfg.h \
-lock.c lock.h \
-pixmap.c pixmap.h \
-bar.c bar.h \
-icon.c icon.h \
-fontmap.c fontmap.h \
-parport.c parport.h \
-udelay.c udelay.h \
-@DRIVERS@
-
 EXTRA_DIST = \
 lcd4linux.conf.sample \
 lcd4kde.conf \