diff options
author | Cosimo Alfarano <cosimo.alfarano@collabora.co.uk> | 2010-01-15 16:18:27 +0000 |
---|---|---|
committer | Cosimo Alfarano <cosimo.alfarano@collabora.co.uk> | 2010-01-15 16:18:27 +0000 |
commit | 5853f0728abf10827245b5bdb496f2c960a4ef36 (patch) | |
tree | e2545629e2923c593272abefc805ff10c04eb41c /src | |
parent | 29c7fb4da417adebc65b7a0a44ee49a0bfdd2797 (diff) | |
download | telepathy-logger-5853f0728abf10827245b5bdb496f2c960a4ef36.tar.gz |
Created data/
* moved relevand data files into data/
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 30 | ||||
-rwxr-xr-x | src/compile.sh | 24 | ||||
-rw-r--r-- | src/org.freedesktop.Telepathy.Client.TelepathyLogger.client | 3 | ||||
-rw-r--r-- | src/org.freedesktop.Telepathy.Client.TelepathyLogger.service.in | 3 | ||||
-rw-r--r-- | src/org.freedesktop.Telepathy.TelepathyLoggerService.service.in | 3 |
5 files changed, 13 insertions, 50 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a0c53bc..384fc8e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,14 +10,13 @@ AM_CPPFLAGS = \ $(DISABLE_DEPRECATED) \ $(WARN_CFLAGS) - LDADD = \ $(top_builddir)/telepathy-logger/libtelepathy-logger.la \ $(LIBTPL_LIBS) # 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 +#$(top_builddir)/telepathy-logger/libtelepathy-logger.la: +# $(MAKE) -C $(top_builddir)/libtelepathy-logger libtelepathy-logger.la BUILT_SOURCES = \ dbus-service-server.h \ @@ -31,13 +30,10 @@ bin_PROGRAMS = \ telepathy_logger_dbus_SOURCES = \ dbus-service.c \ telepathy-logger-dbus.c -#telepathy_logger_dbus_LDADD = $(LDADD) $(TPL_LIBS) test_api_SOURCES = test_api.c -#test_api_LDADD = $(LDADD) $(LIBTPL_LIBS) telepathy_logger_SOURCES = telepathy-logger.c -#telepathy_logger_LDADD = $(LDADD) $(TPL_LIBS) nodist_telepathy_logger_SOURCES = $(BUILT_SOURCES) @@ -61,14 +57,14 @@ dbus-service-client.h: dbus-service.xml CLEANFILES = $(BUILT_SOURCES) # 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)|" $< > $@ +#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)|" $< > $@ diff --git a/src/compile.sh b/src/compile.sh deleted file mode 100755 index 34eb9a6..0000000 --- a/src/compile.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -PACKAGE_NAME="TpLogger" -CC=${CC:-gcc} -CCOPTS="-D_POSIX_SOURCE -DPACKAGE_NAME=\"${PACKAGE_NAME}\" --std=c99 -g -I../include -Wall -Werror" # -pedantic" -PKGS="telepathy-glib libxml-2.0" -MODULES="observer.c headless-logger-init.c - channel.c channel-text.c - contact.c - utils.c - time.c - log-manager.c - log-store.c - log-store-empathy.c - log-entry-text.c - test.c" -EXECUTABLE="telepathy-logger" - - -${CC} ${CCOPTS} $(pkg-config --libs --cflags ${PKGS}) ${MODULES} \ - -o ${EXECUTABLE} -RET=$? - -exit $RET diff --git a/src/org.freedesktop.Telepathy.Client.TelepathyLogger.client b/src/org.freedesktop.Telepathy.Client.TelepathyLogger.client deleted file mode 100644 index e34b892..0000000 --- a/src/org.freedesktop.Telepathy.Client.TelepathyLogger.client +++ /dev/null @@ -1,3 +0,0 @@ -[DBus Service] -Name=org.freedesktop.Telepathy.TelepathyLoggerService -Exec=/usr/local/bin/telepathy-logger-dbus diff --git a/src/org.freedesktop.Telepathy.Client.TelepathyLogger.service.in b/src/org.freedesktop.Telepathy.Client.TelepathyLogger.service.in deleted file mode 100644 index 5b95f92..0000000 --- a/src/org.freedesktop.Telepathy.Client.TelepathyLogger.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[DBus Service] -Name=org.freedesktop.Telepathy.Client.TelepathyLogger -Exec=%bindir%/telepathy-logger diff --git a/src/org.freedesktop.Telepathy.TelepathyLoggerService.service.in b/src/org.freedesktop.Telepathy.TelepathyLoggerService.service.in deleted file mode 100644 index 8831103..0000000 --- a/src/org.freedesktop.Telepathy.TelepathyLoggerService.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[DBus Service] -Name=org.freedesktop.Telepathy.TelepathyLoggerService -Exec=%bindir%/telepathy-logger-dbus |