aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.in
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-01-27 16:47:49 -0600
committerTed Gould <ted@gould.cx>2011-01-27 16:47:49 -0600
commitce47d3868094c01e28fb75adecf4cd9de03832b7 (patch)
tree8bbecced83ccd6d259d2190094298bb40a28071c /src/Makefile.in
parentb7eb711886ddb2f46b0c685a577a7b0f6c455ba6 (diff)
parent28f84ee512a35e2b04b211b7c1705a6eef4368ab (diff)
downloadayatana-indicator-datetime-ce47d3868094c01e28fb75adecf4cd9de03832b7.tar.gz
ayatana-indicator-datetime-ce47d3868094c01e28fb75adecf4cd9de03832b7.tar.bz2
ayatana-indicator-datetime-ce47d3868094c01e28fb75adecf4cd9de03832b7.zip
* New upstream release.
* Change to canonical.com for naming * Fixing a type callback * Switching to GDbus and dbusmenu-0.4 * Supporting a wider range of custom strings for time and support seconds in the custom time strings. * Fixing to take time settings from LC_TIME
Diffstat (limited to 'src/Makefile.in')
-rw-r--r--src/Makefile.in57
1 files changed, 35 insertions, 22 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 4f2ce3d..46cb333 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -39,10 +39,7 @@ libexec_PROGRAMS = indicator-datetime-service$(EXEEXT)
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -87,6 +84,7 @@ libdatetime_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
PROGRAMS = $(libexec_PROGRAMS)
am_indicator_datetime_service_OBJECTS = \
indicator_datetime_service-datetime-interface.$(OBJEXT) \
+ indicator_datetime_service-gen-datetime-service.xml.$(OBJEXT) \
indicator_datetime_service-calendar-menu-item.$(OBJEXT) \
indicator_datetime_service-datetime-service.$(OBJEXT)
indicator_datetime_service_OBJECTS = \
@@ -284,7 +282,7 @@ top_srcdir = @top_srcdir@
indicator_datetime_service_SOURCES = \
datetime-interface.c \
datetime-interface.h \
- datetime-service-server.h \
+ gen-datetime-service.xml.c \
calendar-menu-item.c \
calendar-menu-item.h \
datetime-service.c \
@@ -294,7 +292,8 @@ indicator_datetime_service_CFLAGS = \
-Wall \
-Werror \
$(SERVICE_CFLAGS) \
- -DTIMEZONE_FILE="\"/etc/timezone\""
+ -DTIMEZONE_FILE="\"/etc/timezone\"" \
+ -DG_LOG_DOMAIN=\"Indicator-Datetime\"
indicator_datetime_service_LDADD = \
$(SERVICE_LIBS)
@@ -302,13 +301,14 @@ indicator_datetime_service_LDADD = \
datetimelibdir = $(INDICATORDIR)
datetimelib_LTLIBRARIES = libdatetime.la
libdatetime_la_SOURCES = \
- datetime-service-client.h \
+ gen-datetime-service.xml.h \
dbus-shared.h \
indicator-datetime.c
libdatetime_la_CFLAGS = \
$(INDICATOR_CFLAGS) \
- -Wall -Werror
+ -Wall -Werror \
+ -DG_LOG_DOMAIN=\"Indicator-Datetime\"
libdatetime_la_LIBADD = \
$(INDICATOR_LIBS)
@@ -318,8 +318,8 @@ libdatetime_la_LDFLAGS = \
-avoid-version
BUILT_SOURCES = \
- datetime-service-client.h \
- datetime-service-server.h
+ gen-datetime-service.xml.c \
+ gen-datetime-service.xml.h
CLEANFILES = \
$(BUILT_SOURCES)
@@ -451,6 +451,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_datetime_service-calendar-menu-item.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_datetime_service-datetime-interface.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_datetime_service-datetime-service.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_datetime_service-gen-datetime-service.xml.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdatetime_la-indicator-datetime.Plo@am__quote@
.c.o:
@@ -501,6 +502,22 @@ indicator_datetime_service-datetime-interface.obj: datetime-interface.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_datetime_service_CFLAGS) $(CFLAGS) -c -o indicator_datetime_service-datetime-interface.obj `if test -f 'datetime-interface.c'; then $(CYGPATH_W) 'datetime-interface.c'; else $(CYGPATH_W) '$(srcdir)/datetime-interface.c'; fi`
+indicator_datetime_service-gen-datetime-service.xml.o: gen-datetime-service.xml.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_datetime_service_CFLAGS) $(CFLAGS) -MT indicator_datetime_service-gen-datetime-service.xml.o -MD -MP -MF $(DEPDIR)/indicator_datetime_service-gen-datetime-service.xml.Tpo -c -o indicator_datetime_service-gen-datetime-service.xml.o `test -f 'gen-datetime-service.xml.c' || echo '$(srcdir)/'`gen-datetime-service.xml.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_datetime_service-gen-datetime-service.xml.Tpo $(DEPDIR)/indicator_datetime_service-gen-datetime-service.xml.Po
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gen-datetime-service.xml.c' object='indicator_datetime_service-gen-datetime-service.xml.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_datetime_service_CFLAGS) $(CFLAGS) -c -o indicator_datetime_service-gen-datetime-service.xml.o `test -f 'gen-datetime-service.xml.c' || echo '$(srcdir)/'`gen-datetime-service.xml.c
+
+indicator_datetime_service-gen-datetime-service.xml.obj: gen-datetime-service.xml.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_datetime_service_CFLAGS) $(CFLAGS) -MT indicator_datetime_service-gen-datetime-service.xml.obj -MD -MP -MF $(DEPDIR)/indicator_datetime_service-gen-datetime-service.xml.Tpo -c -o indicator_datetime_service-gen-datetime-service.xml.obj `if test -f 'gen-datetime-service.xml.c'; then $(CYGPATH_W) 'gen-datetime-service.xml.c'; else $(CYGPATH_W) '$(srcdir)/gen-datetime-service.xml.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_datetime_service-gen-datetime-service.xml.Tpo $(DEPDIR)/indicator_datetime_service-gen-datetime-service.xml.Po
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gen-datetime-service.xml.c' object='indicator_datetime_service-gen-datetime-service.xml.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_datetime_service_CFLAGS) $(CFLAGS) -c -o indicator_datetime_service-gen-datetime-service.xml.obj `if test -f 'gen-datetime-service.xml.c'; then $(CYGPATH_W) 'gen-datetime-service.xml.c'; else $(CYGPATH_W) '$(srcdir)/gen-datetime-service.xml.c'; fi`
+
indicator_datetime_service-calendar-menu-item.o: calendar-menu-item.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_datetime_service_CFLAGS) $(CFLAGS) -MT indicator_datetime_service-calendar-menu-item.o -MD -MP -MF $(DEPDIR)/indicator_datetime_service-calendar-menu-item.Tpo -c -o indicator_datetime_service-calendar-menu-item.o `test -f 'calendar-menu-item.c' || echo '$(srcdir)/'`calendar-menu-item.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/indicator_datetime_service-calendar-menu-item.Tpo $(DEPDIR)/indicator_datetime_service-calendar-menu-item.Po
@@ -749,19 +766,15 @@ uninstall-am: uninstall-datetimelibLTLIBRARIES \
uninstall-libexecPROGRAMS
-datetime-service-client.h: $(srcdir)/datetime-service.xml
- dbus-binding-tool \
- --prefix=_datetime_service_client \
- --mode=glib-client \
- --output=datetime-service-client.h \
- $(srcdir)/datetime-service.xml
+gen-%.xml.c: %.xml
+ @echo "Building $@ from $<"
+ @echo "const char * _$(subst -,_,$(subst .,_,$(basename $<))) = " > $@
+ @sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
+ @echo ";" >> $@
-datetime-service-server.h: $(srcdir)/datetime-service.xml
- dbus-binding-tool \
- --prefix=_datetime_service_server \
- --mode=glib-server \
- --output=datetime-service-server.h \
- $(srcdir)/datetime-service.xml
+gen-%.xml.h: %.xml
+ @echo "Building $@ from $<"
+ @echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $<)));" > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.