diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.in | 17 | ||||
| -rw-r--r-- | devkit-power.pc.in | 13 | ||||
| -rw-r--r-- | libdevkit-power/Makefile.am | 21 |
5 files changed, 2 insertions, 53 deletions
@@ -41,7 +41,6 @@ intltool-merge.in intltool-merge intltool-update.in intltool-update -devicekit-power.pc xmldocs.make omf.make gtk-doc.make diff --git a/Makefile.am b/Makefile.am index 4fefc86..a1a3eb9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,9 +2,6 @@ SUBDIRS = libdevkit-power src doc tools policy po -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = devkit-power.pc - # Creating ChangeLog from git log (taken from cairo/Makefile.am): ChangeLog: $(srcdir)/ChangeLog diff --git a/configure.in b/configure.in index eadae9e..1b5ac8d 100644 --- a/configure.in +++ b/configure.in @@ -6,22 +6,6 @@ AM_INIT_AUTOMAKE(DeviceKit-power, 001) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE -# libtool versioning - this applies to libdevkit-power -# -# See http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91 for details -# -# increment; -# CURRENT If the API or ABI interface has changed (reset REVISION to 0) -# REVISION If the API and ABI remains the same, but bugs are fixed. -# AGE If libpackagekit can be linked into executables which can be -# built with previous versions of this library. Don't use. -LT_CURRENT=1 -LT_REVISION=0 -LT_AGE=0 -AC_SUBST(LT_CURRENT) -AC_SUBST(LT_REVISION) -AC_SUBST(LT_AGE) - AC_ISC_POSIX AC_PROG_CC AM_PROG_CC_STDC @@ -162,7 +146,6 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain]) AC_OUTPUT([ Makefile -devkit-power.pc src/Makefile tools/Makefile doc/Makefile diff --git a/devkit-power.pc.in b/devkit-power.pc.in deleted file mode 100644 index b740027..0000000 --- a/devkit-power.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: devicekit-power -Description: DeviceKit-power is a system daemon for installing stuff. -Version: @VERSION@ -Requires.private: dbus-1, gthread-2.0 -Requires: glib-2.0, gobject-2.0 -Libs: -L${libdir} -ldkp-power -Cflags: -I${includedir}/DeviceKit-power/dkp-gobject - diff --git a/libdevkit-power/Makefile.am b/libdevkit-power/Makefile.am index 644c157..ea8c61b 100644 --- a/libdevkit-power/Makefile.am +++ b/libdevkit-power/Makefile.am @@ -5,18 +5,9 @@ INCLUDES = \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -lib_LTLIBRARIES = \ +noinst_LTLIBRARIES = \ libdevkit-power.la -libdevkit_power_includedir = $(includedir)/DeviceKit/devkit-power - -libdevkit_power_include_HEADERS = \ - dkp-object.h \ - dkp-client.h \ - dkp-history-obj.h \ - dkp-client-device.h \ - dkp-enum.h - libdevkit_power_la_SOURCES = \ dkp-debug.c \ dkp-debug.h \ @@ -31,16 +22,8 @@ libdevkit_power_la_SOURCES = \ dkp-object.c \ dkp-object.h -libdevkit_power_la_LIBADD = \ - $(INTLLIBS) \ - $(GLIB_LIBS) \ - $(DBUS_GLIB_LIBS) +libdevkit_power_la_LIBADD = $(INTLLIBS) $(GLIB_LIBS) $(DBUS_GLIB_LIBS) -libdevkit_power_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-dynamic \ - -no-undefined \ - -export-symbols-regex '^dkp_.*' clean-local: rm -f *~ |