diff options
author | Ken VanDine <ken.vandine@canonical.com> | 2011-07-08 09:36:52 -0400 |
---|---|---|
committer | Ken VanDine <ken.vandine@canonical.com> | 2011-07-08 09:36:52 -0400 |
commit | 5b77a3aec6cef0cf0c1c34d9b185ea0f110c6641 (patch) | |
tree | a2b904d64fd68ca304540c20e00ec4137f2013cb /src/Makefile.am | |
parent | 33d9b7f27eed027e1986ba4197d14434bc6ce37b (diff) | |
parent | af8dd7371a8743b02751fe2e71341f33de744fff (diff) | |
download | ayatana-indicator-datetime-5b77a3aec6cef0cf0c1c34d9b185ea0f110c6641.tar.gz ayatana-indicator-datetime-5b77a3aec6cef0cf0c1c34d9b185ea0f110c6641.tar.bz2 ayatana-indicator-datetime-5b77a3aec6cef0cf0c1c34d9b185ea0f110c6641.zip |
* New upstream release.
* libindicator 0.4 transition
* Making preferences a gnome-control-center plugin
* Calling gnome-control-center from the menu
* Fixing timezone setting with new gsd
* Dropped debian/patches/fix-timezones.patch: merged upstream
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 6d388c7..6ca07a8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,7 @@ -bin_PROGRAMS = indicator-datetime-preferences +ccpaneldir = $(CCPANELDIR) +ccpanel_LTLIBRARIES = libindicator-datetime.la + libexec_PROGRAMS = indicator-datetime-service indicator_datetime_service_SOURCES = \ @@ -34,6 +36,7 @@ libdatetime_la_SOURCES = \ libdatetime_la_CFLAGS = \ $(INDICATOR_CFLAGS) \ -Wall -Werror \ + -DTIMEZONE_FILE="\"/etc/timezone\"" \ -DG_LOG_DOMAIN=\"Indicator-Datetime\" libdatetime_la_LIBADD = \ $(INDICATOR_LIBS) @@ -41,7 +44,7 @@ libdatetime_la_LDFLAGS = \ -module \ -avoid-version -indicator_datetime_preferences_SOURCES =\ +libindicator_datetime_la_SOURCES =\ datetime-prefs.c \ datetime-prefs-locations.c \ datetime-prefs-locations.h \ @@ -50,15 +53,17 @@ indicator_datetime_preferences_SOURCES =\ utils.c \ utils.h \ settings-shared.h -indicator_datetime_preferences_CFLAGS = \ +libindicator_datetime_la_CFLAGS = \ -Wall \ -Werror \ -I$(top_srcdir)/libmap \ $(PREF_CFLAGS) \ + -DTIMEZONE_FILE="\"/etc/timezone\"" \ -DPKGDATADIR="\"$(pkgdatadir)\"" -indicator_datetime_preferences_LDADD = \ +libindicator_datetime_la_LIBADD = \ $(top_builddir)/libmap/libmap.la \ $(PREF_LIBS) +libindicator_datetime_la_LDFLAGS = -module -avoid-version gen-%.xml.c: %.xml @echo "Building $@ from $<" |