aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am62
1 files changed, 6 insertions, 56 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 95051dc..6f2990e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,60 +9,12 @@ include $(top_srcdir)/Makefile.am.enum
include $(top_srcdir)/Makefile.am.marshal
##################################
-# Indicator
+# Marshallers
##################################
-applicationlibdir = $(INDICATORDIR)
-applicationlib_LTLIBRARIES = libapplication.la
-libapplication_la_SOURCES = \
- application-service-marshal.c \
- dbus-shared.h \
- indicator-application.c
-libapplication_la_CFLAGS = $(INDICATOR_CFLAGS) \
- -Wall \
- -Wl,-Bsymbolic-functions \
- -Wl,-z,defs \
- -Wl,--as-needed \
- -Werror \
- -DG_LOG_DOMAIN=\"Indicator-Application\"
-libapplication_la_LIBADD = $(INDICATOR_LIBS)
-libapplication_la_LDFLAGS = -module -avoid-version
-
-##################################
-# Service
-##################################
-
-libexec_PROGRAMS = indicator-application-service
-
BUILT_SOURCES += \
- application-service-server.h \
application-service-marshal.h \
- application-service-marshal.c \
- dbus-properties-client.h \
- notification-item-client.h \
- notification-watcher-server.h
-
-indicator_application_service_SOURCES = \
- application-service.c \
- application-service-appstore.h \
- application-service-appstore.c \
- application-service-marshal.c \
- application-service-watcher.h \
- application-service-watcher.c \
- app-indicator-enum-types.c \
- dbus-shared.h \
- generate-id.h \
- generate-id.c
-
-indicator_application_service_CFLAGS = \
- $(INDICATOR_CFLAGS) \
- -DDATADIR="\"$(pkgdatadir)\"" \
- -Wall -Werror \
- -DG_LOG_DOMAIN=\"indicator-application-service\"
-
-indicator_application_service_LDADD = \
- $(INDICATOR_LIBS) \
- libappindicator.la
+ application-service-marshal.c
glib_marshal_list = application-service-marshal.list
glib_marshal_prefix = _application_service_marshal
@@ -101,6 +53,7 @@ libappindicator_la_SOURCES = \
app-indicator-enum-types.c \
app-indicator.c \
application-service-marshal.c \
+ dbus-shared.h \
generate-id.h \
generate-id.c
@@ -110,21 +63,18 @@ libappindicator_la_LDFLAGS = \
-export-symbols-regex "^[^_d].*"
libappindicator_la_CFLAGS = \
- $(INDICATOR_CFLAGS) \
+ $(LIBRARY_CFLAGS) \
-Wall -Werror \
-DG_LOG_DOMAIN=\"libappindicator\"
libappindicator_la_LIBADD = \
- $(INDICATOR_LIBS)
+ $(LIBRARY_LIBS)
##################################
# DBus Specs
##################################
DBUS_SPECS = \
- dbus-properties.xml \
- application-service.xml \
- notification-approver.xml \
notification-item.xml \
notification-watcher.xml
@@ -172,7 +122,7 @@ AppIndicator-0.1.gir: libappindicator.la
AppIndicator_0_1_gir_INCLUDES = \
GObject-2.0 \
Gtk-2.0
-AppIndicator_0_1_gir_CFLAGS = $(INDICATOR_CFLAGS) -I$(srcdir) -I$(top_builddir)/src
+AppIndicator_0_1_gir_CFLAGS = $(LIBRARY_CFLAGS) -I$(srcdir) -I$(top_builddir)/src
AppIndicator_0_1_gir_LIBS = libappindicator.la
AppIndicator_0_1_gir_FILES = $(introspection_sources)