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

[glabels] / glabels2 / src / Makefile.am

diff --git a/glabels2/src/Makefile.am b/glabels2/src/Makefile.am
index 7aea1936e9c151f680dc16661889ca19d67e12d0..7baaf2a1aa62a3e269c14fab0cc4c3a5e592582f 100644 (file)
--- a/glabels2/src/Makefile.am
+++ b/glabels2/src/Makefile.am
@@ -1,5 +1,6 @@
 LIB_BARCODE_DIR = ../barcode-0.98
 LIB_IEC16022_DIR = ../iec16022-0.2.1
+LIB_QRENCODE_DIR = ../qrencode-3.1.0
 
 SUBDIRS= pixmaps stock-pixmaps
 
@@ -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)"\"                                \
@@ -28,7 +30,8 @@ glabels_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
 
 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                       \
@@ -121,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                  \
@@ -165,22 +171,38 @@ glabels_SOURCES =                         \
        wdgt-print-merge.h              \
        wdgt-media-select.c             \
        wdgt-media-select.h             \
-       wdgt-mini-preview.c             \
-       wdgt-mini-preview.h             \
-       wdgt-rotate-label.c             \
-       wdgt-rotate-label.h             \
+       mini-preview.c                  \
+       mini-preview.h                  \
+       mini-label-preview.c            \
+       mini-label-preview.h            \
+       rotate-label-button.c           \
+       rotate-label-button.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-button.c            \
+       color-combo-button.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                  \
+       font-combo.c                    \
+       font-combo.h                    \
+       font-combo-menu.c               \
+       font-combo-menu.h               \
+       font-combo-menu-item.c          \
+       font-combo-menu-item.h          \
+       font-sample.c                   \
+       font-sample.h                   \
+       font-util.c                     \
+       font-util.h                     \
        cairo-label-path.c              \
        cairo-label-path.h              \
        cairo-markup-path.c             \
@@ -210,6 +232,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                  \
@@ -248,6 +272,8 @@ glabels_batch_SOURCES =             \
        prefs.h                         \
        prefs-model.c                   \
        prefs-model.h                   \
+       font-util.c                     \
+       font-util.h                     \
        util.c                          \
        util.h                          \
        color.c                         \
@@ -258,8 +284,8 @@ glabels_batch_SOURCES =             \
        wdgt-print-copies.h             \
        wdgt-print-merge.c              \
        wdgt-print-merge.h              \
-       wdgt-mini-preview.c             \
-       wdgt-mini-preview.h             \
+       mini-preview.c                  \
+       mini-preview.h                  \
        hig.h                           \
        cairo-label-path.c              \
        cairo-label-path.h              \
@@ -268,10 +294,10 @@ glabels_batch_SOURCES =           \
        $(BUILT_SOURCES)
 
 marshal.h: marshal.list $(GLIB_GENMARSHAL)
-       $(GLIB_GENMARSHAL) $< --header --prefix=gl_marshal > $@
+       $(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=gl_marshal > $@
 
 marshal.c: marshal.list $(GLIB_GENMARSHAL)
-       echo "#include \"marshal.h\"" > $@ && \
+       $(AM_V_GEN) echo "#include \"marshal.h\"" > $@ && \
        $(GLIB_GENMARSHAL) $< --body --prefix=gl_marshal >> $@
 
 EXTRA_DIST = \
@@ -289,6 +315,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)