Imported Upstream version 3.0.0

[glabels] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b8bc8b35b10481b473a00702e9c6f4417801c06c..0aec6e1bdfeba6987aa0ed53e08c1a3f7069e0fe 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
-LIB_BARCODE_DIR = barcode-0.98
-LIB_IEC16022_DIR = iec16022-0.2.1
-
 SUBDIRS = \
        po \
-       $(LIB_BARCODE_DIR) \
-       $(LIB_IEC16022_DIR) \
        libglabels \
+       libglbarcode \
        src \
        data \
+       templates \
        help \
        docs
 
@@ -18,23 +15,25 @@ EXTRA_DIST = \
        COPYING.README_FIRST \
        COPYING \
        COPYING-DOCS \
-       COPYING-LIBGLABELS \
+       COPYING-LIBS \
+       COPYING-TEMPLATES \
        AUTHORS \
        ChangeLog \
-       ChangeLog.pre-2.2 \
        INSTALL \
        NEWS \
        TODO \
        intltool-extract.in \
        intltool-merge.in \
        intltool-update.in \
+       gnome-doc-utils.make \
        glabels.spec.in \
        glabels.spec
-       gnome-doc-utils.make
 
 DISTCLEANFILES = gnome-doc-utils.make
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
+DISTCHECK_CONFIGURE_FLAGS = \
+       --disable-scrollkeeper  \
+       --enable-gtk-doc
 
 dist-hook:
        @if test -d "$(srcdir)/.git"; \