* etc/Makefile.am: Leave everything to subdirs' Makefiles.

* etc/icons/Makefile.am: New file.
* etc/po/Makefile.am: New file.
* etc/styles/Makefile.am: New file.

diff --git a/etc/Makefile.am b/etc/Makefile.am
index 99cf0b3..ffb7083 100644 (file)
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,91 +1,11 @@
-ICONS = \
-       icons/back.xpm \
-       icons/ball.blank.xpm \
-       icons/ball.gray.xpm \
-       icons/ball.red.xpm \
-       icons/naruto.blank.xpm \
-       icons/naruto.gray.xpm \
-       icons/naruto.red.xpm \
-       icons/crypt.xpm \
-       icons/encrypt.xpm \
-       icons/forward.xpm \
-       icons/home.xpm \
-       icons/icons.gif \
-       icons/icons.xpm \
-       icons/liece-pointer.xbm \
-       icons/liece-pointer.xpm \
-       icons/key.xpm \
-       icons/location.xpm \
-       icons/pindown.xpm \
-       icons/print.xpm \
-       icons/reload.xpm \
-       icons/search.xpm \
-       icons/stop.xpm \
-       icons/balloon.xpm
-CATALOGS = po/ja.po
-STYLES = \
-       styles/bottom \
-       styles/middle \
-       styles/top
-TARGETS = $(ICONS) $(CATALOGS) $(STYLES)
+SUBDIRS = icons po styles
 
-if USE_PACKAGE
-icondir = $(packagedir)/etc/$(PACKAGE)/icons
-catalogdir = $(packagedir)/etc/$(PACKAGE)/po
-styledir = $(packagedir)/etc/$(PACKAGE)/styles
-else
-icondir = $(pkgdatadir)/icons
-catalogdir = $(pkgdatadir)/po
-styledir = $(pkgdatadir)/styles
-endif
+EXTRA_DIST = sample.dot.emacs.in
+DISTCLEANFILES = sample.dot.emacs
+pkgdata_DATA = sample.dot.emacs
+sample.dot.emacs: sample.dot.emacs.in
+       sed -e 's!@pkgdatadir@!$(pkgdatadir)!g' $< > $@
 
-disticondir = $(distdir)/icons
-distcatalogdir = $(distdir)/po
-diststyledir = $(distdir)/styles
-
-install-data-local: $(TARGETS)
-       for d in $(pkgdatadir) $(icondir) $(catalogdir) $(styledir); do \
-               $(top_srcdir)/mkinstalldirs $$d; \
-       done
-       @list="$(ICONS)"; for p in $$list; do \
-         if test -f $$p; then \
-           echo " $(INSTALL_DATA) $$p $(icondir)/"; \
-             $(INSTALL_DATA) $$p $(icondir)/; \
-          else :; fi; \
-        done
-       @list="$(CATALOGS)"; for p in $$list; do \
-         if test -f $$p; then \
-           echo " $(INSTALL_DATA) $$p $(catalogdir)/"; \
-             $(INSTALL_DATA) $$p $(catalogdir)/; \
-          else :; fi; \
-        done
-       @list="$(STYLES)"; for p in $$list; do \
-         if test -f $$p; then \
-           echo " $(INSTALL_DATA) $$p $(styledir)/"; \
-             $(INSTALL_DATA) $$p $(styledir)/; \
-          else :; fi; \
-        done
-
-dist-hook:
-       for d in $(distpkgdatadir) $(disticondir) $(distcatalogdir) \
-       $(diststyledir); do \
-               $(top_srcdir)/mkinstalldirs $$d; \
-       done
-       @list="$(ICONS)"; for p in $$list; do \
-         if test -f $$p; then \
-           echo " $(INSTALL_DATA) $$p $(disticondir)/"; \
-             $(INSTALL_DATA) $$p $(disticondir)/; \
-          else :; fi; \
-        done
-       @list="$(CATALOGS)"; for p in $$list; do \
-         if test -f $$p; then \
-           echo " $(INSTALL_DATA) $$p $(distcatalogdir)/"; \
-             $(INSTALL_DATA) $$p $(distcatalogdir)/; \
-          else :; fi; \
-        done
-       @list="$(STYLES)"; for p in $$list; do \
-         if test -f $$p; then \
-           echo " $(INSTALL_DATA) $$p $(diststyledir)/"; \
-             $(INSTALL_DATA) $$p $(diststyledir)/; \
-          else :; fi; \
-        done
+package:
+install-package: package
+       $(MAKE) pkgdatadir=$(PACKAGEDIR)/etc/$(PACKAGE) install

diff --git a/etc/icons/Makefile.am b/etc/icons/Makefile.am
new file mode 100644 (file)
index 0000000..3aeeba7
--- /dev/null
+++ b/etc/icons/Makefile.am
@@ -0,0 +1,3 @@
+icondir = $(pkgdatadir)/icons
+icon_DATA = $(wildcard *.xpm)
+EXTRA_DIST = $(icon_DATA)
\ No newline at end of file

diff --git a/etc/po/Makefile.am b/etc/po/Makefile.am
new file mode 100644 (file)
index 0000000..3077b4c
--- /dev/null
+++ b/etc/po/Makefile.am
@@ -0,0 +1,3 @@
+podir = $(pkgdatadir)/po
+po_DATA = $(wildcard *.po)
+EXTRA_DIST = $(po_DATA)
\ No newline at end of file

diff --git a/etc/styles/Makefile.am b/etc/styles/Makefile.am
new file mode 100644 (file)
index 0000000..dff3e4a
--- /dev/null
+++ b/etc/styles/Makefile.am
@@ -0,0 +1,3 @@
+styledir = $(pkgdatadir)/styles
+style_DATA = bottom top middle
+EXTRA_DIST = $(style_DATA)
\ No newline at end of file