diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2012-07-06 00:18:03 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2012-07-06 00:19:45 -0400 |
| commit | 1304b14a44486d1231ff92fdbed39a60d0919582 (patch) | |
| tree | 1088f9b6c07347337a440c65ed288ea805270a09 | |
| parent | 53ed572bd103feacbbd645f3d4c117b2b5fc9c31 (diff) | |
| download | dconf-1304b14a44486d1231ff92fdbed39a60d0919582.tar.gz | |
fix various 'make distcheck' issues
| -rw-r--r-- | client/Makefile.am | 4 | ||||
| -rw-r--r-- | engine/Makefile.am | 4 | ||||
| -rw-r--r-- | gdbus/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 9 |
4 files changed, 15 insertions, 4 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 52221ee..80bfcf3 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -24,14 +24,14 @@ dconfinclude_HEADERS = \ dconf-client.h \ dconf.h -libdconf_so_0_0_0_LDADD = $(gio_LIBS) ../common/libdconf-common-shared.a ../engine/libdconf-engine.a ../gdbus/libdconf-gdbus.a +libdconf_so_0_0_0_LDADD = ../common/libdconf-common-shared.a ../engine/libdconf-engine.a ../gdbus/libdconf-gdbus.a $(gio_LIBS) libdconf_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.0 libdconf_so_0_0_0_SOURCES = \ dconf-client.c libdconf_client_a_SOURCES = dconf-client.c -EXTRA_DIST = dconf.vapi +EXTRA_DIST = dconf.vapi dconf.deps vapi_DATA = dconf.vapi dconf.deps vapidir = $(datadir)/vala/vapi diff --git a/engine/Makefile.am b/engine/Makefile.am index d3f01c6..bead7f1 100644 --- a/engine/Makefile.am +++ b/engine/Makefile.am @@ -3,12 +3,14 @@ include $(top_srcdir)/Makefile.gtester noinst_LIBRARIES = libdconf-engine.a libdconf_engine_a_CFLAGS = -fPIC -DPIC -Wall -INCLUDES = $(glib_CFLAGS) -I../gvdb -I../common +INCLUDES = $(glib_CFLAGS) -I$(top_srcdir)/gvdb -I$(top_srcdir)/common libdconf_engine_a_SOURCES = \ ../gvdb/gvdb-reader.c \ + dconf-changeset-list.h \ dconf-engine-profile.h \ dconf-engine-profile.c \ + dconf-engine-source-private.h \ dconf-engine-source.h \ dconf-engine-source-user.c \ dconf-engine-source-system.c \ diff --git a/gdbus/Makefile.am b/gdbus/Makefile.am index 0797787..2486e90 100644 --- a/gdbus/Makefile.am +++ b/gdbus/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.gtester noinst_LIBRARIES = libdconf-gdbus.a -INCLUDES = $(glib_CFLAGS) -I../engine -I../common +INCLUDES = $(glib_CFLAGS) -I$(top_srcdir)/engine -I$(top_srcdir)/common libdconf_gdbus_a_CFLAGS = -Wall -fPIC -DPIC libdconf_gdbus_a_SOURCES = dconf-gdbus-thread.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 7fded6b..890bd90 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -38,6 +38,13 @@ gvdb_LDADD = $(glib_LIBS) gvdb_SOURCES = \ ../gvdb/gvdb-reader.c \ gvdb.c +EXTRA_DIST = \ + gvdbs/empty_gvdb \ + gvdbs/example_gvdb \ + gvdbs/example_gvdb.big-endian \ + gvdbs/file_empty \ + gvdbs/file_too_small \ + gvdbs/invalid_header TEST_PROGS += gdbus-thread gdbus_thread_CFLAGS = $(AM_CFLAGS) -DDBUS_BACKEND=\"/gdbus/thread\" @@ -60,3 +67,5 @@ engine_SOURCES = engine.c TEST_PROGS += client client_LDADD = $(stub_client_LIBS) $(gio_LIBS) client_SOURCES = client.c +EXTRA_DIST += \ + profile/will-never-exist |