[libpeas] Remove LDADD and SOURCES repetion from tests



commit c6db987fbfca725fac644f56a5634070a265811b
Author: Garrett Regier <garrettregier gmail com>
Date:   Sun Nov 4 07:33:43 2012 -0800

    Remove LDADD and SOURCES repetion from tests
    
    Use a global LDADD for the basic tests.
    Do not need to specify SOURCES when name matches executable.

 tests/libpeas-gtk/Makefile.am |   11 +----------
 tests/libpeas/Makefile.am     |   35 ++++++++++-------------------------
 2 files changed, 11 insertions(+), 35 deletions(-)
---
diff --git a/tests/libpeas-gtk/Makefile.am b/tests/libpeas-gtk/Makefile.am
index 59fc516..22ebb72 100644
--- a/tests/libpeas-gtk/Makefile.am
+++ b/tests/libpeas-gtk/Makefile.am
@@ -16,7 +16,7 @@ INCLUDES = \
 
 noinst_PROGRAMS = $(TEST_PROGS)
 
-progs_ldadd = \
+LDADD = \
        $(PEAS_LIBS)                                    \
        $(PEAS_GTK_LIBS)                                \
        $(top_builddir)/libpeas/libpeas-1.0.la          \
@@ -28,12 +28,3 @@ TEST_PROGS += \
        plugin-manager          \
        plugin-manager-store    \
        plugin-manager-view
-
-plugin_manager_SOURCES = plugin-manager.c
-plugin_manager_LDADD   = $(progs_ldadd)
-
-plugin_manager_store_SOURCES = plugin-manager-store.c
-plugin_manager_store_LDADD   = $(progs_ldadd)
-
-plugin_manager_view_SOURCES = plugin-manager-view.c
-plugin_manager_view_LDADD   = $(progs_ldadd)
diff --git a/tests/libpeas/Makefile.am b/tests/libpeas/Makefile.am
index 5d317d6..6107fd7 100644
--- a/tests/libpeas/Makefile.am
+++ b/tests/libpeas/Makefile.am
@@ -12,54 +12,39 @@ INCLUDES = \
 
 noinst_PROGRAMS = $(TEST_PROGS)
 
-progs_ldadd = \
+LDADD = \
        $(PEAS_LIBS)                            \
        $(top_builddir)/libpeas/libpeas-1.0.la  \
        ./introspection/libintrospection-1.0.la \
        ./testing/libtesting.la                 \
        ../testing-util/libtesting-util.la
 
-
-TEST_PROGS     += engine
-engine_SOURCES  = engine.c
-engine_LDADD    = $(progs_ldadd)
-
-TEST_PROGS          += extension-c
-extension_c_SOURCES  = extension-c.c
-extension_c_LDADD    = $(progs_ldadd)
+TEST_PROGS += \
+       engine          \
+       extension-c     \
+       extension-set   \
+       plugin-info
 
 if ENABLE_GJS
 TEST_PROGS            += extension-gjs
-extension_gjs_SOURCES  = extension-gjs.c
 extension_gjs_CFLAGS   = $(GJS_CFLAGS)
-extension_gjs_LDADD    = $(progs_ldadd) $(GJS_LIBS)
+extension_gjs_LDADD    = $(LDADD) $(GJS_LIBS)
 endif
 
 if ENABLE_PYTHON2
 TEST_PROGS               += extension-python
-extension_python_SOURCES  = extension-python.c
 extension_python_CFLAGS   = $(PYGOBJECT_CFLAGS) $(PYTHON2_CFLAGS)
-extension_python_LDADD    = $(progs_ldadd) $(PYGOBJECT_LIBS) $(PYTHON2_LIBS)
+extension_python_LDADD    = $(LDADD) $(PYGOBJECT_LIBS) $(PYTHON2_LIBS)
 endif
 
 if ENABLE_PYTHON3
 TEST_PROGS                += extension-python3
-extension_python3_SOURCES  = extension-python3.c
 extension_python3_CFLAGS   = $(PYGOBJECT_CFLAGS) $(PYTHON3_CFLAGS)
-extension_python3_LDADD    = $(progs_ldadd) $(PYGOBJECT_LIBS) $(PYTHON3_LIBS)
+extension_python3_LDADD    = $(LDADD) $(PYGOBJECT_LIBS) $(PYTHON3_LIBS)
 endif
 
 if ENABLE_SEED
 TEST_PROGS             += extension-seed
-extension_seed_SOURCES  = extension-seed.c
 extension_seed_CFLAGS   = $(SEED_CFLAGS)
-extension_seed_LDADD    = $(progs_ldadd)  $(SEED_LIBS)
+extension_seed_LDADD    = $(LDADD) $(SEED_LIBS)
 endif
-
-TEST_PROGS            += extension-set
-extension_set_SOURCES  = extension-set.c
-extension_set_LDADD    = $(progs_ldadd)
-
-TEST_PROGS          += plugin-info
-plugin_info_SOURCES  = plugin-info.c
-plugin_info_LDADD    = $(progs_ldadd)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]