Skip to content
Snippets Groups Projects
Commit 78db0953 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

[#1469] Modify header linkers in dbus-c++'s Makefile.am's

parent 9ec3d2af
No related branches found
No related tags found
No related merge requests found
SUBDIRS = src tools data doc examples SUBDIRS = src tools data
EXTRA_DIST = autogen.sh libdbus-c++.spec libdbus-c++.spec.in
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dbus-c++-1.pc
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \
configure \ Makefile.in
Makefile.in \
aclocal.m4 \
compile \
config.guess \
config.sub \
depcomp \
install-sh \
ltmain.sh \
mdate-sh \
missing \
mkinstalldirs \
libdbus-c++.spec
AM_CPPFLAGS = \ AM_CPPFLAGS = \
$(dbus_CFLAGS) \ $(dbus_CFLAGS) \
$(glib_CFLAGS) \ $(glib_CFLAGS) \
$(ecore_CFLAGS) \
$(PRIVATE_CFLAGS) \ $(PRIVATE_CFLAGS) \
-I$(top_srcdir)/include \ -I$(top_srcdir)/libs/dbus-c++/include \
-I$(top_builddir)/include -I$(top_builddir)/libs/dbus-c++/include
if ENABLE_GLIB if ENABLE_GLIB
GLIB_H = $(HEADER_DIR)/glib-integration.h GLIB_H = $(HEADER_DIR)/glib-integration.h
GLIB_CPP = glib-integration.cpp GLIB_CPP = glib-integration.cpp
endif endif
if ENABLE_ECORE CONFIG_H = $(top_builddir)/libs/dbus-c++/include/dbus-c++/config.h
ECORE_H = $(HEADER_DIR)/ecore-integration.h
ECORE_CPP = ecore-integration.cpp
endif
HEADER_DIR = $(top_srcdir)/include/dbus-c++ HEADER_DIR = $(top_builddir)/libs/dbus-c++/include/dbus-c++
HEADER_FILES = \ HEADER_FILES = \
$(HEADER_DIR)/dbus.h \ $(HEADER_DIR)/dbus.h \
$(HEADER_DIR)/types.h \ $(HEADER_DIR)/types.h \
...@@ -37,14 +33,14 @@ HEADER_FILES = \ ...@@ -37,14 +33,14 @@ HEADER_FILES = \
$(HEADER_DIR)/api.h \ $(HEADER_DIR)/api.h \
$(HEADER_DIR)/eventloop.h \ $(HEADER_DIR)/eventloop.h \
$(HEADER_DIR)/eventloop-integration.h \ $(HEADER_DIR)/eventloop-integration.h \
$(GLIB_H) $(ECORE_H) $(GLIB_H)
lib_includedir=$(includedir)/dbus-c++-1/dbus-c++/ lib_includedir=$(includedir)/dbus-c++-1/dbus-c++/
lib_include_HEADERS = $(HEADER_FILES) lib_include_HEADERS = $(HEADER_FILES)
lib_LTLIBRARIES = libdbus-c++-1.la 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_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 = \ MAINTAINERCLEANFILES = \
Makefile.in Makefile.in
# hacky, but ... # hacky, but ...
CXX = $(CXX_FOR_BUILD) # CXX = $(CXX_FOR_BUILD)
AM_CPPFLAGS = \ AM_CPPFLAGS = \
$(dbus_CFLAGS) \ $(dbus_CFLAGS) \
$(xml_CFLAGS) \ $(xml_CFLAGS) \
-I$(top_srcdir)/include \ -I$(top_srcdir)/libs/dbus-c++/include \
-I$(top_builddir)/include \ -I$(top_builddir)/libs/dbus-c++/include
-Wall
if CROSS_COMPILING #if CROSS_COMPILING
libdbus_cxx_la = $(BUILD_LIBDBUS_CXX_DIR)/src/libdbus-c++-1.la #libdbus_cxx_la = $(BUILD_LIBDBUS_CXX_DIR)/src/libdbus-c++-1.la
else #else
libdbus_cxx_la = $(top_builddir)/src/libdbus-c++-1.la libdbus_cxx_la = $(top_builddir)/libs/dbus-c++/src/libdbus-c++-1.la
endif #endif
bin_PROGRAMS = dbusxx-xml2cpp dbusxx-introspect bin_PROGRAMS = dbusxx-xml2cpp dbusxx-introspect
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment