From b5fb5a6475aecf7fbcb91b23b6345c6a63d10208 Mon Sep 17 00:00:00 2001 From: "hyunghwan.chung" Date: Mon, 16 Nov 2020 13:02:52 +0000 Subject: [PATCH] stop specifying explicit DEPENDENCIES by listing the .la files in LDADD/LIBADD --- moo/bin/Makefile.am | 5 +---- moo/bin/Makefile.in | 8 +++----- moo/lib/Makefile.am | 21 ++++++--------------- moo/lib/Makefile.in | 30 +++++++++++++----------------- moo/mod/Makefile.am | 2 +- moo/mod/Makefile.in | 13 +++++++------ moo/t/Makefile.am | 7 +------ moo/t/Makefile.in | 12 +++++------- moo/tools/Makefile.am | 3 --- moo/tools/Makefile.in | 5 ++--- 10 files changed, 39 insertions(+), 67 deletions(-) diff --git a/moo/bin/Makefile.am b/moo/bin/Makefile.am index 7118729..ac7cf5d 100644 --- a/moo/bin/Makefile.am +++ b/moo/bin/Makefile.am @@ -9,8 +9,7 @@ CPPFLAGS_COMMON = \ CFLAGS_COMMON = LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir) -LIBADD_COMMON = -lmoo -DEPENDENCIES_COMMON = ../lib/libmoo.la +LIBADD_COMMON = ../lib/libmoo.la bin_PROGRAMS = moo @@ -22,7 +21,6 @@ moo_CPPFLAGS = $(CPPFLAGS_COMMON) moo_CFLAGS = $(CFLAGS_COMMON) moo_LDFLAGS = $(LDFLAGS_COMMON) moo_LDADD = $(LIBADD_COMMON) -moo_DEPENDENCIES = $(DEPENDENCIES_COMMON) if ENABLE_EXPERIMENTAL @@ -36,6 +34,5 @@ moo_gtk_CPPFLAGS = $(CPPFLAGS_COMMON) -I/usr/include/gtk-3.0 -I/usr/include/at-s moo_gtk_CFLAGS = $(CFLAGS_COMMON) moo_gtk_LDFLAGS = $(LDFLAGS_COMMON) moo_gtk_LDADD = $(LIBADD_COMMON) -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -moo_gtk_DEPENDENCIES = $(DEPENDENCIES_COMMON) endif diff --git a/moo/bin/Makefile.in b/moo/bin/Makefile.in index 8cabba3..986b90e 100644 --- a/moo/bin/Makefile.in +++ b/moo/bin/Makefile.in @@ -113,7 +113,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am_moo_OBJECTS = moo-main.$(OBJEXT) moo_OBJECTS = $(am_moo_OBJECTS) -am__DEPENDENCIES_1 = +moo_DEPENDENCIES = $(LIBADD_COMMON) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -125,6 +125,7 @@ am__moo_gtk_SOURCES_DIST = gtk-main.c @ENABLE_EXPERIMENTAL_TRUE@am_moo_gtk_OBJECTS = \ @ENABLE_EXPERIMENTAL_TRUE@ moo_gtk-gtk-main.$(OBJEXT) moo_gtk_OBJECTS = $(am_moo_gtk_OBJECTS) +@ENABLE_EXPERIMENTAL_TRUE@moo_gtk_DEPENDENCIES = $(LIBADD_COMMON) moo_gtk_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(moo_gtk_CFLAGS) \ $(CFLAGS) $(moo_gtk_LDFLAGS) $(LDFLAGS) -o $@ @@ -339,8 +340,7 @@ CPPFLAGS_COMMON = \ CFLAGS_COMMON = LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir) -LIBADD_COMMON = -lmoo -DEPENDENCIES_COMMON = ../lib/libmoo.la +LIBADD_COMMON = ../lib/libmoo.la ################################################## # moo @@ -350,13 +350,11 @@ moo_CPPFLAGS = $(CPPFLAGS_COMMON) moo_CFLAGS = $(CFLAGS_COMMON) moo_LDFLAGS = $(LDFLAGS_COMMON) moo_LDADD = $(LIBADD_COMMON) -moo_DEPENDENCIES = $(DEPENDENCIES_COMMON) @ENABLE_EXPERIMENTAL_TRUE@moo_gtk_SOURCES = gtk-main.c @ENABLE_EXPERIMENTAL_TRUE@moo_gtk_CPPFLAGS = $(CPPFLAGS_COMMON) -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/libdrm -I/usr/include/libpng16 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include @ENABLE_EXPERIMENTAL_TRUE@moo_gtk_CFLAGS = $(CFLAGS_COMMON) @ENABLE_EXPERIMENTAL_TRUE@moo_gtk_LDFLAGS = $(LDFLAGS_COMMON) @ENABLE_EXPERIMENTAL_TRUE@moo_gtk_LDADD = $(LIBADD_COMMON) -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -@ENABLE_EXPERIMENTAL_TRUE@moo_gtk_DEPENDENCIES = $(DEPENDENCIES_COMMON) all: all-am .SUFFIXES: diff --git a/moo/lib/Makefile.am b/moo/lib/Makefile.am index dd8807c..5d83c60 100644 --- a/moo/lib/Makefile.am +++ b/moo/lib/Makefile.am @@ -122,35 +122,26 @@ if WIN32 libmoo_la_LIBADD += -lpsapi $(SOCKET_LIBS) endif - -libmoo_la_DEPENDENCIES = - if ENABLE_STATIC_MODULE if ENABLE_MOD_CON -libmoo_la_LIBADD += -lmoo-con -libmoo_la_DEPENDENCIES += ../mod/libmoo-con.la +libmoo_la_LIBADD += ../mod/libmoo-con.la endif if ENABLE_MOD_FFI -libmoo_la_LIBADD += -lmoo-ffi -libmoo_la_DEPENDENCIES += ../mod/libmoo-ffi.la +libmoo_la_LIBADD += ../mod/libmoo-ffi.la endif -libmoo_la_LIBADD += -lmoo-io -libmoo_la_DEPENDENCIES += ../mod/libmoo-io.la +libmoo_la_LIBADD += ../mod/libmoo-io.la if ENABLE_MOD_SCK -libmoo_la_LIBADD += -lmoo-sck -libmoo_la_DEPENDENCIES += ../mod/libmoo-sck.la +libmoo_la_LIBADD += ../mod/libmoo-sck.la endif -libmoo_la_LIBADD += -lmoo-stdio -libmoo_la_DEPENDENCIES += ../mod/libmoo-stdio.la +libmoo_la_LIBADD += ../mod/libmoo-stdio.la if ENABLE_MOD_X11 -libmoo_la_LIBADD += -lmoo-x11 -libmoo_la_DEPENDENCIES += ../mod/libmoo-x11.la +libmoo_la_LIBADD += ../mod/libmoo-x11.la endif endif diff --git a/moo/lib/Makefile.in b/moo/lib/Makefile.in index ba9fad0..a3808d5 100644 --- a/moo/lib/Makefile.in +++ b/moo/lib/Makefile.in @@ -94,18 +94,12 @@ host_triplet = @host@ @ENABLE_LIBLTDL_FALSE@am__append_5 = $(DL_LIBS) @ENABLE_LIBUNWIND_TRUE@am__append_6 = $(UNWIND_LIBS) @WIN32_TRUE@am__append_7 = -lpsapi $(SOCKET_LIBS) -@ENABLE_MOD_CON_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_8 = -lmoo-con -@ENABLE_MOD_CON_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_9 = ../mod/libmoo-con.la -@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_10 = -lmoo-ffi -@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_11 = ../mod/libmoo-ffi.la -@ENABLE_STATIC_MODULE_TRUE@am__append_12 = -lmoo-io -@ENABLE_STATIC_MODULE_TRUE@am__append_13 = ../mod/libmoo-io.la -@ENABLE_MOD_SCK_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_14 = -lmoo-sck -@ENABLE_MOD_SCK_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_15 = ../mod/libmoo-sck.la -@ENABLE_STATIC_MODULE_TRUE@am__append_16 = -lmoo-stdio -@ENABLE_STATIC_MODULE_TRUE@am__append_17 = ../mod/libmoo-stdio.la -@ENABLE_MOD_X11_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_18 = -lmoo-x11 -@ENABLE_MOD_X11_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_19 = ../mod/libmoo-x11.la +@ENABLE_MOD_CON_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_8 = ../mod/libmoo-con.la +@ENABLE_MOD_FFI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_9 = ../mod/libmoo-ffi.la +@ENABLE_STATIC_MODULE_TRUE@am__append_10 = ../mod/libmoo-io.la +@ENABLE_MOD_SCK_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_11 = ../mod/libmoo-sck.la +@ENABLE_STATIC_MODULE_TRUE@am__append_12 = ../mod/libmoo-stdio.la +@ENABLE_MOD_X11_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_13 = ../mod/libmoo-x11.la subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_sign.m4 \ @@ -156,6 +150,11 @@ am__DEPENDENCIES_1 = @ENABLE_LIBLTDL_FALSE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) @ENABLE_LIBUNWIND_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) @WIN32_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) +libmoo_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \ + $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) $(am__append_8) \ + $(am__append_9) $(am__append_10) $(am__append_11) \ + $(am__append_12) $(am__append_13) am__libmoo_la_SOURCES_DIST = bct-lab.h moo.h moo-chr.h moo-cmn.h \ moo-fmt.h moo-rbt.h moo-utl.h moo-prv.h pack1.h unpack.h \ bigint.c chr.c comp.c debug.c decode.c dic.c err.c exec.c \ @@ -464,11 +463,8 @@ libmoo_la_CFLAGS = $(CFLAGS_COMMON) libmoo_la_LDFLAGS = $(LDFLAGS_COMMON) libmoo_la_LIBADD = $(LIBADD_COMMON) $(LIBM) $(am__append_4) \ $(am__append_5) $(am__append_6) $(am__append_7) \ - $(am__append_8) $(am__append_10) $(am__append_12) \ - $(am__append_14) $(am__append_16) $(am__append_18) -libmoo_la_DEPENDENCIES = $(am__append_9) $(am__append_11) \ - $(am__append_13) $(am__append_15) $(am__append_17) \ - $(am__append_19) + $(am__append_8) $(am__append_9) $(am__append_10) \ + $(am__append_11) $(am__append_12) $(am__append_13) all: moo-cfg.h $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/moo/mod/Makefile.am b/moo/mod/Makefile.am index badedd3..d15fb30 100644 --- a/moo/mod/Makefile.am +++ b/moo/mod/Makefile.am @@ -43,7 +43,7 @@ else # DYNAMIC MODULES ################################################## LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir) -version-info 1:0:0 -no-undefined -LIBADD_COMMON = -lmoo +LIBADD_COMMON = ../lib/libmoo.la pkgmodexecdir = $(libdir) pkgmodexec_LTLIBRARIES = diff --git a/moo/mod/Makefile.in b/moo/mod/Makefile.in index a0217b8..bbf3879 100644 --- a/moo/mod/Makefile.in +++ b/moo/mod/Makefile.in @@ -139,10 +139,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(pkgmodexecdir)" LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkgmodexec_LTLIBRARIES) -am__DEPENDENCIES_1 = +@ENABLE_STATIC_MODULE_FALSE@am__DEPENDENCIES_1 = ../lib/libmoo.la +am__DEPENDENCIES_2 = @ENABLE_MOD_CON_TRUE@libmoo_con_la_DEPENDENCIES = \ @ENABLE_MOD_CON_TRUE@ $(am__DEPENDENCIES_1) \ -@ENABLE_MOD_CON_TRUE@ $(am__DEPENDENCIES_1) +@ENABLE_MOD_CON_TRUE@ $(am__DEPENDENCIES_2) am__libmoo_con_la_SOURCES_DIST = _con.c _con.h @ENABLE_MOD_CON_TRUE@am_libmoo_con_la_OBJECTS = libmoo_con_la-_con.lo libmoo_con_la_OBJECTS = $(am_libmoo_con_la_OBJECTS) @@ -159,8 +160,8 @@ libmoo_con_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @ENABLE_MOD_CON_TRUE@@ENABLE_STATIC_MODULE_TRUE@am_libmoo_con_la_rpath = @ENABLE_MOD_FFI_TRUE@libmoo_ffi_la_DEPENDENCIES = \ @ENABLE_MOD_FFI_TRUE@ $(am__DEPENDENCIES_1) \ -@ENABLE_MOD_FFI_TRUE@ $(am__DEPENDENCIES_1) \ -@ENABLE_MOD_FFI_TRUE@ $(am__DEPENDENCIES_1) +@ENABLE_MOD_FFI_TRUE@ $(am__DEPENDENCIES_2) \ +@ENABLE_MOD_FFI_TRUE@ $(am__DEPENDENCIES_2) am__libmoo_ffi_la_SOURCES_DIST = ffi.c _ffi.h @ENABLE_MOD_FFI_TRUE@am_libmoo_ffi_la_OBJECTS = libmoo_ffi_la-ffi.lo libmoo_ffi_la_OBJECTS = $(am_libmoo_ffi_la_OBJECTS) @@ -182,7 +183,7 @@ libmoo_io_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @ENABLE_STATIC_MODULE_TRUE@am_libmoo_io_la_rpath = @ENABLE_MOD_SCK_TRUE@libmoo_sck_la_DEPENDENCIES = \ @ENABLE_MOD_SCK_TRUE@ $(am__DEPENDENCIES_1) \ -@ENABLE_MOD_SCK_TRUE@ $(am__DEPENDENCIES_1) +@ENABLE_MOD_SCK_TRUE@ $(am__DEPENDENCIES_2) am__libmoo_sck_la_SOURCES_DIST = sck.c sck-addr.c _sck.h @ENABLE_MOD_SCK_TRUE@am_libmoo_sck_la_OBJECTS = libmoo_sck_la-sck.lo \ @ENABLE_MOD_SCK_TRUE@ libmoo_sck_la-sck-addr.lo @@ -446,7 +447,7 @@ CPPFLAGS_COMMON = \ # STATIC MODULES BUILT INTO MAIN LIBRARY ################################################## @ENABLE_STATIC_MODULE_TRUE@LDFLAGS_COMMON = -L$(libdir) -version-info 1:0:0 -no-undefined -@ENABLE_STATIC_MODULE_FALSE@LIBADD_COMMON = -lmoo +@ENABLE_STATIC_MODULE_FALSE@LIBADD_COMMON = ../lib/libmoo.la @ENABLE_STATIC_MODULE_TRUE@LIBADD_COMMON = @ENABLE_STATIC_MODULE_TRUE@noinst_LTLIBRARIES = $(am__append_1) \ @ENABLE_STATIC_MODULE_TRUE@ $(am__append_2) libmoo-io.la \ diff --git a/moo/t/Makefile.am b/moo/t/Makefile.am index 103e18b..af65130 100644 --- a/moo/t/Makefile.am +++ b/moo/t/Makefile.am @@ -8,8 +8,7 @@ CPPFLAGS_COMMON = \ -I$(includedir) CFLAGS_COMMON = LDFLAGS_COMMON=-L$(abs_builddir)/../lib -L$(libdir) -LIBADD_COMMON = -lmoo -DEPENDENCIES_COMMON = ../lib/libmoo.la +LIBADD_COMMON = ../lib/libmoo.la check_PROGRAMS = t-001 t-002 t-003 t-004 t-005 @@ -21,28 +20,24 @@ t_002_CPPFLAGS = $(CPPFLAGS_COMMON) t_002_CFLAGS = $(CFLAGS_COMMON) t_002_LDFLAGS = $(LDFLAGS_COMMON) t_002_LDADD = $(LIBADD_COMMON) -t_002_DEPENDENCIES = $(DEPENDENCIES_COMMON) t_003_SOURCES = t-003.c t.h t_003_CPPFLAGS = $(CPPFLAGS_COMMON) t_003_CFLAGS = $(CFLAGS_COMMON) t_003_LDFLAGS = $(LDFLAGS_COMMON) t_003_LDADD = $(LIBADD_COMMON) -t_003_DEPENDENCIES = $(DEPENDENCIES_COMMON) t_004_SOURCES = t-004.c t.h t_004_CPPFLAGS = $(CPPFLAGS_COMMON) t_004_CFLAGS = $(CFLAGS_COMMON) t_004_LDFLAGS = $(LDFLAGS_COMMON) t_004_LDADD = $(LIBADD_COMMON) -t_004_DEPENDENCIES = $(DEPENDENCIES_COMMON) t_005_SOURCES = t-005.c t.h t_005_CPPFLAGS = $(CPPFLAGS_COMMON) t_005_CFLAGS = $(CFLAGS_COMMON) t_005_LDFLAGS = $(LDFLAGS_COMMON) t_005_LDADD = $(LIBADD_COMMON) -t_005_DEPENDENCIES = $(DEPENDENCIES_COMMON) TESTS = $(check_PROGRAMS) diff --git a/moo/t/Makefile.in b/moo/t/Makefile.in index fe1cc5d..5fa447f 100644 --- a/moo/t/Makefile.in +++ b/moo/t/Makefile.in @@ -112,22 +112,25 @@ am__v_lt_0 = --silent am__v_lt_1 = am_t_002_OBJECTS = t_002-t-002.$(OBJEXT) t_002_OBJECTS = $(am_t_002_OBJECTS) -am__DEPENDENCIES_1 = +t_002_DEPENDENCIES = $(LIBADD_COMMON) t_002_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(t_002_CFLAGS) $(CFLAGS) \ $(t_002_LDFLAGS) $(LDFLAGS) -o $@ am_t_003_OBJECTS = t_003-t-003.$(OBJEXT) t_003_OBJECTS = $(am_t_003_OBJECTS) +t_003_DEPENDENCIES = $(LIBADD_COMMON) t_003_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(t_003_CFLAGS) $(CFLAGS) \ $(t_003_LDFLAGS) $(LDFLAGS) -o $@ am_t_004_OBJECTS = t_004-t-004.$(OBJEXT) t_004_OBJECTS = $(am_t_004_OBJECTS) +t_004_DEPENDENCIES = $(LIBADD_COMMON) t_004_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(t_004_CFLAGS) $(CFLAGS) \ $(t_004_LDFLAGS) $(LDFLAGS) -o $@ am_t_005_OBJECTS = t_005-t-005.$(OBJEXT) t_005_OBJECTS = $(am_t_005_OBJECTS) +t_005_DEPENDENCIES = $(LIBADD_COMMON) t_005_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(t_005_CFLAGS) $(CFLAGS) \ $(t_005_LDFLAGS) $(LDFLAGS) -o $@ @@ -550,8 +553,7 @@ CPPFLAGS_COMMON = \ CFLAGS_COMMON = LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir) -LIBADD_COMMON = -lmoo -DEPENDENCIES_COMMON = ../lib/libmoo.la +LIBADD_COMMON = ../lib/libmoo.la t_001_SOURCES = t-001.c t.h t_001_CPPFLAGS = $(CPPFLAGS_COMMON) t_002_SOURCES = t-002.c t.h @@ -559,25 +561,21 @@ t_002_CPPFLAGS = $(CPPFLAGS_COMMON) t_002_CFLAGS = $(CFLAGS_COMMON) t_002_LDFLAGS = $(LDFLAGS_COMMON) t_002_LDADD = $(LIBADD_COMMON) -t_002_DEPENDENCIES = $(DEPENDENCIES_COMMON) t_003_SOURCES = t-003.c t.h t_003_CPPFLAGS = $(CPPFLAGS_COMMON) t_003_CFLAGS = $(CFLAGS_COMMON) t_003_LDFLAGS = $(LDFLAGS_COMMON) t_003_LDADD = $(LIBADD_COMMON) -t_003_DEPENDENCIES = $(DEPENDENCIES_COMMON) t_004_SOURCES = t-004.c t.h t_004_CPPFLAGS = $(CPPFLAGS_COMMON) t_004_CFLAGS = $(CFLAGS_COMMON) t_004_LDFLAGS = $(LDFLAGS_COMMON) t_004_LDADD = $(LIBADD_COMMON) -t_004_DEPENDENCIES = $(DEPENDENCIES_COMMON) t_005_SOURCES = t-005.c t.h t_005_CPPFLAGS = $(CPPFLAGS_COMMON) t_005_CFLAGS = $(CFLAGS_COMMON) t_005_LDFLAGS = $(LDFLAGS_COMMON) t_005_LDADD = $(LIBADD_COMMON) -t_005_DEPENDENCIES = $(DEPENDENCIES_COMMON) TESTS = $(check_PROGRAMS) all: all-am diff --git a/moo/tools/Makefile.am b/moo/tools/Makefile.am index a72326d..ebdcbba 100644 --- a/moo/tools/Makefile.am +++ b/moo/tools/Makefile.am @@ -9,7 +9,6 @@ CPPFLAGS_COMMON = \ CFLAGS_COMMON = LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir) LIBADD_COMMON = -DEPENDENCIES_COMMON = bin_PROGRAMS = uni-case uni-prop @@ -18,11 +17,9 @@ uni_case_CPPFLAGS = $(CPPFLAGS_COMMON) uni_case_CFLAGS = $(CFLAGS_COMMON) uni_case_LDFLAGS = $(LDFLAGS_COMMON) uni_case_LDADD = $(LIBADD_COMMON) -uni_case_DEPENDENCIES = $(DEPENDENCIES_COMMON) uni_prop_SOURCES = uni-prop.c uni_prop_CPPFLAGS = $(CPPFLAGS_COMMON) uni_prop_CFLAGS = $(CFLAGS_COMMON) uni_prop_LDFLAGS = $(LDFLAGS_COMMON) uni_prop_LDADD = $(LIBADD_COMMON) -uni_prop_DEPENDENCIES = $(DEPENDENCIES_COMMON) diff --git a/moo/tools/Makefile.in b/moo/tools/Makefile.in index f2b6892..1ab2fa0 100644 --- a/moo/tools/Makefile.in +++ b/moo/tools/Makefile.in @@ -108,6 +108,7 @@ PROGRAMS = $(bin_PROGRAMS) am_uni_case_OBJECTS = uni_case-uni-case.$(OBJEXT) uni_case_OBJECTS = $(am_uni_case_OBJECTS) am__DEPENDENCIES_1 = +uni_case_DEPENDENCIES = $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -117,6 +118,7 @@ uni_case_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(CFLAGS) $(uni_case_LDFLAGS) $(LDFLAGS) -o $@ am_uni_prop_OBJECTS = uni_prop-uni-prop.$(OBJEXT) uni_prop_OBJECTS = $(am_uni_prop_OBJECTS) +uni_prop_DEPENDENCIES = $(am__DEPENDENCIES_1) uni_prop_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(uni_prop_CFLAGS) \ $(CFLAGS) $(uni_prop_LDFLAGS) $(LDFLAGS) -o $@ @@ -332,19 +334,16 @@ CPPFLAGS_COMMON = \ CFLAGS_COMMON = LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir) LIBADD_COMMON = -DEPENDENCIES_COMMON = uni_case_SOURCES = uni-case.c uni_case_CPPFLAGS = $(CPPFLAGS_COMMON) uni_case_CFLAGS = $(CFLAGS_COMMON) uni_case_LDFLAGS = $(LDFLAGS_COMMON) uni_case_LDADD = $(LIBADD_COMMON) -uni_case_DEPENDENCIES = $(DEPENDENCIES_COMMON) uni_prop_SOURCES = uni-prop.c uni_prop_CPPFLAGS = $(CPPFLAGS_COMMON) uni_prop_CFLAGS = $(CFLAGS_COMMON) uni_prop_LDFLAGS = $(LDFLAGS_COMMON) uni_prop_LDADD = $(LIBADD_COMMON) -uni_prop_DEPENDENCIES = $(DEPENDENCIES_COMMON) all: all-am .SUFFIXES: