diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | server/Makefile.am | 11 | ||||
| -rw-r--r-- | test/dbus/Makefile.am | 15 |
5 files changed, 19 insertions, 14 deletions
@@ -40,4 +40,4 @@ lib/dleyna-server.conf lib/dleyna-server-1.0.pc server/dleyna-server-service -server/dms-info +test/dbus/dms-info diff --git a/Makefile.am b/Makefile.am index cf14587..ac4efd8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = lib if BUILD_SERVER -SUBDIRS += server +SUBDIRS += server test/dbus endif ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} diff --git a/configure.ac b/configure.ac index 2f6953a..c733d22 100644 --- a/configure.ac +++ b/configure.ac @@ -214,7 +214,8 @@ AC_CONFIG_FILES([Makefile \ lib/dleyna-server.conf \ server/com.intel.dleyna-server.service \ server/dleyna-server-service-1.0.pc \ - server/Makefile + server/Makefile \ + test/dbus/Makefile ]) AC_OUTPUT diff --git a/server/Makefile.am b/server/Makefile.am index 135c62d..87fabf0 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -14,17 +14,6 @@ dleyna_server_service_LDADD = $(GLIB_LIBS) \ $(GIO_LIBS) \ $(DLEYNA_CORE_LIBS) \ $(top_builddir)/lib/libdleyna-server-1.0.la - -dms_info_sources = ../test/dbus/dms-info.c - -noinst_PROGRAMS = dms-info -dms_info_SOURCES = $(dms_info_sources) - -dms_info_CFLAGS = $(GLIB_CFLAGS) \ - $(GIO_CFLAGS) - -dms_info_LDADD = $(GLIB_LIBS) \ - $(GIO_LIBS) dbussessiondir = @DBUS_SESSION_DIR@ dbussession_DATA = com.intel.dleyna-server.service diff --git a/test/dbus/Makefile.am b/test/dbus/Makefile.am new file mode 100644 index 0000000..6e4a0fd --- /dev/null +++ b/test/dbus/Makefile.am @@ -0,0 +1,15 @@ +AM_CFLAGS = $(GLIB_CFLAGS) \ + $(GIO_CFLAGS) + +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + +dms_info_sources = dms-info.c + +noinst_PROGRAMS = dms-info +dms_info_SOURCES = $(dms_info_sources) + +dms_info_CFLAGS = $(GLIB_CFLAGS) \ + $(GIO_CFLAGS) + +dms_info_LDADD = $(GLIB_LIBS) \ + $(GIO_LIBS) |