From c0c0c27632d39e3a9e7d19a169956330d6e038a7 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf <behlendorf1@llnl.gov> Date: Tue, 10 Mar 2009 21:45:50 -0700 Subject: [PATCH] Build system and packaging (RPM support) (Part 3) Complete support for dist install srpm and rpm make targets. --- configure.ac | 1 - module/Makefile.in | 1 + module/zpios/Makefile.in | 3 --- module/zpios/include/Makefile.in | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 module/zpios/include/Makefile.in diff --git a/configure.ac b/configure.ac index 00962e2596..2903c36eda 100644 --- a/configure.ac +++ b/configure.ac @@ -76,7 +76,6 @@ AC_CONFIG_FILES([ module/zcommon/Makefile module/zfs/Makefile module/zpios/Makefile - module/zpios/include/Makefile scripts/Makefile scripts/zpool-config/Makefile scripts/zpios-test/Makefile diff --git a/module/Makefile.in b/module/Makefile.in index 2dfd043cb4..993b7fc3e9 100644 --- a/module/Makefile.in +++ b/module/Makefile.in @@ -3,6 +3,7 @@ subdir-m += nvpair subdir-m += unicode subdir-m += zcommon subdir-m += zfs +subdir-m += zpios modules clean: # Make the exported SPL symbols available to these modules. diff --git a/module/zpios/Makefile.in b/module/zpios/Makefile.in index c93e666da2..4924082a13 100644 --- a/module/zpios/Makefile.in +++ b/module/zpios/Makefile.in @@ -1,6 +1,3 @@ -subdir-m += include -DISTFILES = zpios.c - MODULE := zpios EXTRA_CFLAGS = -I@MODDIR@/zfs/include diff --git a/module/zpios/include/Makefile.in b/module/zpios/include/Makefile.in deleted file mode 100644 index 3aa71bfa19..0000000000 --- a/module/zpios/include/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -DISTFILES = zpios-ctl.h zpios-internal.h