aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorDavid Barth <david.barth@canonical.com>2011-02-25 18:01:20 +0100
committerDavid Barth <david.barth@canonical.com>2011-02-25 18:01:20 +0100
commit6f103ce25995b5a40967b0ba683b7f7330aadd8a (patch)
tree322e1b173d026de8b0437aaa50ff6ab74be4d491 /src/Makefile.am
parent124ef53b7bab308704974bd5a1efc5e40f5fc6c0 (diff)
parent42125be0102026e6ecae842413261a8b05a25e96 (diff)
downloadayatana-indicator-datetime-6f103ce25995b5a40967b0ba683b7f7330aadd8a.tar.gz
ayatana-indicator-datetime-6f103ce25995b5a40967b0ba683b7f7330aadd8a.tar.bz2
ayatana-indicator-datetime-6f103ce25995b5a40967b0ba683b7f7330aadd8a.zip
merging in mterry's branch with the new preferences dialog
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am28
1 files changed, 27 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 7a290c6..6d388c7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,5 @@
+bin_PROGRAMS = indicator-datetime-preferences
libexec_PROGRAMS = indicator-datetime-service
indicator_datetime_service_SOURCES = \
@@ -8,7 +9,10 @@ indicator_datetime_service_SOURCES = \
calendar-menu-item.c \
calendar-menu-item.h \
datetime-service.c \
- dbus-shared.h
+ utils.c \
+ utils.h \
+ dbus-shared.h \
+ settings-shared.h
indicator_datetime_service_CFLAGS = \
-Wall \
-Werror \
@@ -23,6 +27,9 @@ datetimelib_LTLIBRARIES = libdatetime.la
libdatetime_la_SOURCES = \
gen-datetime-service.xml.h \
dbus-shared.h \
+ settings-shared.h \
+ utils.c \
+ utils.h \
indicator-datetime.c
libdatetime_la_CFLAGS = \
$(INDICATOR_CFLAGS) \
@@ -34,6 +41,25 @@ libdatetime_la_LDFLAGS = \
-module \
-avoid-version
+indicator_datetime_preferences_SOURCES =\
+ datetime-prefs.c \
+ datetime-prefs-locations.c \
+ datetime-prefs-locations.h \
+ timezone-completion.c \
+ timezone-completion.h \
+ utils.c \
+ utils.h \
+ settings-shared.h
+indicator_datetime_preferences_CFLAGS = \
+ -Wall \
+ -Werror \
+ -I$(top_srcdir)/libmap \
+ $(PREF_CFLAGS) \
+ -DPKGDATADIR="\"$(pkgdatadir)\""
+indicator_datetime_preferences_LDADD = \
+ $(top_builddir)/libmap/libmap.la \
+ $(PREF_LIBS)
+
gen-%.xml.c: %.xml
@echo "Building $@ from $<"
@echo "const char * _$(subst -,_,$(subst .,_,$(basename $<))) = " > $@