From 10aa800201db066427fa17b055c33cae00d23d2a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 3 Nov 2009 21:38:09 -0600 Subject: Linking the indicators with the libindicator library. --- tests/Makefile.am | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index 8121136..a7d01ec 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -34,7 +34,9 @@ libdummy_indicator_blank_la_CFLAGS = \ $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) libdummy_indicator_blank_la_LIBADD = \ - $(LIBINDICATOR_LIBS) + $(LIBINDICATOR_LIBS) \ + -L$(top_builddir)/libindicator/.libs \ + -lindicator libdummy_indicator_blank_la_LDFLAGS = \ -module \ @@ -52,7 +54,9 @@ libdummy_indicator_null_la_CFLAGS = \ $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) libdummy_indicator_null_la_LIBADD = \ - $(LIBINDICATOR_LIBS) + $(LIBINDICATOR_LIBS) \ + -L$(top_builddir)/libindicator/.libs \ + -lindicator libdummy_indicator_null_la_LDFLAGS = \ -module \ @@ -70,7 +74,9 @@ libdummy_indicator_simple_la_CFLAGS = \ $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) libdummy_indicator_simple_la_LIBADD = \ - $(LIBINDICATOR_LIBS) + $(LIBINDICATOR_LIBS) \ + -L$(top_builddir)/libindicator/.libs \ + -lindicator libdummy_indicator_simple_la_LDFLAGS = \ -module \ -- cgit v1.2.3 From 1a528a74f3e4ed386f7c0325407de6f8e40c6f2a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 3 Nov 2009 21:44:51 -0600 Subject: Make the tester dynamically link the lib so that there's not two versions of everything. --- tests/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index a7d01ec..656d53e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -20,7 +20,9 @@ test_loader_CFLAGS = \ -DBUILD_DIR="\"$(builddir)\"" test_loader_LDADD = \ - $(LIBINDICATOR_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a + $(LIBINDICATOR_LIBS) \ + -L$(top_builddir)/libindicator/.libs \ + -lindicator ############################# # Dummy Indicator Blank -- cgit v1.2.3 From 8033011194d1063ca6cb16ec99e00e6ade2fcc42 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 4 Nov 2009 10:55:48 -0600 Subject: Building a dummy indicator that signals. --- tests/Makefile.am | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index 656d53e..6150449 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,6 +5,7 @@ check_PROGRAMS = \ lib_LTLIBRARIES = \ libdummy-indicator-blank.la \ libdummy-indicator-null.la \ + libdummy-indicator-signaler.la \ libdummy-indicator-simple.la ############################# @@ -64,6 +65,26 @@ libdummy_indicator_null_la_LDFLAGS = \ -module \ -avoid-version +############################# +# Dummy Indicator Signaler +############################# + +libdummy_indicator_signaler_la_SOURCES = \ + dummy-indicator-signaler.c + +libdummy_indicator_signaler_la_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +libdummy_indicator_signaler_la_LIBADD = \ + $(LIBINDICATOR_LIBS) \ + -L$(top_builddir)/libindicator/.libs \ + -lindicator + +libdummy_indicator_signaler_la_LDFLAGS = \ + -module \ + -avoid-version + ############################# # Dummy Indicator Simple ############################# -- cgit v1.2.3