2009-09-22 Jim Evins <evins@snaught.com>

[glabels] / glabels2 / Makefile.am

diff --git a/glabels2/Makefile.am b/glabels2/Makefile.am
index 415edfe8173f37be04fc4b34c80ba0c1f94fc771..ade9f9c237c21ebdcf1feea07e39186bcbb0ed5c 100644 (file)
--- a/glabels2/Makefile.am
+++ b/glabels2/Makefile.am
@@ -1,12 +1,29 @@
 ## Process this file with automake to produce Makefile.in
 
 LIB_BARCODE_DIR = barcode-0.98
+LIB_IEC16022_DIR = iec16022-0.2.1
+LIB_QRENCODE_DIR = qrencode-3.1.0
 
-SUBDIRS = po src data pixmaps doc
+#distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper
+
+SUBDIRS = \
+       po \
+       $(LIB_BARCODE_DIR) \
+       $(LIB_IEC16022_DIR) \
+       $(LIB_QRENCODE_DIR) \
+       libglabels \
+       src \
+       data \
+       templates \
+       help \
+       docs
 
 EXTRA_DIST = \
        README \
        COPYING \
+       COPYING-DOCS \
+       COPYING-LIBGLABELS \
+       COPYING-TEMPLATES \
        AUTHORS \
        ChangeLog \
        INSTALL \
@@ -15,14 +32,12 @@ EXTRA_DIST = \
        intltool-extract.in \
        intltool-merge.in \
        intltool-update.in \
+       gnome-doc-utils.make \
        glabels.spec.in \
-       glabels.spec
+       glabels.spec \
+       MESSAGE-OF-DOOM
+
+DISTCLEANFILES = gnome-doc-utils.make
+
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
 
-dist-hook:
-       if test -d $(LIB_BARCODE_DIR); then \
-         if test -f $(LIB_BARCODE_DIR)/Makefile; then \
-           (cd $(LIB_BARCODE_DIR); $(MAKE) distclean); \
-         fi; \
-         mkdir $(distdir)/$(LIB_BARCODE_DIR); \
-         cp -rp $(LIB_BARCODE_DIR)/* $(distdir)/$(LIB_BARCODE_DIR); \
-       fi