2009-08-31 Jim Evins <evins@snaught.com>

[glabels] / glabels2 / src / Makefile.am

diff --git a/glabels2/src/Makefile.am b/glabels2/src/Makefile.am
index ff5bb35e897c7f9b9f4a481be46603c03b62837c..da5c4de8373f4c8516470d8790cbc41f7b37cf84 100644 (file)
--- a/glabels2/src/Makefile.am
+++ b/glabels2/src/Makefile.am
@@ -1,7 +1,8 @@
 LIB_BARCODE_DIR = ../barcode-0.98
 LIB_IEC16022_DIR = ../iec16022-0.2.1
+LIB_QRENCODE_DIR = ../qrencode-3.1.0
 
-SUBDIRS= pixmaps stock-pixmaps mygal
+SUBDIRS= pixmaps stock-pixmaps
 
 bin_PROGRAMS = glabels glabels-batch
 
@@ -10,6 +11,7 @@ INCLUDES = \
        -I$(top_builddir)                                       \
        -I$(LIB_BARCODE_DIR)                                    \
        -I$(LIB_IEC16022_DIR)                                   \
+       -I$(LIB_QRENCODE_DIR)                                   \
        $(GLABELS_CFLAGS)                                       \
        $(DISABLE_DEPRECATED_CFLAGS)                            \
        -DPREFIX=\""$(prefix)"\"                                \
@@ -17,7 +19,7 @@ INCLUDES = \
        -DDATADIR=\""$(datadir)"\"                              \
        -DLIBDIR=\""$(libdir)"\"                                \
        -DGLABELS_LOCALEDIR=\""$(datadir)/locale"\"             \
-       -DGLABELS_GLADE_DIR=\""$(datadir)/glabels/glade/"\"     \
+       -DGLABELS_BUILDER_DIR=\""$(datadir)/glabels/builder/"\" \
        -DGLABELS_ICON_DIR=\""$(datadir)/pixmaps/"\"    \
        -DGLABELS_PIXMAP_DIR=\""$(datadir)/pixmaps/glabels/"\"  \
        -DG_LOG_DOMAIN=\""glabels\""
@@ -27,9 +29,9 @@ glabels_LDFLAGS = -export-dynamic
 glabels_LDADD =                                \
        $(GLABELS_LIBS)                         \
        ../libglabels/libglabels.la             \
-       mygal/libmygal.la                       \
        $(LIB_BARCODE_DIR)/libbarcode.la        \
-       $(LIB_IEC16022_DIR)/libiec16022.la
+       $(LIB_IEC16022_DIR)/libiec16022.la      \
+       $(LIB_QRENCODE_DIR)/libqrencode.la
 
 glabels_batch_LDFLAGS = -export-dynamic
 
@@ -37,7 +39,8 @@ glabels_batch_LDADD =                                 \
        $(GLABELS_LIBS)                         \
        ../libglabels/libglabels.la             \
        $(LIB_BARCODE_DIR)/libbarcode.la        \
-       $(LIB_IEC16022_DIR)/libiec16022.la
+       $(LIB_IEC16022_DIR)/libiec16022.la      \
+       $(LIB_QRENCODE_DIR)/libqrencode.la
 
 BUILT_SOURCES =                        \
        marshal.c                       \
@@ -122,6 +125,8 @@ glabels_SOURCES =                   \
        bc-postnet.h                    \
        bc-iec16022.c                   \
        bc-iec16022.h                   \
+       bc-iec18004.c                   \
+       bc-iec18004.h                   \
        label.c                         \
        label.h                         \
        label-object.c                  \
@@ -144,8 +149,6 @@ glabels_SOURCES =                   \
        xml-label-04.h                  \
        pixbuf-cache.c                  \
        pixbuf-cache.h                  \
-       base64.c                        \
-       base64.h                        \
        merge.c                         \
        merge.h                         \
        merge-init.c                    \
@@ -160,6 +163,8 @@ glabels_SOURCES =                   \
        text-node.h                     \
        mini-preview-pixbuf.c           \
        mini-preview-pixbuf.h           \
+       mini-preview-pixbuf-cache.c     \
+       mini-preview-pixbuf-cache.h     \
        wdgt-print-copies.c             \
        wdgt-print-copies.h             \
        wdgt-print-merge.c              \
@@ -172,6 +177,18 @@ glabels_SOURCES =                  \
        wdgt-rotate-label.h             \
        wdgt-chain-button.c             \
        wdgt-chain-button.h             \
+       wdgt-merge-menu.c               \
+       wdgt-merge-menu.h               \
+       color-combo.c                   \
+       color-combo.h                   \
+       color-combo-menu.c              \
+       color-combo-menu.h              \
+       color-combo-color-menu-item.c   \
+       color-combo-color-menu-item.h   \
+       color-combo-history.c           \
+       color-combo-history.h           \
+       color-swatch.c                  \
+       color-swatch.h                  \
        cairo-label-path.c              \
        cairo-label-path.h              \
        cairo-markup-path.c             \
@@ -201,6 +218,8 @@ glabels_batch_SOURCES =             \
        bc-postnet.h                    \
        bc-iec16022.c                   \
        bc-iec16022.h                   \
+       bc-iec18004.c                   \
+       bc-iec18004.h                   \
        label.c                         \
        label.h                         \
        label-object.c                  \
@@ -223,8 +242,6 @@ glabels_batch_SOURCES =             \
        xml-label-04.h                  \
        pixbuf-cache.c                  \
        pixbuf-cache.h                  \
-       base64.c                        \
-       base64.h                        \
        merge.c                         \
        merge.h                         \
        merge-init.c                    \
@@ -282,6 +299,9 @@ $(LIB_BARCODE_DIR)/libbarcode.la:
 $(LIB_IEC16022_DIR)/libiec16022.la:
        cd $(LIB_IEC16022_DIR); $(MAKE)
 
+$(LIB_QRENCODE_DIR)/libqrencode.la:
+       cd $(LIB_QRENCODE_DIR); $(MAKE)
+
 ../libglabels/libglabels.la:
        cd ../libglabels; $(MAKE)