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 4a11700ac8f46ce241cda83480160a34d33650f4..da5c4de8373f4c8516470d8790cbc41f7b37cf84 100644 (file)
--- a/glabels2/src/Makefile.am
+++ b/glabels2/src/Makefile.am
@@ -1,34 +1,37 @@
 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 recent-files
+SUBDIRS= pixmaps stock-pixmaps
 
 bin_PROGRAMS = glabels glabels-batch
 
 INCLUDES = \
        -I$(top_srcdir)                                         \
        -I$(top_builddir)                                       \
-       $(GLABELS_CFLAGS)                                       \
        -I$(LIB_BARCODE_DIR)                                    \
        -I$(LIB_IEC16022_DIR)                                   \
+       -I$(LIB_QRENCODE_DIR)                                   \
+       $(GLABELS_CFLAGS)                                       \
+       $(DISABLE_DEPRECATED_CFLAGS)                            \
        -DPREFIX=\""$(prefix)"\"                                \
        -DSYSCONFDIR=\""$(sysconfdir)"\"                        \
        -DDATADIR=\""$(datadir)"\"                              \
        -DLIBDIR=\""$(libdir)"\"                                \
        -DGLABELS_LOCALEDIR=\""$(datadir)/locale"\"             \
-       -DGLABELS_GLADE_DIR=\""$(datadir)/glabels/glade/"\"     \
-       -DG_LOG_DOMAIN=\""glabels\""                            \
-       $(DISABLE_DEPRECATED_CFLAGS)
+       -DGLABELS_BUILDER_DIR=\""$(datadir)/glabels/builder/"\" \
+       -DGLABELS_ICON_DIR=\""$(datadir)/pixmaps/"\"    \
+       -DGLABELS_PIXMAP_DIR=\""$(datadir)/pixmaps/glabels/"\"  \
+       -DG_LOG_DOMAIN=\""glabels\""
 
 glabels_LDFLAGS = -export-dynamic
 
 glabels_LDADD =                                \
        $(GLABELS_LIBS)                         \
        ../libglabels/libglabels.la             \
-       mygal/libmygal.la                       \
-       recent-files/librecent.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
 
@@ -36,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                       \
@@ -44,8 +48,6 @@ BUILT_SOURCES =                       \
 
 glabels_SOURCES =                      \
        glabels.c                       \
-       splash.c                        \
-       splash.h                        \
        warning-handler.c               \
        warning-handler.h               \
        critical-error-handler.c        \
@@ -76,7 +78,6 @@ glabels_SOURCES =                     \
        prefs-model.h                   \
        prefs-dialog.c                  \
        prefs-dialog.h                  \
-       hig.c                           \
        hig.h                           \
        view.c                          \
        view.h                          \
@@ -94,8 +95,6 @@ glabels_SOURCES =                     \
        view-text.h                     \
        view-barcode.c                  \
        view-barcode.h                  \
-       view-highlight.c                \
-       view-highlight.h                \
        merge-properties-dialog.c       \
        merge-properties-dialog.h       \
        object-editor.c                 \
@@ -114,8 +113,8 @@ glabels_SOURCES =                   \
        object-editor-shadow-page.c     \
        print.c                         \
        print.h                         \
-       print-dialog.c                  \
-       print-dialog.h                  \
+       print-op.c                      \
+       print-op.h                      \
        template-designer.c             \
        template-designer.h             \
        bc.c                            \
@@ -126,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                  \
@@ -146,12 +147,8 @@ glabels_SOURCES =                  \
        xml-label.h                     \
        xml-label-04.c                  \
        xml-label-04.h                  \
-       xml-label-191.c                 \
-       xml-label-191.h                 \
        pixbuf-cache.c                  \
        pixbuf-cache.h                  \
-       base64.c                        \
-       base64.h                        \
        merge.c                         \
        merge.h                         \
        merge-init.c                    \
@@ -166,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              \
@@ -178,20 +177,39 @@ 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             \
+       cairo-markup-path.h             \
+       cairo-ellipse-path.c            \
+       cairo-ellipse-path.h            \
        util.c                          \
        util.h                          \
        color.c                         \
        color.h                         \
-       canvas-hacktext.c               \
-       canvas-hacktext.h               \
        debug.c                         \
        debug.h                         \
        $(BUILT_SOURCES)
 
+
 glabels_batch_SOURCES =                \
        glabels-batch.c                 \
        print.c                         \
        print.h                         \
+       print-op.c                      \
+       print-op.h                      \
        bc.c                            \
        bc.h                            \
        bc-gnubarcode.c                 \
@@ -200,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                  \
@@ -220,12 +240,8 @@ glabels_batch_SOURCES =            \
        xml-label.h                     \
        xml-label-04.c                  \
        xml-label-04.h                  \
-       xml-label-191.c                 \
-       xml-label-191.h                 \
        pixbuf-cache.c                  \
        pixbuf-cache.h                  \
-       base64.c                        \
-       base64.h                        \
        merge.c                         \
        merge.h                         \
        merge-init.c                    \
@@ -248,6 +264,17 @@ glabels_batch_SOURCES =            \
        color.h                         \
        debug.c                         \
        debug.h                         \
+       wdgt-print-copies.c             \
+       wdgt-print-copies.h             \
+       wdgt-print-merge.c              \
+       wdgt-print-merge.h              \
+       wdgt-mini-preview.c             \
+       wdgt-mini-preview.h             \
+       hig.h                           \
+       cairo-label-path.c              \
+       cairo-label-path.h              \
+       cairo-ellipse-path.c            \
+       cairo-ellipse-path.h            \
        $(BUILT_SOURCES)
 
 marshal.h: marshal.list $(GLIB_GENMARSHAL)
@@ -272,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)