From 78db0953d9152c813e34e7d6bbcb267882a37968 Mon Sep 17 00:00:00 2001 From: Alexandre Savard <alexandre.savard@savoirfairelinux.net> Date: Fri, 29 May 2009 14:56:45 -0400 Subject: [PATCH] [#1469] Modify header linkers in dbus-c++'s Makefile.am's --- sflphone-common/libs/dbus-c++/Makefile.am | 22 +++---------------- sflphone-common/libs/dbus-c++/src/Makefile.am | 18 ++++++--------- .../libs/dbus-c++/tools/Makefile.am | 17 +++++++------- 3 files changed, 18 insertions(+), 39 deletions(-) diff --git a/sflphone-common/libs/dbus-c++/Makefile.am b/sflphone-common/libs/dbus-c++/Makefile.am index 29bb7c9bb7..6e4fa0f138 100644 --- a/sflphone-common/libs/dbus-c++/Makefile.am +++ b/sflphone-common/libs/dbus-c++/Makefile.am @@ -1,22 +1,6 @@ -SUBDIRS = src tools data doc examples - -EXTRA_DIST = autogen.sh libdbus-c++.spec libdbus-c++.spec.in - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = dbus-c++-1.pc +SUBDIRS = src tools data MAINTAINERCLEANFILES = \ - configure \ - Makefile.in \ - aclocal.m4 \ - compile \ - config.guess \ - config.sub \ - depcomp \ - install-sh \ - ltmain.sh \ - mdate-sh \ - missing \ - mkinstalldirs \ - libdbus-c++.spec + Makefile.in + diff --git a/sflphone-common/libs/dbus-c++/src/Makefile.am b/sflphone-common/libs/dbus-c++/src/Makefile.am index 09ddc5bdeb..2f96f47383 100644 --- a/sflphone-common/libs/dbus-c++/src/Makefile.am +++ b/sflphone-common/libs/dbus-c++/src/Makefile.am @@ -1,24 +1,20 @@ AM_CPPFLAGS = \ $(dbus_CFLAGS) \ $(glib_CFLAGS) \ - $(ecore_CFLAGS) \ $(PRIVATE_CFLAGS) \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/include + -I$(top_srcdir)/libs/dbus-c++/include \ + -I$(top_builddir)/libs/dbus-c++/include if ENABLE_GLIB GLIB_H = $(HEADER_DIR)/glib-integration.h GLIB_CPP = glib-integration.cpp endif -if ENABLE_ECORE -ECORE_H = $(HEADER_DIR)/ecore-integration.h -ECORE_CPP = ecore-integration.cpp -endif +CONFIG_H = $(top_builddir)/libs/dbus-c++/include/dbus-c++/config.h -HEADER_DIR = $(top_srcdir)/include/dbus-c++ +HEADER_DIR = $(top_builddir)/libs/dbus-c++/include/dbus-c++ HEADER_FILES = \ - $(HEADER_DIR)/dbus.h \ + $(HEADER_DIR)/dbus.h \ $(HEADER_DIR)/types.h \ $(HEADER_DIR)/connection.h \ $(HEADER_DIR)/property.h \ @@ -37,14 +33,14 @@ HEADER_FILES = \ $(HEADER_DIR)/api.h \ $(HEADER_DIR)/eventloop.h \ $(HEADER_DIR)/eventloop-integration.h \ - $(GLIB_H) $(ECORE_H) + $(GLIB_H) lib_includedir=$(includedir)/dbus-c++-1/dbus-c++/ lib_include_HEADERS = $(HEADER_FILES) lib_LTLIBRARIES = libdbus-c++-1.la libdbus_c___1_la_SOURCES = $(HEADER_FILES) interface.cpp object.cpp introspection.cpp debug.cpp types.cpp connection.cpp connection_p.h property.cpp dispatcher.cpp dispatcher_p.h pendingcall.cpp pendingcall_p.h error.cpp internalerror.h message.cpp message_p.h server.cpp server_p.h eventloop.cpp eventloop-integration.cpp $(GLIB_CPP) $(ECORE_CPP) -libdbus_c___1_la_LIBADD = $(dbus_LIBS) $(glib_LIBS) $(pthread_LIBS) $(ecore_LIBS) +libdbus_c___1_la_LIBADD = $(dbus_LIBS) $(glib_LIBS) $(pthread_LIBS) MAINTAINERCLEANFILES = \ Makefile.in diff --git a/sflphone-common/libs/dbus-c++/tools/Makefile.am b/sflphone-common/libs/dbus-c++/tools/Makefile.am index e89f048b05..e4403ea275 100644 --- a/sflphone-common/libs/dbus-c++/tools/Makefile.am +++ b/sflphone-common/libs/dbus-c++/tools/Makefile.am @@ -1,19 +1,18 @@ # hacky, but ... -CXX = $(CXX_FOR_BUILD) +# CXX = $(CXX_FOR_BUILD) AM_CPPFLAGS = \ $(dbus_CFLAGS) \ $(xml_CFLAGS) \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ - -Wall + -I$(top_srcdir)/libs/dbus-c++/include \ + -I$(top_builddir)/libs/dbus-c++/include -if CROSS_COMPILING -libdbus_cxx_la = $(BUILD_LIBDBUS_CXX_DIR)/src/libdbus-c++-1.la -else -libdbus_cxx_la = $(top_builddir)/src/libdbus-c++-1.la -endif +#if CROSS_COMPILING +#libdbus_cxx_la = $(BUILD_LIBDBUS_CXX_DIR)/src/libdbus-c++-1.la +#else +libdbus_cxx_la = $(top_builddir)/libs/dbus-c++/src/libdbus-c++-1.la +#endif bin_PROGRAMS = dbusxx-xml2cpp dbusxx-introspect -- GitLab