diff options
| author | Cosimo Alfarano <cosimo.alfarano@collabora.co.uk> | 2010-02-14 00:56:26 +0000 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2010-02-15 13:33:47 +1100 |
| commit | d9af78c6d3a6ea0009757ea18510e7a19133ace4 (patch) | |
| tree | 446801fcb82b938e145584a3c06cb1f6641771ea /src | |
| parent | c481bb772babaafef81013abfefe9be19d674d4f (diff) | |
| download | telepathy-logger-d9af78c6d3a6ea0009757ea18510e7a19133ace4.tar.gz | |
Makefile.am cleanups
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 217df6f..18346e9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,22 +3,17 @@ include $(top_srcdir)/tools/flymake.mk AM_CPPFLAGS = \ $(ERROR_CFLAGS) \ - -I$(top_srcdir) \ - -DG_LOG_DOMAIN=\"TPLogger\" \ + -DG_LOG_DOMAIN=\"TPL\" \ $(LIBTPL_CFLAGS) \ $(TPL_CFLAGS) \ $(DISABLE_DEPRECATED) \ $(WARN_CFLAGS) - -# TODO removeme: kludge to let the compilation work, or it doesn't know how to buld the lib -#$(top_builddir)/telepathy-logger/libtelepathy-logger.la: -# $(MAKE) -C $(top_builddir)/libtelepathy-logger libtelepathy-logger.la - +BUILT_SOURCES = bin_PROGRAMS = \ - telepathy-logger \ - test-api + telepathy-logger \ + test-api telepathy_logger_LDADD = \ $(top_builddir)/telepathy-logger/libtelepathy-logger.la \ @@ -32,23 +27,8 @@ test_api_LDADD = \ check_c_sources = \ - $(test_api_SOURCES) \ - $(telepathy_logger_SOURCES) \ - $(telepathy_logger_dbus_SOURCES) + $(telepathy_logger_SOURCES) include $(top_srcdir)/tools/check-coding-style.mk check-local: check-coding-style CLEANFILES = $(BUILT_SOURCES) $(bin_PROGRAMS) - -# Dbus service file -#servicedir = $(DBUS_SERVICES_DIR) -#service_in_files = \ -# org.freedesktop.Telepathy.TelepathyLoggerService.service.in \ -# org.freedesktop.Telepathy.Client.TelepathyLogger.service.in -#service_DATA = \ -# $(service_in_files:.service.in=.service) \ -# org.freedesktop.Telepathy.Client.TelepathyLogger.client -# -## Rule to make the service file with bindir expanded -#%.service: %.service.in -# sed -e "s|%bindir%|$(bindir)|" $< > $@ |