From: Krisztian Litkey Date: Thu, 7 Jun 2012 14:13:20 +0000 (+0300) Subject: build: generate dbus lib .pc file, removed extra header typo/cut'n'pasteo. X-Git-Tag: build/2012-07-04.133153~43 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4fb5127a2403748577c0024ecb5bc147a74b4712;p=profile%2Fivi%2Fmurphy.git build: generate dbus lib .pc file, removed extra header typo/cut'n'pasteo. --- diff --git a/configure.ac b/configure.ac index 5743f29..6bada80 100644 --- a/configure.ac +++ b/configure.ac @@ -103,7 +103,6 @@ fi AC_SUBST(WARNING_CFLAGS) - # Check if DBUS was enabled. AC_ARG_ENABLE(dbus, [ --enable-dbus enable D-BUS support], @@ -123,8 +122,6 @@ AC_SUBST(DBUS_ENABLED) AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) - - # Set up murphy CFLAGS and LIBS. MURPHY_CFLAGS="$GLIB_CFLAGS $DBUS_CFLAGS" MURPHY_LIBS="$GLIB_LIBS $DBUS_LIBS" @@ -273,6 +270,7 @@ AC_CONFIG_FILES([build-aux/shave src/core/tests/Makefile src/daemon/tests/Makefile src/common/murphy-common.pc + src/common/murphy-dbus.pc src/core/murphy-core.pc src/murphy-db/Makefile src/murphy-db/mdb/Makefile @@ -291,6 +289,7 @@ AC_OUTPUT # Display the configuration. echo "----- configuration -----" echo "Extra C warnings flags: $WARNING_CFLAGS" +echo "D-Bus support: $enable_dbus" echo "Plugins:" echo " - linked-in:" for plugin in ${INTERNAL_PLUGINS:-none}; do diff --git a/src/Makefile.am b/src/Makefile.am index 2119183..2d5a647 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -130,13 +130,6 @@ lib_LTLIBRARIES += libmurphy-dbus.la EXTRA_DIST += common/murphy-dbus.pc pkgconfig_DATA += common/murphy-dbus.pc -libmurphy_dbush_ladir = \ - $(includedir)/murphy - -libmurphy_dbush_la_HEADERS = \ - common/dbus.h \ - common/dbus-transport.h - libmurphy_dbus_ladir = \ $(includedir)/murphy/common diff --git a/src/common/murphy-dbus.pc.in b/src/common/murphy-dbus.pc.in new file mode 100644 index 0000000..0b77d58 --- /dev/null +++ b/src/common/murphy-dbus.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: murphy-dbus +Description: Murphy policy framework, dbus library. +Requires: murphy-common +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lmurphy-dbus @DBUS_LIBS@ +Cflags: -I${includedir} @DBUS_CFLAGS@