From 58f47563b83be3659f2ab12630d3a11d9c426768 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 22 Jun 2011 11:12:48 -0500 Subject: Making tests use proper version of libappindicator and cleaning up libappindicator usage to use the same enum headers. --- src/Makefile.am | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 18e2baf..9b11fd1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,7 +9,6 @@ DISTCLEANFILES = BUILT_SOURCES = EXTRA_DIST = -include $(top_srcdir)/Makefile.am.enum include $(top_srcdir)/Makefile.am.marshal ################################## @@ -29,7 +28,7 @@ libapplication_la_CFLAGS = $(INDICATOR_CFLAGS) \ -Wl,--as-needed \ -Werror \ -DG_LOG_DOMAIN=\"Indicator-Application\" -libapplication_la_LIBADD = $(INDICATOR_LIBS) +libapplication_la_LIBADD = $(INDICATOR_LIBS) libapplication_la_LDFLAGS = -module -avoid-version ################################## @@ -51,30 +50,24 @@ indicator_application_service_SOURCES = \ application-service-watcher.h \ application-service-watcher.c \ gen-application-service.xml.c \ - app-indicator-enum-types.c \ dbus-shared.h \ generate-id.h \ generate-id.c indicator_application_service_CFLAGS = \ $(INDICATOR_CFLAGS) \ - -I$(APP_INDICATOR_INCLUDE) \ + $(APPINDICATOR_CFLAGS) \ -DDATADIR="\"$(pkgdatadir)\"" \ -Wall -Werror \ -DG_LOG_DOMAIN=\"indicator-application-service\" indicator_application_service_LDADD = \ - $(INDICATOR_LIBS) + $(INDICATOR_LIBS) \ + $(APPINDICATOR_LIBS) glib_marshal_list = application-service-marshal.list glib_marshal_prefix = _application_service_marshal -glib_enum_h = app-indicator-enum-types.h -glib_enum_c = app-indicator-enum-types.c -glib_enum_headers = $(wildcard $(APP_INDICATOR_INCLUDE)/libappindicator/*.h) - -DISTCLEANFILES += app-indicator-enum-types.c - ################################## # DBus Specs ################################## -- cgit v1.2.3