diff options
author | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-07-08 16:38:19 +0200 |
---|---|---|
committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-07-09 11:42:30 +0200 |
commit | 6c4ea60aa257907deebcdb346a9d68bbe722837e (patch) | |
tree | 9169a621bdb63de41ccc6711636f8e5b6a432c49 | |
parent | 27572201de598e6c097dac708826a724e4154659 (diff) | |
download | abrt-6c4ea60aa257907deebcdb346a9d68bbe722837e.tar.gz abrt-6c4ea60aa257907deebcdb346a9d68bbe722837e.tar.xz abrt-6c4ea60aa257907deebcdb346a9d68bbe722837e.zip |
mv devel header files to inc/ and install them
- header files are required to write the custom plugins plugins
without downloading the whole git tree, user just need to install
abrt-devel package
-rw-r--r-- | Makefile.am | 5 | ||||
-rwxr-xr-x | abrt-utils.pc.in | 11 | ||||
-rw-r--r-- | abrt.spec | 2 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | inc/Action.h (renamed from lib/Utils/Action.h) | 0 | ||||
-rw-r--r-- | inc/Analyzer.h (renamed from lib/Utils/Analyzer.h) | 0 | ||||
-rw-r--r-- | inc/CommLayerInner.h (renamed from lib/Utils/CommLayerInner.h) | 0 | ||||
-rw-r--r-- | inc/DBusCommon.h (renamed from lib/Utils/DBusCommon.h) | 0 | ||||
-rw-r--r-- | inc/Database.h (renamed from lib/Utils/Database.h) | 0 | ||||
-rw-r--r-- | inc/DebugDump.h (renamed from lib/Utils/DebugDump.h) | 0 | ||||
-rw-r--r-- | inc/Makefile.am | 20 | ||||
-rw-r--r-- | inc/Observer.h (renamed from lib/Utils/Observer.h) | 0 | ||||
-rw-r--r-- | inc/Plugin.h (renamed from lib/Utils/Plugin.h) | 0 | ||||
-rw-r--r-- | inc/Reporter.h (renamed from lib/Utils/Reporter.h) | 0 | ||||
-rw-r--r-- | inc/abrt_xmlrpc.h (renamed from lib/Utils/abrt_xmlrpc.h) | 0 | ||||
-rw-r--r-- | inc/xfuncs.h (renamed from lib/Utils/xfuncs.h) | 0 | ||||
-rw-r--r-- | lib/Utils/Makefile.am | 19 |
17 files changed, 46 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 080a7bf5..cf4aece5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,10 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = lib src inc po icons -EXTRA_DIST = doc/CodingStyle abrt.spec +EXTRA_DIST = doc/CodingStyle abrt.spec abrt-utils.pc.in + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = abrt-utils.pc RPM_DIRS = --define "_sourcedir `pwd`" \ --define "_rpmdir `pwd`" \ diff --git a/abrt-utils.pc.in b/abrt-utils.pc.in new file mode 100755 index 00000000..6f0fa410 --- /dev/null +++ b/abrt-utils.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: abrt-utils +Description: Library for writing ABRT plugins +#Requires: dbus-1 +Version: @VERSION@ +Libs: -L${libdir} -lABRTUtils -lABRTdUtils +Cflags: -I${includedir}/abrt -fPIC @@ -332,7 +332,9 @@ fi %files devel %defattr(-,root,root,-) +%{_includedir}/* %{_libdir}/lib*.so +%{_libdir}/pkgconfig/* %files gui %defattr(-,root,root,-) diff --git a/configure.ac b/configure.ac index 9b6beb55..362e5f6b 100644 --- a/configure.ac +++ b/configure.ac @@ -99,6 +99,7 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([ Makefile + abrt-utils.pc lib/Makefile lib/Utils/Makefile lib/Plugins/Makefile diff --git a/lib/Utils/Action.h b/inc/Action.h index fc56277b..fc56277b 100644 --- a/lib/Utils/Action.h +++ b/inc/Action.h diff --git a/lib/Utils/Analyzer.h b/inc/Analyzer.h index a45bd0e8..a45bd0e8 100644 --- a/lib/Utils/Analyzer.h +++ b/inc/Analyzer.h diff --git a/lib/Utils/CommLayerInner.h b/inc/CommLayerInner.h index 353cfc76..353cfc76 100644 --- a/lib/Utils/CommLayerInner.h +++ b/inc/CommLayerInner.h diff --git a/lib/Utils/DBusCommon.h b/inc/DBusCommon.h index 58b4c8dc..58b4c8dc 100644 --- a/lib/Utils/DBusCommon.h +++ b/inc/DBusCommon.h diff --git a/lib/Utils/Database.h b/inc/Database.h index a698bcbc..a698bcbc 100644 --- a/lib/Utils/Database.h +++ b/inc/Database.h diff --git a/lib/Utils/DebugDump.h b/inc/DebugDump.h index f8487a65..f8487a65 100644 --- a/lib/Utils/DebugDump.h +++ b/inc/DebugDump.h diff --git a/inc/Makefile.am b/inc/Makefile.am index 2ccc714f..e668b48a 100644 --- a/inc/Makefile.am +++ b/inc/Makefile.am @@ -1 +1,19 @@ -EXTRA_DIST = ABRTException.h CrashTypes.h abrtlib.h abrt_types.h +HEADER_FILES = \ + ABRTException.h \ + abrtlib.h \ + abrt_types.h \ + abrt_xmlrpc.h \ + Action.h \ + Analyzer.h \ + CommLayerInner.h \ + CrashTypes.h \ + Database.h \ + DBusCommon.h \ + DebugDump.h \ + Observer.h \ + Plugin.h \ + Reporter.h \ + xfuncs.h + +lib_includedir=$(includedir)/abrt/ +lib_include_HEADERS = $(HEADER_FILES) diff --git a/lib/Utils/Observer.h b/inc/Observer.h index ec7dfa7b..ec7dfa7b 100644 --- a/lib/Utils/Observer.h +++ b/inc/Observer.h diff --git a/lib/Utils/Plugin.h b/inc/Plugin.h index 367739ff..367739ff 100644 --- a/lib/Utils/Plugin.h +++ b/inc/Plugin.h diff --git a/lib/Utils/Reporter.h b/inc/Reporter.h index 4144ec33..4144ec33 100644 --- a/lib/Utils/Reporter.h +++ b/inc/Reporter.h diff --git a/lib/Utils/abrt_xmlrpc.h b/inc/abrt_xmlrpc.h index ce770384..ce770384 100644 --- a/lib/Utils/abrt_xmlrpc.h +++ b/inc/abrt_xmlrpc.h diff --git a/lib/Utils/xfuncs.h b/inc/xfuncs.h index de785c8e..de785c8e 100644 --- a/lib/Utils/xfuncs.h +++ b/inc/xfuncs.h diff --git a/lib/Utils/Makefile.am b/lib/Utils/Makefile.am index 56678d49..070a6fb0 100644 --- a/lib/Utils/Makefile.am +++ b/lib/Utils/Makefile.am @@ -1,7 +1,8 @@ # ABRTUtils has small set of deps. This reduces deps of smaller abrt binaries # ABRTdUtils has much more. It is used by daemon and plugins only lib_LTLIBRARIES = libABRTUtils.la libABRTdUtils.la - +HEADER_DIR = $(srcdir)/../../inc +AM_CPPFLAGS = -I$(HEADER_DIR) AM_YFLAGS = --verbose # Not used just yet: @@ -9,7 +10,7 @@ AM_YFLAGS = --verbose # xconnect.cpp libABRTUtils_la_SOURCES = \ - xfuncs.h xfuncs.cpp \ + xfuncs.cpp \ encbase64.cpp \ read_write.cpp \ logging.cpp \ @@ -20,7 +21,7 @@ libABRTUtils_la_SOURCES = \ spawn.cpp \ stringops.cpp \ dirsize.cpp \ - DebugDump.h DebugDump.cpp \ + DebugDump.cpp \ abrt_dbus.h abrt_dbus.cpp \ CrashTypes.cpp \ ABRTException.cpp \ @@ -51,15 +52,13 @@ libABRTUtils_la_LIBADD = \ libABRTdUtils_la_SOURCES = \ parse_release.cpp \ make_descr.cpp \ - CommLayerInner.h CommLayerInner.cpp \ - abrt_xmlrpc.h abrt_xmlrpc.cpp \ + $(HEADER_DIR)/CommLayerInner.h CommLayerInner.cpp \ + $(HEADER_DIR)/abrt_xmlrpc.h abrt_xmlrpc.cpp \ abrt_rh_support.h abrt_rh_support.cpp \ abrt_curl.h abrt_curl.cpp \ - Plugin.h Plugin.cpp \ - Polkit.h Polkit.cpp \ - Action.h Database.h Reporter.h Analyzer.h \ - Observer.h \ - DBusCommon.h + $(HEADER_DIR)/Plugin.h Plugin.cpp \ + Polkit.h Polkit.cpp + libABRTdUtils_la_CPPFLAGS = \ -Wall -Werror \ -I$(srcdir)/../../inc \ |