* Renamed pkg-config configuration file

* Initial support for out-of-tree builds and crosscompilation (Robert Schwebel)


git-svn-id: http://dev.openwengo.org/svn/openwengo/wengophone-ng/branches/wengophone-dbus-api/libs/dbus@9043 30a43799-04e7-0310-8b2b-ea0d24f86d0e
This commit is contained in:
pdurante 2006-12-31 05:16:32 +00:00
parent 12266bd407
commit 7835d90bdc
6 changed files with 33 additions and 6 deletions

View file

@ -3,7 +3,7 @@ SUBDIRS = src tools data doc examples
EXTRA_DIST = autogen.sh
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dbus-c++.pc
pkgconfig_DATA = dbus-c++-1.pc
MAINTAINERCLEANFILES = \
configure \

View file

@ -30,6 +30,9 @@ AC_LANG_CPLUSPLUS
AC_PROG_CC
AC_PROG_CXX
CXX_FOR_BUILD=${CXX_FOR_BUILD-${CXX}}
AC_SUBST(CXX_FOR_BUILD)
AM_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
@ -92,6 +95,20 @@ fi
AM_CONDITIONAL(DBUS_DOXYGEN_DOCS_ENABLED, test x$enable_doxygen_docs = xyes)
AC_MSG_RESULT(yes)
# For the tools/, we need libdbus-c++ for the "build" architecture as well
AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
AC_ARG_WITH(build-libdbus-cxx,
AS_HELP_STRING([--with-build-libdbus-cxx],[For cross compilation: path to
libdbus-cxx which was compiled for the 'build' system.]),
[ BUILD_LIBDBUS_CXX_DIR=${withval} ],
[ BUILD_LIBDBUS_CXX_DIR="\$(top_builddir)" ]
)
AC_SUBST(BUILD_LIBDBUS_CXX_DIR)
# Save processed files
AC_OUTPUT(
@ -105,5 +122,5 @@ AC_OUTPUT(
examples/properties/Makefile
examples/echo/Makefile
examples/hal/Makefile
dbus-c++.pc
dbus-c++-1.pc
)

View file

@ -14,7 +14,7 @@ BUILT_SOURCES = echo-glue.h
CLEANFILES = $(BUILT_SOURCES)
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
cd $(distdir); rm -f $(BUILT_SOURCES)
MAINTAINERCLEANFILES = \
Makefile.in

View file

@ -14,7 +14,7 @@ BUILT_SOURCES = props-glue.h
CLEANFILES = $(BUILT_SOURCES)
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
cd $(distdir); rm -f $(BUILT_SOURCES)
MAINTAINERCLEANFILES = \
Makefile.in

View file

@ -1,15 +1,25 @@
# hacky, but ...
CXX = $(CXX_FOR_BUILD)
AM_CPPFLAGS = \
$(dbus_CFLAGS) \
-I$(top_srcdir)/include \
-DDBUS_API_SUBJECT_TO_CHANGE
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
bin_PROGRAMS = dbusxx-xml2cpp dbusxx-introspect
dbusxx_xml2cpp_SOURCES = xml2cpp.h xml2cpp.cpp
dbusxx_xml2cpp_LDADD = $(dbus_LIBS) $(top_builddir)/src/libdbus-c++-1.la
dbusxx_xml2cpp_LDADD = $(libdbus_cxx_la)
dbusxx_introspect_SOURCES = introspect.h introspect.cpp
dbusxx_introspect_LDADD = $(top_builddir)/src/libdbus-c++-1.la
dbusxx_introspect_LDADD = $(libdbus_cxx_la)
MAINTAINERCLEANFILES = \
Makefile.in