From 8f95b789776fa1cb3547180784a7b0a78a6c2878 Mon Sep 17 00:00:00 2001 From: Henning Geinitz Date: Sun, 10 Feb 2002 18:38:13 +0000 Subject: [PATCH] Link to functions in lib/ only if they are not available on the system. Avoid duplicating list of functions. Henning Meier-Geinitz --- backend/Makefile.in | 3 +-- lib/Makefile.in | 9 +++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/backend/Makefile.in b/backend/Makefile.in index 9d3709e8a..10cc375b6 100644 --- a/backend/Makefile.in +++ b/backend/Makefile.in @@ -70,8 +70,7 @@ CONFIGS = $(addsuffix .conf,$(ALL_BACKENDS)) saned.conf EXTRA = sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_config.lo # With libtool-1.0, we have to mention each library object explicitly... ;-( -LIBLIB_FUNCS = alloca getenv getopt getopt1 isfdtype sigprocmask snprintf \ - strdup strndup strsep usleep vsyslog inet_ntop +LIBLIB_FUNCS = $(basename @LIBOBJS@ @ALLOCA@ getopt.o getopt1.o md5.o) LIBOBJS = $(addprefix ../lib/,$(addsuffix .lo,$(LIBLIB_FUNCS))) DISTFILES = Makefile.in abaton.c abaton.conf abaton.desc abaton.h \ diff --git a/lib/Makefile.in b/lib/Makefile.in index 562e029b2..900cd02a8 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -46,12 +46,9 @@ MLINK = --mode=link @SET_MAKE@ -LIBLIB_OBJS = alloca.o getopt.o getopt1.o sigprocmask.o strndup.o \ - strdup.o strsep.o snprintf.o usleep.o getenv.o \ - isfdtype.o vsyslog.o md5.o inet_ntop.o -LIBLIB_LTOBJS = alloca.lo getopt.lo getopt1.lo sigprocmask.lo strndup.lo \ - strdup.lo strsep.lo snprintf.lo usleep.lo getenv.lo \ - isfdtype.lo vsyslog.lo md5.lo inet_ntop.lo + +LIBLIB_OBJS = @LIBOBJS@ @ALLOCA@ getopt.o getopt1.o md5.o +LIBLIB_LTOBJS = $(addsuffix .lo,$(basename $(LIBLIB_OBJS))) TARGETS = $(LIBLIB_OBJS) TARGETS = liblib.a