diff options
author | Simon McVittie <smcv@debian.org> | 2018-01-22 17:20:10 +0000 |
---|---|---|
committer | Simon McVittie <smcv@debian.org> | 2018-01-22 18:27:20 +0000 |
commit | 449f30a089ce848883fcf2b6aaac742f87aad704 (patch) | |
tree | ff65e8afe334c77625a5a79d24866b113d25300b | |
parent | be85eb31951c81dcbd2f6168798856a171e883e9 (diff) |
dbus-gmain: Move to its own directory
Signed-off-by: Simon McVittie <smcv@debian.org>
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | dbus-gmain/Makefile.am | 16 | ||||
-rw-r--r-- | dbus-gmain/dbus-gmain.c (renamed from dbus/dbus-gmain.c) | 3 | ||||
-rw-r--r-- | dbus-gmain/dbus-gmain.h (renamed from dbus/dbus-gmain.h) | 0 | ||||
-rw-r--r-- | dbus/Makefile.am | 19 | ||||
-rw-r--r-- | dbus/dbus-glib.c | 2 | ||||
-rw-r--r-- | test/core/30574.c | 2 | ||||
-rw-r--r-- | test/core/Makefile.am | 6 | ||||
-rw-r--r-- | test/core/test-thread-client.c | 2 | ||||
-rw-r--r-- | test/core/test-thread-server.c | 2 |
11 files changed, 34 insertions, 23 deletions
diff --git a/Makefile.am b/Makefile.am index dd76c7e..c55c6fb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,8 @@ ACLOCAL_AMFLAGS = -I m4 GLIB_PC=dbus-glib-1.pc -SUBDIRS=dbus tools test doc -DIST_SUBDIRS=dbus tools test doc m4 +SUBDIRS = dbus-gmain dbus tools test doc +DIST_SUBDIRS = dbus-gmain dbus tools test doc m4 pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(GLIB_PC) diff --git a/configure.ac b/configure.ac index 04307c9..2cdee95 100644 --- a/configure.ac +++ b/configure.ac @@ -290,6 +290,7 @@ doc/reference/version.xml dbus/Makefile dbus/examples/Makefile dbus/examples/statemachine/Makefile +dbus-gmain/Makefile test/Makefile test/core/Makefile test/interfaces/Makefile diff --git a/dbus-gmain/Makefile.am b/dbus-gmain/Makefile.am new file mode 100644 index 0000000..4b4291e --- /dev/null +++ b/dbus-gmain/Makefile.am @@ -0,0 +1,16 @@ +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + $(DBUS_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ + $(NULL) + +noinst_LTLIBRARIES = libdbus-gmain.la + +libdbus_gmain_la_SOURCES = \ + dbus-gmain.c \ + dbus-gmain.h \ + $(NULL) + +libdbus_gmain_la_LIBADD = $(DBUS_LIBS) $(DBUS_GLIB_LIBS) +libdbus_gmain_la_LDFLAGS = -no-undefined diff --git a/dbus/dbus-gmain.c b/dbus-gmain/dbus-gmain.c index fe3d830..91f19e9 100644 --- a/dbus/dbus-gmain.c +++ b/dbus-gmain/dbus-gmain.c @@ -27,7 +27,8 @@ */ #include <config.h> -#include <dbus/dbus-gmain.h> + +#include <dbus-gmain/dbus-gmain.h> /* * DBusGMessageQueue: diff --git a/dbus/dbus-gmain.h b/dbus-gmain/dbus-gmain.h index e442c2d..e442c2d 100644 --- a/dbus/dbus-gmain.h +++ b/dbus-gmain/dbus-gmain.h diff --git a/dbus/Makefile.am b/dbus/Makefile.am index 2c1a79e..a51750e 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -10,7 +10,6 @@ AM_CPPFLAGS = \ -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" lib_LTLIBRARIES=libdbus-glib-1.la -noinst_LTLIBRARIES = libdbus-gmain.la CLEANFILES = $(BUILT_SOURCES) @@ -25,15 +24,8 @@ DBUS_GLIB_INTERNALS = \ dbus-gvalue-utils.c \ dbus-gvalue-utils.h -libdbus_gmain_la_SOURCES = \ - dbus-gmain.c \ - dbus-gmain.h \ - $(NULL) - libdbus_glib_1_la_SOURCES = \ dbus-glib.c \ - dbus-gmain.c \ - dbus-gmain.h \ dbus-gmarshal.c \ dbus-gmarshal.h \ dbus-gobject.c \ @@ -56,16 +48,17 @@ libdbus_glib_HEADERS = \ libdbus_glibdir = $(includedir)/dbus-1.0/dbus -libdbus_glib_1_la_LIBADD= $(DBUS_LIBS) $(DBUS_GLIB_LIBS) +libdbus_glib_1_la_LIBADD = \ + $(top_builddir)/dbus-gmain/libdbus-gmain.la \ + $(DBUS_LIBS) \ + $(DBUS_GLIB_LIBS) \ + $(NULL) ## don't export symbols that start with "_" (we use this ## convention for internal symbols) libdbus_glib_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined -libdbus_gmain_la_LIBADD = $(DBUS_LIBS) $(DBUS_GLIB_LIBS) -libdbus_gmain_la_LDFLAGS = -no-undefined - # convenience lib used here and by dbus-viewer -noinst_LTLIBRARIES += libdbus-gtool.la +noinst_LTLIBRARIES = libdbus-gtool.la libdbus_gtool_la_SOURCES = $(DBUS_GLIB_INTERNALS) \ dbus-gidl.c \ diff --git a/dbus/dbus-glib.c b/dbus/dbus-glib.c index 1219c18..abb2f57 100644 --- a/dbus/dbus-glib.c +++ b/dbus/dbus-glib.c @@ -24,7 +24,7 @@ #include <config.h> #include "dbus/dbus-glib.h" #include "dbus/dbus-glib-lowlevel.h" -#include "dbus-gmain.h" +#include "dbus-gmain/dbus-gmain.h" #include "dbus-gtest.h" #include "dbus-gutils.h" #include "dbus-gvalue.h" diff --git a/test/core/30574.c b/test/core/30574.c index a5aa5cc..6fa1c88 100644 --- a/test/core/30574.c +++ b/test/core/30574.c @@ -4,7 +4,7 @@ #include <stdlib.h> #include <dbus/dbus.h> #include <glib.h> -#include <dbus/dbus-gmain.h> +#include <dbus-gmain/dbus-gmain.h> #include "test/lib/util.h" DBusConnection *bus; diff --git a/test/core/Makefile.am b/test/core/Makefile.am index 096e327..1381e73 100644 --- a/test/core/Makefile.am +++ b/test/core/Makefile.am @@ -64,7 +64,7 @@ test_thread_server_LDADD = \ $(DBUS_GLIB_THREADS_LIBS) \ $(DBUS_GLIB_LIBS) \ $(DBUS_LIBS) \ - $(top_builddir)/dbus/libdbus-gmain.la \ + $(top_builddir)/dbus-gmain/libdbus-gmain.la \ $(top_builddir)/test/lib/libtest.la \ $(NULL) @@ -75,7 +75,7 @@ test_thread_client_LDADD = \ $(DBUS_GLIB_THREADS_LIBS) \ $(DBUS_GLIB_LIBS) \ $(DBUS_LIBS) \ - $(top_builddir)/dbus/libdbus-gmain.la \ + $(top_builddir)/dbus-gmain/libdbus-gmain.la \ $(top_builddir)/test/lib/libtest.la \ $(NULL) @@ -114,7 +114,7 @@ test_30574_SOURCES = \ test_30574_LDADD = \ $(DBUS_GLIB_LIBS) \ $(DBUS_LIBS) \ - $(top_builddir)/dbus/libdbus-gmain.la \ + $(top_builddir)/dbus-gmain/libdbus-gmain.la \ $(top_builddir)/test/lib/libtest.la \ $(NULL) diff --git a/test/core/test-thread-client.c b/test/core/test-thread-client.c index ecd6c0e..2310a14 100644 --- a/test/core/test-thread-client.c +++ b/test/core/test-thread-client.c @@ -1,7 +1,7 @@ #include <config.h> #include <glib.h> -#include <dbus/dbus-gmain.h> +#include <dbus-gmain/dbus-gmain.h> #include <stdio.h> #include <string.h> #include <unistd.h> diff --git a/test/core/test-thread-server.c b/test/core/test-thread-server.c index 34cbb1e..15b8b24 100644 --- a/test/core/test-thread-server.c +++ b/test/core/test-thread-server.c @@ -1,7 +1,7 @@ #include <config.h> #include <glib.h> -#include <dbus/dbus-gmain.h> +#include <dbus-gmain/dbus-gmain.h> #include <stdio.h> #include <string.h> |