diff options
| author | Martin Pitt <martin@piware.de> | 2018-08-15 14:42:55 +0200 |
|---|---|---|
| committer | Martin Pitt <martin@piware.de> | 2018-08-15 15:00:16 +0200 |
| commit | 41f177edeb66fc1d96c8c2f886e6851d6fe32cd8 (patch) | |
| tree | 67340eea45a53854571b939d82f8fa33d1b38119 | |
| parent | b18c8ae9de77a3911bca4fb7c996419639718c4a (diff) | |
Drop Makefile.am in subdirectories
| -rw-r--r-- | Makefile.am | 32 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | media-players/Makefile.am | 22 | ||||
| -rw-r--r-- | tools/Makefile.am | 1 |
4 files changed, 33 insertions, 29 deletions
diff --git a/Makefile.am b/Makefile.am index 83ad1f3..bb64de2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,2 +1,32 @@ -SUBDIRS=media-players tools DISTCHECK_CONFIGURE_FLAGS = --with-udevdir='$${libdir}/udev-distcheck' + +mpidir = $(datadir)/media-player-info +dist_mpi_DATA = $(shell find $(top_srcdir)/media-players -name "*.mpi" -printf "%p\n" | LC_ALL=C sort) + +udevrulesdir = $(UDEV_DIR)/rules.d +nodist_udevrules_DATA = 40-usb-media-players.rules + +40-usb-media-players.rules: $(dist_mpi_DATA) $(top_srcdir)/tools/mpi2udev.py +if HAVE_HWDB + $(top_srcdir)/tools/mpi2udev.py hwdb $(dist_mpi_DATA) > 40-usb-media-players.rules +else + $(top_srcdir)/tools/mpi2udev.py udev $(dist_mpi_DATA) > 40-usb-media-players.rules +endif + $(top_srcdir)/tools/udev-syntax-check.py 40-usb-media-players.rules + +if HAVE_HWDB +udevhwdbdir = $(UDEV_DIR)/hwdb.d +nodist_udevhwdb_DATA = 20-usb-media-players.hwdb + +20-usb-media-players.hwdb: $(dist_mpi_DATA) $(top_srcdir)/tools/mpi2hwdb.py + $(top_srcdir)/tools/mpi2hwdb.py $(dist_mpi_DATA) > 20-usb-media-players.hwdb +endif + +clean-local: + rm -f 40-usb-media-players.rules 20-usb-media-players.hwdb + +EXTRA_DIST = \ + tools/COPYING \ + tools/mpi2udev.py \ + tools/mpi2hwdb.py \ + tools/udev-syntax-check.py diff --git a/configure.ac b/configure.ac index dc9835c..1040b94 100644 --- a/configure.ac +++ b/configure.ac @@ -22,9 +22,6 @@ fi AC_MSG_NOTICE([installing udev rules in ${ac_with_udevdir}/rules.d]) AC_SUBST([UDEV_DIR],[${ac_with_udevdir}]) -AC_OUTPUT([ -Makefile -tools/Makefile -media-players/Makefile -]) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/media-players/Makefile.am b/media-players/Makefile.am deleted file mode 100644 index 09b7083..0000000 --- a/media-players/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -mpidir = $(datadir)/media-player-info -dist_mpi_DATA = $(shell find $(top_srcdir)/media-players -name "*.mpi" -printf "%p\n" | LC_ALL=C sort) - -udevrulesdir = $(UDEV_DIR)/rules.d -nodist_udevrules_DATA = 40-usb-media-players.rules -40-usb-media-players.rules: $(dist_mpi_DATA) $(top_srcdir)/tools/mpi2udev.py -if HAVE_HWDB - $(top_srcdir)/tools/mpi2udev.py hwdb $(dist_mpi_DATA) > 40-usb-media-players.rules -else - $(top_srcdir)/tools/mpi2udev.py udev $(dist_mpi_DATA) > 40-usb-media-players.rules -endif - $(top_srcdir)/tools/udev-syntax-check.py 40-usb-media-players.rules - -if HAVE_HWDB -udevhwdbdir = $(UDEV_DIR)/hwdb.d -nodist_udevhwdb_DATA = 20-usb-media-players.hwdb -20-usb-media-players.hwdb: $(dist_mpi_DATA) $(top_srcdir)/tools/mpi2hwdb.py - $(top_srcdir)/tools/mpi2hwdb.py $(dist_mpi_DATA) > 20-usb-media-players.hwdb -endif - -clean-local: - rm -f 40-usb-media-players.rules 20-usb-media-players.hwdb diff --git a/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index d9a0da5..0000000 --- a/tools/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = COPYING mpi2udev.py mpi2hwdb.py udev-syntax-check.py |