Commit 828cd013 authored by Olaf Meeuwissen's avatar Olaf Meeuwissen

Compile getopt replacement functions only if needed

This ought to get rid of the last empty compilation unit warnings.  This
merges libfelib.la with liblib.la.  The former was always used together
with the latter.  The latter was only ever used without the former when
linking backends and tools.

Tools might want to use the getopt functions, backends might just want
to use MD5.
parent 89dc0500
......@@ -344,6 +344,12 @@ if test "$ac_cv_header_getopt_h" = "yes" ; then
AC_CHECK_FUNCS(getopt_long)
fi
# Slightly abuse the AC_LIBOBJ macro to mark files as replacement code
AS_IF([test x$ac_cv_header_getopt_h != xyes \
&& test x$ac_cv_func_getopt_long != xyes],
[AC_LIBOBJ(getopt)
AC_LIBOBJ(getopt1)])
dnl ***********************************************************************
dnl checks for system services
dnl ***********************************************************************
......
......@@ -18,17 +18,17 @@ AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include
scanimage_SOURCES = scanimage.c stiff.c stiff.h
scanimage_LDADD = ../backend/libsane.la ../sanei/libsanei.la ../lib/liblib.la \
../lib/libfelib.la $(PNG_LIBS) $(JPEG_LIBS)
$(PNG_LIBS) $(JPEG_LIBS)
saned_SOURCES = saned.c
saned_LDADD = ../backend/libsane.la ../sanei/libsanei.la ../lib/liblib.la \
../lib/libfelib.la $(SYSLOG_LIBS) $(SYSTEMD_LIBS)
$(SYSLOG_LIBS) $(SYSTEMD_LIBS)
test_SOURCES = test.c
test_LDADD = ../lib/liblib.la ../lib/libfelib.la ../backend/libsane.la
test_LDADD = ../lib/liblib.la ../backend/libsane.la
tstbackend_SOURCES = tstbackend.c
tstbackend_LDADD = ../lib/liblib.la ../lib/libfelib.la ../backend/libsane.la
tstbackend_LDADD = ../lib/liblib.la ../backend/libsane.la
clean-local:
rm -f test tstbackend
......@@ -5,9 +5,7 @@
## included LICENSE file for license information.
AM_CPPFLAGS += -I. -I$(top_builddir)/include -I$(top_srcdir)/include
noinst_LTLIBRARIES = liblib.la libfelib.la
noinst_LTLIBRARIES = liblib.la
libfelib_la_SOURCES = getopt.c getopt1.c md5.c
liblib_la_SOURCES =
liblib_la_SOURCES = md5.c
liblib_la_LIBADD = $(LTALLOCA) $(LTLIBOBJS)
......@@ -10,7 +10,7 @@ EXTRA_DIST = data/boolean.conf data/empty.conf data/fixed.conf data/int.conf \
data/wrong-fixed.conf data/wrong-range.conf \
data/wrong-string-list.conf
TEST_LDADD = ../../sanei/libsanei.la ../../lib/liblib.la ../../lib/libfelib.la $(MATH_LIB) $(USB_LIBS) $(PTHREAD_LIBS)
TEST_LDADD = ../../sanei/libsanei.la ../../lib/liblib.la $(MATH_LIB) $(USB_LIBS) $(PTHREAD_LIBS)
check_PROGRAMS = sanei_usb_test test_wire sanei_check_test sanei_config_test sanei_constrain_test
TESTS = $(check_PROGRAMS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment