aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2009-11-30 13:28:20 -0600
committerTed Gould <ted@gould.cx>2009-11-30 13:28:20 -0600
commit44be8d22131ab3f6e2b4173da2af1dc5194919a8 (patch)
treeb246e31d89f79defb4d3f2e8ba26a7c716e6f816 /src/Makefile.am
parentf23c54ff5fee5587c31ecb8bf176b58fa3d4be1d (diff)
parentf0881be3b8f779e0411958e6637f8f29e5697cbb (diff)
downloadayatana-indicator-application-44be8d22131ab3f6e2b4173da2af1dc5194919a8.tar.gz
ayatana-indicator-application-44be8d22131ab3f6e2b4173da2af1dc5194919a8.tar.bz2
ayatana-indicator-application-44be8d22131ab3f6e2b4173da2af1dc5194919a8.zip
Getting the right named files.
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am73
1 files changed, 45 insertions, 28 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index ff5b26e..1c19d91 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,77 +4,92 @@ BUILT_SOURCES =
EXTRA_DIST =
include $(top_srcdir)/Makefile.am.enum
+include $(top_srcdir)/Makefile.am.marshal
##################################
# Indicator
##################################
-customlibdir = $(INDICATORDIR)
-customlib_LTLIBRARIES = libcustom.la
-libcustom_la_SOURCES = \
- indicator-custom.c
-libcustom_la_CFLAGS = $(INDICATOR_CFLAGS) \
+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
-libcustom_la_LIBADD = $(INDICATOR_LIBS)
-libcustom_la_LDFLAGS = -module -avoid-version
+libapplication_la_LIBADD = $(INDICATOR_LIBS)
+libapplication_la_LDFLAGS = -module -avoid-version
##################################
# Service
##################################
-libexec_PROGRAMS = indicator-custom-service
-
-indicator_custom_service_SOURCES = \
- custom-service.c \
+libexec_PROGRAMS = indicator-application-service
+
+indicator_application_service_SOURCES = \
+ application-service.c \
+ application-service-appstore.h \
+ application-service-appstore.c \
+ application-service-marshal.h \
+ application-service-marshal.c \
+ application-service-server.h \
+ application-service-watcher.h \
+ application-service-watcher.c \
+ dbus-properties-client.h \
+ dbus-shared.h \
notification-item-client.h \
notification-watcher-server.h
-indicator_custom_service_CFLAGS = \
+indicator_application_service_CFLAGS = \
$(INDICATOR_CFLAGS) \
-Wall -Werror
-indicator_custom_service_LDADD = \
+indicator_application_service_LDADD = \
$(INDICATOR_LIBS)
+glib_marshal_list = application-service-marshal.list
+glib_marshal_prefix = _application_service_marshal
+
##################################
# Library
##################################
-glib_enum_h = libcustomindicator/custom-indicator-enum-types.h
-glib_enum_c = libcustomindicator/custom-indicator-enum-types.c
-glib_enum_headers = $(libcustomindicator_headers)
+glib_enum_h = libappindicator/app-indicator-enum-types.h
+glib_enum_c = libappindicator/app-indicator-enum-types.c
+glib_enum_headers = $(libappindicator_headers)
lib_LTLIBRARIES = \
- libcustomindicator.la
+ libappindicator.la
-libcustomindicatorincludedir=$(includedir)/libcustomindicator-0.1/libcustomindicator
+libappindicatorincludedir=$(includedir)/libappindicator-0.1/libappindicator
-libcustomindicator_headers = \
- $(srcdir)/libcustomindicator/custom-indicator.h
+libappindicator_headers = \
+ $(srcdir)/libappindicator/app-indicator.h
-libcustomindicatorinclude_HEADERS = \
- $(libcustomindicator_headers) \
+libappindicatorinclude_HEADERS = \
+ $(libappindicator_headers) \
$(glib_enum_h)
-libcustomindicator_la_SOURCES = \
- $(libcustomindicator_headers) \
+libappindicator_la_SOURCES = \
+ $(libappindicator_headers) \
$(glib_enum_c) \
notification-watcher-client.h \
notification-item-server.h \
- libcustomindicator/custom-indicator.c
+ libappindicator/app-indicator.c
-libcustomindicator_la_LDFLAGS = \
+libappindicator_la_LDFLAGS = \
-version-info 0:0:0 \
-no-undefined \
-export-symbols-regex "^[^_d].*"
-libcustomindicator_la_CFLAGS = \
+libappindicator_la_CFLAGS = \
$(INDICATOR_CFLAGS) \
-Wall -Werror
-libcustomindicator_la_LIBADD = \
+libappindicator_la_LIBADD = \
$(INDICATOR_LIBS)
##################################
@@ -82,6 +97,8 @@ libcustomindicator_la_LIBADD = \
##################################
DBUS_SPECS = \
+ application-service.xml \
+ dbus-properties.xml \
notification-item.xml \
notification-watcher.xml