X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Makefile.am;h=9d2ac56d00522014d4cb29b407ebb6ec8392f566;hb=9faa7b376c1e1a48d8763829bab0ac4f0b924b01;hp=db51ae8bc05e7bd933fe1c74522995f92ed45ae9;hpb=2fee2f13ce5f6b17dd672389de422217c56105e2;p=thirdparty%2Fkmod.git

diff --git a/Makefile.am b/Makefile.am
index db51ae8..9d2ac56 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,7 @@ AM_MAKEFLAGS = --no-print-directory
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
 	-I$(top_srcdir)/libkmod \
+	-DROOTPREFIX=\""$(rootprefix)"\" \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	-DLIBEXECDIR=\""$(libexecdir)"\"
 
@@ -18,9 +19,22 @@ AM_LDFLAGS = \
 	-Wl,--gc-sections \
 	-Wl,--as-needed
 
-LIBKMOD_CURRENT=0
+SED_PROCESS = \
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
+	-e 's,@VERSION\@,$(VERSION),g' \
+	-e 's,@prefix\@,$(prefix),g' \
+	-e 's,@exec_prefix\@,$(exec_prefix),g' \
+	-e 's,@libdir\@,$(libdir),g' \
+	-e 's,@includedir\@,$(includedir),g' \
+	-e 's,@required_private_libs\@,$(required_private_libs),g' \
+	< $< > $@ || rm $@
+
+%.pc: %.pc.in Makefile
+	$(SED_PROCESS)
+
+LIBKMOD_CURRENT=2
 LIBKMOD_REVISION=0
-LIBKMOD_AGE=0
+LIBKMOD_AGE=1
 
 include_HEADERS = libkmod/libkmod.h
 lib_LTLIBRARIES = libkmod/libkmod.la
@@ -32,39 +46,43 @@ libkmod_libkmod_la_SOURCES =\
 	libkmod/libkmod.c \
 	libkmod/libkmod-list.c \
 	libkmod/libkmod-hash.c \
-	libkmod/libkmod-loaded.c \
 	libkmod/libkmod-config.c \
 	libkmod/libkmod-util.c \
 	libkmod/libkmod-index.c \
 	libkmod/libkmod-index.h \
-	libkmod/libkmod-module.c
+	libkmod/libkmod-module.c \
+	libkmod/libkmod-file.c \
+	libkmod/libkmod-elf.c
 
 EXTRA_DIST += libkmod/libkmod.sym
+EXTRA_DIST += libkmod/COPYING libkmod/README
 
 libkmod_libkmod_la_LDFLAGS = $(AM_LDFLAGS) \
 	-version-info $(LIBKMOD_CURRENT):$(LIBKMOD_REVISION):$(LIBKMOD_AGE) \
 	-Wl,--version-script=$(top_srcdir)/libkmod/libkmod.sym
+libkmod_libkmod_la_DEPENDENCIES = ${top_srcdir}/libkmod/libkmod.sym
+libkmod_libkmod_la_LIBADD = @zlib_libs@
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libkmod/libkmod.pc
+EXTRA_DIST += libkmod/libkmod.pc.in
+CLEANFILES += libkmod/libkmod.pc
 
 if BUILD_TOOLS
 bin_PROGRAMS = tools/kmod-insmod tools/kmod-rmmod tools/kmod-lsmod \
-	tools/kmod-modprobe
+	tools/kmod-modprobe tools/kmod-modinfo
 
 tools_kmod_insmod_LDADD = libkmod/libkmod.la
 tools_kmod_rmmod_LDADD = libkmod/libkmod.la
 tools_kmod_lsmod_LDADD = libkmod/libkmod.la
 tools_kmod_modprobe_LDADD = libkmod/libkmod.la
+tools_kmod_modinfo_LDADD = libkmod/libkmod.la
 endif
 
 TESTS = test/test-init test/test-loaded
 
 check_PROGRAMS = test/test-init test/test-loaded
-test_test_init_SOURCES = test/test-init.c
 test_test_init_LDADD = libkmod/libkmod.la
-
-test_test_loaded_SOURCES = test/test-loaded.c
 test_test_loaded_LDADD = libkmod/libkmod.la
 
 noinst_PROGRAMS = test/test-insmod test/test-rmmod test/test-rmmod2 \
@@ -73,26 +91,11 @@ noinst_PROGRAMS = test/test-insmod test/test-rmmod test/test-rmmod2 \
 		  test/test-blacklist \
 		  $(check_PROGRAMS)
 
-test_test_rmmod_SOURCES = test/test-rmmod.c
 test_test_rmmod_LDADD = libkmod/libkmod.la
-
-test_test_rmmod2_SOURCES = test/test-rmmod2.c
 test_test_rmmod2_LDADD = libkmod/libkmod.la
-
-test_test_insmod_SOURCES = test/test-insmod.c
 test_test_insmod_LDADD = libkmod/libkmod.la
-
-test_test_lookup_SOURCES = test/test-lookup.c
 test_test_lookup_LDADD = libkmod/libkmod.la
-
-test_test_path_from_name_SOURCES = test/test-path-from-name.c
 test_test_path_from_name_LDADD = libkmod/libkmod.la
-
-test_test_get_dependencies_SOURCES = test/test-get-dependencies.c
 test_test_get_dependencies_LDADD = libkmod/libkmod.la
-
-test_test_mod_double_ref_SOURCES = test/test-mod-double-ref.c
 test_test_mod_double_ref_LDADD = libkmod/libkmod.la
-
-test_test_blacklist_SOURCES = test/test-blacklist.c
 test_test_blacklist_LDADD = libkmod/libkmod.la