Move library into a separate directory

Since subdirectories are processed first, make attempted to build the examples before the library was built. This failed, obviously. Signed-off-by: Petr Tesarik <[email protected]>
ptesarik · Dec 8, 2015 · 1e6e4ba · 1e6e4ba
1 parent b90a4fa
commit 1e6e4ba
Show file tree

Hide file tree

Showing 24 changed files with 39 additions and 37 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -21,46 +21,13 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = doc examples
-
-lib_LTLIBRARIES = libkdumpfile.la
-libkdumpfile_la_SOURCES = \
-	attr.c \
-	context.c \
-	devmem.c \
-	diskdump.c \
-	elfdump.c \
-	ia32.c \
-	lkcd.c \
-	notes.c \
-	open.c \
-	read.c \
-	s390x.c \
-	s390dump.c \
-	todo.c \
-	util.c \
-	vtop.c \
-	x86_64.c
-
-EXTRA_libkdumpfile_la_DEPENDENCIES = libkdumpfile.map
-
-libkdumpfile_la_LDFLAGS = -version-info 5:0:5
-libkdumpfile_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libkdumpfile.map
-
-include_HEADERS = \
-	kdumpfile.h
-
-noinst_HEADERS = \
-	kdumpfile-priv.h \
-	global-attr.def \
-	static-attr.def
+SUBDIRS = doc src examples
 
 dist_noinst_DATA = \
 	COPYING.GPLv2 \
 	COPYING.GPLv3 \
 	COPYING.LGPLv3 \
-	README.md \
-	libkdumpfile.map
+	README.md
 
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA=libkdumpfile.pc
diff --git a/configure.ac b/configure.ac
@@ -21,7 +21,7 @@ dnl  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 AC_INIT([Library for reading kernel core dumps],
         [0.1.6],[[email protected]],[libkdumpfile])
 
-AC_CONFIG_SRCDIR([diskdump.c])
+AC_CONFIG_SRCDIR([src/diskdump.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADER([config.h])
 
@@ -46,6 +46,7 @@ AC_CONFIG_FILES([
 	Makefile
 	doc/Makefile
 	examples/Makefile
+	src/Makefile
 	libkdumpfile.pc
 ])
 

diff --git a/examples/Makefile.am b/examples/Makefile.am
@@ -19,8 +19,10 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
+AM_CPPFLAGS = -I$(top_srcdir)/src
+LIBS = $(top_srcdir)/src/libkdumpfile.la
+
 dumpattr_SOURCES = \
 	dumpattr.c
-dumpattr_LDADD = ../libkdumpfile.la
 
 bin_PROGRAMS = dumpattr
diff --git a/attr.c → src/attr.c b/attr.c → src/attr.c
diff --git a/context.c → src/context.c b/context.c → src/context.c
diff --git a/devmem.c → src/devmem.c b/devmem.c → src/devmem.c
diff --git a/diskdump.c → src/diskdump.c b/diskdump.c → src/diskdump.c
diff --git a/elfdump.c → src/elfdump.c b/elfdump.c → src/elfdump.c
diff --git a/src/global-attr.def b/src/global-attr.def
@@ -0,0 +1,32 @@
+/* Definitions for global (but not static) attributes
+ *
+ * To use this file, provide a definition for the ATTR() macro:
+ *
+ *   ATTR(dir, key, id, type, ctype)
+ *
+ * @param dir    Directory identifier (without the dir_ prefix).
+ * @param key    Key name (a constant C string).
+ * @param id     C identifier.
+ * @param type   Attribute type (kdump_attr_type).
+ * @param ctype  Suggested C type for the attribute.
+ *
+ * A typical stanza is:
+ * #define ATTR(dir, key, field, type, ctype) \
+ *   // use macro arguments to construct whatever you need
+ * #include "global-attr.def"
+ * #undef ATTR
+ */
+
+/* utsname */
+ATTR(linux_uts, "sysname", linux_uts_sysname, string, const char *)
+ATTR(linux_uts, "nodename", linux_uts_nodename, string, const char *)
+ATTR(linux_uts, "release", linux_uts_release, string, const char *)
+ATTR(linux_uts, "version", linux_uts_version, string, const char *)
+ATTR(linux_uts, "machine", linux_uts_machine, string, const char *)
+ATTR(linux_uts, "domainname", linux_uts_domainname, string, const char *)
+
+/* Xen */
+ATTR(xen_version, "major", xen_ver_major, number, unsigned long)
+ATTR(xen_version, "minor", xen_ver_minor, number, unsigned long)
+ATTR(xen_version, "extra", xen_ver_extra, string, const char *)
+ATTR(xen_version, "extra_addr", xen_ver_extra_addr, address, kdump_vaddr_t)
diff --git a/ia32.c → src/ia32.c b/ia32.c → src/ia32.c
diff --git a/kdumpfile-priv.h → src/kdumpfile-priv.h b/kdumpfile-priv.h → src/kdumpfile-priv.h
diff --git a/kdumpfile.h → src/kdumpfile.h b/kdumpfile.h → src/kdumpfile.h
diff --git a/libkdumpfile.map → src/libkdumpfile.map b/libkdumpfile.map → src/libkdumpfile.map
diff --git a/lkcd.c → src/lkcd.c b/lkcd.c → src/lkcd.c
diff --git a/notes.c → src/notes.c b/notes.c → src/notes.c
diff --git a/open.c → src/open.c b/open.c → src/open.c
diff --git a/read.c → src/read.c b/read.c → src/read.c
diff --git a/s390dump.c → src/s390dump.c b/s390dump.c → src/s390dump.c
diff --git a/s390x.c → src/s390x.c b/s390x.c → src/s390x.c
diff --git a/static-attr.def → src/static-attr.def b/static-attr.def → src/static-attr.def
diff --git a/todo.c → src/todo.c b/todo.c → src/todo.c
diff --git a/util.c → src/util.c b/util.c → src/util.c
diff --git a/vtop.c → src/vtop.c b/vtop.c → src/vtop.c
diff --git a/x86_64.c → src/x86_64.c b/x86_64.c → src/x86_64.c