[PATCH 2/3] fix handling of usb.ids.gz in the Makefile.am

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The usb.ids.gz file wasn't actually being added to data_DATA, it isn't
handled properly in the out-of-tree case, and there are methods for
declaring additional clean files without using hooks.

Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
---
 Makefile.am |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7c20acb..f1579a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,12 @@
 AM_LDFLAGS = \
 	-Wl,--as-needed
 
+DISTCLEANFILES = usb.ids.gz
+
 data_DATA = \
 	usb.ids
 if HAVE_ZLIB
-	usb.ids.gz
+data_DATA += usb.ids.gz
 endif
 
 sbin_PROGRAMS = \
@@ -31,11 +33,8 @@ dist_man_MANS = \
 EXTRA_DIST = \
 	usb.ids
 
-usb.ids.gz: usb.ids
-	gzip -c -9 usb.ids > usb.ids.gz
-
-clean-local:
-	rm -f usb.ids.gz
+usb.ids.gz: $(srcdir)/usb.ids
+	gzip -c -9 $< > $@
 
 distclean-local:
 	rm -rf autom4te.cache
-- 
1.6.2.3

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux