Преглед изворни кода

build: Refactor common linker objects into LDADD

Guillem Jover пре 15 година
родитељ
комит
0ba66256fb
2 измењених фајлова са 6 додато и 38 уклоњено
  1. 1 15
      lib/dpkg/test/Makefile.am
  2. 5 23
      src/Makefile.am

+ 1 - 15
lib/dpkg/test/Makefile.am

@@ -4,6 +4,7 @@ AM_CPPFLAGS = \
 	-idirafter $(top_srcdir)/lib/compat \
 	-I$(top_builddir) \
 	-I$(top_srcdir)/lib
+LDADD = ../libdpkg.a
 
 
 # The tests are sorted in order of increasing complexity.
@@ -21,19 +22,4 @@ check_PROGRAMS = \
 	t-pkg-list \
 	t-pkg-queue
 
-CHECK_LDADD = ../libdpkg.a
-
-t_ar_LDADD = $(CHECK_LDADD)
-t_command_LDADD = $(CHECK_LDADD)
-t_macros_LDADD = $(CHECK_LDADD)
-t_path_LDADD = $(CHECK_LDADD)
-t_pkginfo_LDADD = $(CHECK_LDADD)
-t_pkg_list_LDADD = $(CHECK_LDADD)
-t_pkg_queue_LDADD = $(CHECK_LDADD)
-t_string_LDADD = $(CHECK_LDADD)
-t_buffer_LDADD = $(CHECK_LDADD)
-t_test_LDADD = $(CHECK_LDADD)
-t_varbuf_LDADD = $(CHECK_LDADD)
-t_version_LDADD = $(CHECK_LDADD)
-
 TESTS = $(check_PROGRAMS)

+ 5 - 23
src/Makefile.am

@@ -9,6 +9,10 @@ AM_CPPFLAGS = \
 	-idirafter $(top_srcdir)/lib/compat \
 	-I$(top_builddir) \
 	-I$(top_srcdir)/lib
+LDADD = \
+	../lib/dpkg/libdpkg.a \
+	../lib/compat/libcompat.a \
+	$(LIBINTL)
 
 
 EXTRA_DIST = \
@@ -42,9 +46,7 @@ dpkg_SOURCES = \
 	update.c
 
 dpkg_LDADD = \
-	../lib/dpkg/libdpkg.a \
-	../lib/compat/libcompat.a \
-	$(LIBINTL) \
+	$(LDADD) \
 	$(SELINUX_LIBS)
 
 dpkg_divert_SOURCES = \
@@ -52,39 +54,19 @@ dpkg_divert_SOURCES = \
 	divertdb.c \
 	divertcmd.c
 
-dpkg_divert_LDADD = \
-	../lib/dpkg/libdpkg.a \
-	../lib/compat/libcompat.a \
-	$(LIBINTL)
-
 dpkg_query_SOURCES = \
 	filesdb.c filesdb.h \
 	divertdb.c \
 	querycmd.c
 
-dpkg_query_LDADD = \
-	../lib/dpkg/libdpkg.a \
-	../lib/compat/libcompat.a \
-	$(LIBINTL)
-
 dpkg_statoverride_SOURCES = \
 	filesdb.c filesdb.h \
 	statdb.c \
 	statcmd.c
 
-dpkg_statoverride_LDADD = \
-	../lib/dpkg/libdpkg.a \
-	../lib/compat/libcompat.a \
-	$(LIBINTL)
-
 dpkg_trigger_SOURCES = \
 	trigcmd.c
 
-dpkg_trigger_LDADD = \
-	../lib/dpkg/libdpkg.a \
-	../lib/compat/libcompat.a \
-	$(LIBINTL)
-
 install-data-local:
 	$(mkdir_p) $(DESTDIR)$(pkgconfdir)/dpkg.cfg.d
 	$(mkdir_p) $(DESTDIR)$(admindir)/info