aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2011-06-22 13:06:59 -0400
committerKen VanDine <ken.vandine@canonical.com>2011-06-22 13:06:59 -0400
commit3315ba58c8f79fc1d1fcb50098e231aefd32a625 (patch)
tree45c31ad8e8dee004c7c69e3f7be86731cd845cdf /src/Makefile.am
parent361d96393eed5379df0f83eec2f09e66e9efef5f (diff)
parente27d98a99ceaee4a3d003310fe8dbd295146a539 (diff)
downloadayatana-indicator-application-3315ba58c8f79fc1d1fcb50098e231aefd32a625.tar.gz
ayatana-indicator-application-3315ba58c8f79fc1d1fcb50098e231aefd32a625.tar.bz2
ayatana-indicator-application-3315ba58c8f79fc1d1fcb50098e231aefd32a625.zip
* New upstream release.
* GTK3 Port
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am15
1 files changed, 4 insertions, 11 deletions
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
##################################