summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Ferrandis <ludovic.ferrandis@intel.com>2013-09-13 10:44:13 +0200
committerJussi Kukkonen <jku@goto.fi>2014-07-08 13:40:02 +0300
commitc556478c732668ca880489693c84a628376f5681 (patch)
tree81b7d1b636f492fdca4a50ca685cde450c512bec
parent3909be5ba555d439a68f135ba41fe9825c66600b (diff)
downloaddleyna-server-c556478c732668ca880489693c84a628376f5681.tar.gz
[Autoconf] Sub Makefile: Remove ACLOCAL_AMFLAGS
According to Automake.pdf: ACLOCAL_AMFLAGS: This variable is only useful in the top-level ‘Makefile.am’. Signed-off-by: Ludovic Ferrandis <ludovic.ferrandis@intel.com> Fixes #127. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-rw-r--r--libdleyna/server/Makefile.am2
-rw-r--r--server/Makefile.am4
-rw-r--r--test/dbus/Makefile.am2
3 files changed, 1 insertions, 7 deletions
diff --git a/libdleyna/server/Makefile.am b/libdleyna/server/Makefile.am
index 020b41c..9a3e390 100644
--- a/libdleyna/server/Makefile.am
+++ b/libdleyna/server/Makefile.am
@@ -11,8 +11,6 @@ AM_CFLAGS = $(GLIB_CFLAGS) \
$(LIBXML_CFLAGS) \
-include config.h
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
pkglib_LTLIBRARIES = libdleyna-server-1.0.la
libdleyna_serverincdir = $(includedir)/dleyna-1.0/libdleyna/server
diff --git a/server/Makefile.am b/server/Makefile.am
index ad8a7b7..1c16fec 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -4,8 +4,6 @@ AM_CFLAGS = $(GLIB_CFLAGS) \
-I$(top_builddir)/libdleyna/server \
-include config.h
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
libexec_PROGRAMS = dleyna-server-service
dleyna_server_service_SOURCES = daemon.c
@@ -14,7 +12,7 @@ dleyna_server_service_LDADD = $(GLIB_LIBS) \
$(GIO_LIBS) \
$(DLEYNA_CORE_LIBS) \
$(top_builddir)/libdleyna/server/libdleyna-server-1.0.la
-
+
dbusservicedir = $(DBUS_SERVICE_DIR)
dbusservice_in_files = com.intel.dleyna-server.service.in
dbusservice_DATA = com.intel.dleyna-server.service
diff --git a/test/dbus/Makefile.am b/test/dbus/Makefile.am
index 6e4a0fd..4934294 100644
--- a/test/dbus/Makefile.am
+++ b/test/dbus/Makefile.am
@@ -1,7 +1,5 @@
AM_CFLAGS = $(GLIB_CFLAGS) \
$(GIO_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
dms_info_sources = dms-info.c