diff options
| author | Rico Tzschichholz <ricotz@t-online.de> | 2013-02-16 23:35:31 +0100 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2013-02-16 23:35:31 +0100 |
| commit | 7a3f71b20139a36684526a74b1cbe3277bce922b (patch) | |
| tree | aece5a61b5a226813b4b6405439f01929b7e9083 /examples | |
| parent | 2277860db4aa8e2a23538d9015ab43954dbb86e1 (diff) | |
| download | zeitgeist-7a3f71b20139a36684526a74b1cbe3277bce922b.tar.gz | |
build: A lot of cleaning up in the build-system
- Share internal libraries
- Don't ship built sources "as far possible"
- Refactor src/engine.vala,src/zeitgeist-daemon.vala,
src/extensions-collection.vala for shared libzeitgeist-engine
- Make parallel builds work
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/c/Makefile.am | 44 | ||||
| -rw-r--r-- | examples/vala/Makefile.am | 28 |
2 files changed, 28 insertions, 44 deletions
diff --git a/examples/c/Makefile.am b/examples/c/Makefile.am index 0d165cb6..d1a6419d 100644 --- a/examples/c/Makefile.am +++ b/examples/c/Makefile.am @@ -1,35 +1,27 @@ include $(top_srcdir)/libzeitgeist/Makefile.decl -INCLUDES = \ - -I$(top_srcdir)/libzeitgeist -I$(top_builddir)/libzeitgeist \ - $(GIO_UNIX_CFLAGS) \ - $(ZEITGEIST_CFLAGS) - AM_CFLAGS = \ - -Wall \ - -g \ - -DZEITGEIST_COMPILATION \ - -DTEST_DIR=\"$(top_srcdir)/tests\" - -zeitgeist_libs = $(top_builddir)/libzeitgeist/libzeitgeist-2.0.la $(ZEITGEIST_LIBS) - -EXTRA_DIST += \ - test.desktop - -helper_sources = \ - $(top_srcdir)/libzeitgeist/zeitgeist.h \ - test.desktop + -Wall \ + -g \ + -DZEITGEIST_COMPILATION \ + -DTEST_DIR=\"$(top_srcdir)/tests\" \ + $(GIO_UNIX_CFLAGS) \ + $(ZEITGEIST_CFLAGS) \ + -I $(top_builddir)/libzeitgeist \ + -include $(top_builddir)/libzeitgeist/zeitgeist.h \ + $(NULL) + +AM_LDFLAGS = \ + $(ZEITGEIST_LIBS) \ + $(top_builddir)/libzeitgeist/libzeitgeist-2.0.la \ + $(NULL) noinst_PROGRAMS = \ - find-events \ - monitor-events \ - search-events + find-events \ + monitor-events \ + search-events \ + $(NULL) find_events_SOURCES = find-events.c -find_events_LDADD = $(zeitgeist_libs) - monitor_events_SOURCES = monitor-events.c -monitor_events_LDADD = $(zeitgeist_libs) - search_events_SOURCES = search-events.c -search_events_LDADD = $(zeitgeist_libs) diff --git a/examples/vala/Makefile.am b/examples/vala/Makefile.am index 5a6d7138..02e05b7c 100644 --- a/examples/vala/Makefile.am +++ b/examples/vala/Makefile.am @@ -3,20 +3,21 @@ NULL = AM_CPPFLAGS = \ $(ZEITGEIST_CFLAGS) \ -include $(CONFIG_HEADER) \ - -I $(top_srcdir)/libzeitgeist/ \ + -I $(top_builddir)/libzeitgeist/ \ -w \ $(NULL) AM_VALAFLAGS = \ --target-glib=2.26 \ --pkg gio-2.0 \ - $(top_srcdir)/libzeitgeist/zeitgeist-2.0.vapi \ + $(top_builddir)/libzeitgeist/zeitgeist-2.0.vapi \ $(top_srcdir)/config.vapi \ $(NULL) -zeitgeist_libs = \ +AM_LDFLAGS = \ + $(ZEITGEIST_LIBS) \ $(top_builddir)/libzeitgeist/libzeitgeist-2.0.la \ - $(ZEITGEIST_LIBS) + $(NULL) noinst_PROGRAMS = \ data-source-stuff \ @@ -26,20 +27,11 @@ noinst_PROGRAMS = \ insert-events \ $(NULL) -data_source_stuff_SOURCES = data-source-stuff.vala -data_source_stuff_LDADD = $(zeitgeist_libs) - -get_events_with_id_SOURCES = get-events-with-id.vala -get_events_with_id_LDADD = $(zeitgeist_libs) - -monitor_events_SOURCES = monitor-events.vala -monitor_events_LDADD = $(zeitgeist_libs) - -most_recent_events_SOURCES = most-recent-events.vala -most_recent_events_LDADD = $(zeitgeist_libs) - -insert_events_SOURCES = insert-events.vala -insert_events_LDADD = $(zeitgeist_libs) +data_source_stuff_SOURCES = data-source-stuff.vala +get_events_with_id_SOURCES = get-events-with-id.vala +monitor_events_SOURCES = monitor-events.vala +most_recent_events_SOURCES = most-recent-events.vala +insert_events_SOURCES = insert-events.vala distclean-local: rm -f *.c *.o *.~[0-9]~ |