Update build-system for the new sample/ directory.

diff --git a/Makefile.am b/Makefile.am
index 7afd8478f34cbb80d26480083bcccb2400e68906..f3fcedf940c6dfbde36afa94584d527a752232df 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,9 @@
-rcdir = $(sysconfdir)/xdg/$(PACKAGE_NAME)
-
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = doc src
+SUBDIRS = doc sample src
 dist_doc_DATA = AUTHORS ChangeLog NEWS README
 EXTRA_DIST = autogen.sh README.source
 
-dist_rc_DATA = tint2rc
-
-if INSTALL_EXAMPLES
-examplesdir = $(docdir)/examples
-dist_examples_DATA = tintrc01 tintrc02 tintrc03 tintrc04 tintrc05 tintrc06
-else
-examplesdir =
-dist_examples_DATA =
-endif
-
 dist_pkgdata_DATA = default_icon.png
 
 DISTCLEANFILES += configure depcomp config.guess config.sub config.h.in config.h.in~ ltmain.sh missing aclocal.m4 install-sh INSTALL

diff --git a/configure.ac b/configure.ac
index 6426970efe77a379e6a2a69635b4b6de067c909e..c6276c8fab66bd06fe0e78d855e349c425b553de 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -144,6 +144,7 @@ AC_SUBST(DISTCLEANFILES)
 
 AC_CONFIG_FILES([Makefile
                                 doc/Makefile
+                                sample/Makefile
                                 src/Makefile
                                 src/tint2conf/Makefile])
 

diff --git a/sample/Makefile.am b/sample/Makefile.am
new file mode 100644 (file)
index 0000000..3049e8a
--- /dev/null
+++ b/sample/Makefile.am
@@ -0,0 +1,17 @@
+rcdir = $(sysconfdir)/xdg/$(PACKAGE_NAME)
+
+dist_rc_DATA = tint2rc
+
+if INSTALL_EXAMPLES
+examplesdir = $(docdir)/examples
+dist_examples_DATA = default.tint2rc \
+                                        vertical_icon_only.tint2rc \
+                                        rounded_multi_desktop.tint2rc \
+                                        black_single_desktop.tint2rc \
+                                        horizontal_icon_only.tint2rc \
+                                        white_single_desktop.tint2rc
+else
+examplesdir =
+dist_examples_DATA =
+endif
+