diff options
| author | Seif Lotfy <seif@lotfy.com> | 2013-01-21 15:14:57 +0100 |
|---|---|---|
| committer | Seif Lotfy <seif@lotfy.com> | 2013-01-21 15:14:57 +0100 |
| commit | d9b8bdc9962ba378950fff433f21bf8acb2f2b97 (patch) | |
| tree | 84bb4802e1acc07afe90c944eaac0baf3fb2603e | |
| parent | 9b5be8544da043869e31063a7a10c1f6d14be79a (diff) | |
| download | zeitgeist-d9b8bdc9962ba378950fff433f21bf8acb2f2b97.tar.gz | |
more makefile clean up
| -rw-r--r-- | examples/c/Makefile.am | 7 | ||||
| -rw-r--r-- | examples/vala/Makefile.am | 4 | ||||
| -rw-r--r-- | test/c/Makefile.am | 5 |
3 files changed, 14 insertions, 2 deletions
diff --git a/examples/c/Makefile.am b/examples/c/Makefile.am index 0d165cb6..b08e282e 100644 --- a/examples/c/Makefile.am +++ b/examples/c/Makefile.am @@ -1,6 +1,7 @@ include $(top_srcdir)/libzeitgeist/Makefile.decl INCLUDES = \ + -I$(top_srcdir)/libzeitgeist/internal -I$(top_builddir)/libzeitgeist/internal \ -I$(top_srcdir)/libzeitgeist -I$(top_builddir)/libzeitgeist \ $(GIO_UNIX_CFLAGS) \ $(ZEITGEIST_CFLAGS) @@ -11,12 +12,16 @@ AM_CFLAGS = \ -DZEITGEIST_COMPILATION \ -DTEST_DIR=\"$(top_srcdir)/tests\" -zeitgeist_libs = $(top_builddir)/libzeitgeist/libzeitgeist-2.0.la $(ZEITGEIST_LIBS) +zeitgeist_libs = \ + $(top_builddir)/libzeitgeist/internal/libzeitgeist-internal.la \ + $(top_builddir)/libzeitgeist/libzeitgeist-2.0.la \ + $(ZEITGEIST_LIBS) EXTRA_DIST += \ test.desktop helper_sources = \ + $(top_srcdir)/libzeitgeist/internal/zeitgeist-internal.h \ $(top_srcdir)/libzeitgeist/zeitgeist.h \ test.desktop diff --git a/examples/vala/Makefile.am b/examples/vala/Makefile.am index 5a6d7138..7c5148b6 100644 --- a/examples/vala/Makefile.am +++ b/examples/vala/Makefile.am @@ -3,6 +3,7 @@ NULL = AM_CPPFLAGS = \ $(ZEITGEIST_CFLAGS) \ -include $(CONFIG_HEADER) \ + -I $(top_srcdir)/libzeitgeist/internal/ \ -I $(top_srcdir)/libzeitgeist/ \ -w \ $(NULL) @@ -10,11 +11,14 @@ AM_CPPFLAGS = \ AM_VALAFLAGS = \ --target-glib=2.26 \ --pkg gio-2.0 \ + --pkg sqlite3 \ + $(top_srcdir)/libzeitgeist/internal/zeitgeist-internal.vapi \ $(top_srcdir)/libzeitgeist/zeitgeist-2.0.vapi \ $(top_srcdir)/config.vapi \ $(NULL) zeitgeist_libs = \ + $(top_builddir)/libzeitgeist/internal/libzeitgeist-internal.la \ $(top_builddir)/libzeitgeist/libzeitgeist-2.0.la \ $(ZEITGEIST_LIBS) diff --git a/test/c/Makefile.am b/test/c/Makefile.am index 67bc07df..6c51361d 100644 --- a/test/c/Makefile.am +++ b/test/c/Makefile.am @@ -12,7 +12,10 @@ AM_CFLAGS = \ -DZEITGEIST_COMPILATION \ -DTEST_DIR=\"$(top_srcdir)/tests\" -zeitgeist_libs = $(top_builddir)/libzeitgeist/libzeitgeist-2.0.la $(ZEITGEIST_LIBS) +zeitgeist_libs = \ + $(top_builddir)/libzeitgeist/libzeitgeist-2.0.la \ + $(top_builddir)/libzeitgeist/internal/libzeitgeist-internal.la \ + $(ZEITGEIST_LIBS) EXTRA_DIST += \ test.desktop |