Finnish translation update

[glabels] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 57d4750b338725bf139649bac7aeff01cd3fa267..e63f32d983b5f6af4fe703d3a2582235280fef3f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,17 @@
 
-SUBDIRS= ../libglabels pixmaps stock-pixmaps
+SUBDIRS= \
+       pixmaps \
+       cursors
 
 bin_PROGRAMS = glabels-3 glabels-3-batch
 
 INCLUDES = \
+       -I$(top_srcdir)                                         \
+       -I$(top_builddir)                                       \
+       -I$(top_srcdir)/libglabels                              \
        -I$(top_builddir)/libglabels                            \
+       -I$(top_srcdir)/libglbarcode                            \
+       -I$(top_builddir)/libglbarcode                          \
        $(GLABELS_CFLAGS)                                       \
        $(LIBEBOOK_CFLAGS)                                      \
        $(LIBBARCODE_CFLAGS)                                    \
@@ -12,10 +19,9 @@ INCLUDES = \
        $(LIBQRENCODE_CFLAGS)                                   \
        $(LIBIEC16022_CFLAGS)                                   \
        $(DISABLE_DEPRECATED_CFLAGS)                            \
-       -DGLABELS_LOCALEDIR=\""$(datadir)/locale"\"             \
-       -DGLABELS_ICON_DIR=\""$(datadir)/pixmaps"\"             \
-       -DGLABELS_ICON=\""$(GLABELS_BRANCH).png"\"              \
+       -DGLABELS_LOCALE_DIR=\""$(datadir)/locale"\"            \
        -DGLABELS_DATA_DIR=\""$(datadir)/$(GLABELS_BRANCH)"\"   \
+       -DGLABELS_ICON_NAME=\""$(GLABELS_BRANCH)\""             \
        -DG_LOG_DOMAIN=\""glabels\""
 
 glabels_3_LDFLAGS = -export-dynamic
@@ -23,6 +29,7 @@ glabels_3_LDFLAGS = -export-dynamic
 glabels_3_LDADD =                              \
        $(GLABELS_LIBS)                         \
        ../libglabels/$(LIBGLABELS_BRANCH).la   \
+       ../libglbarcode/$(LIBGLBARCODE_BRANCH).la       \
        $(LIBEBOOK_LIBS)                        \
        $(LIBBARCODE_LIBS)                      \
        $(LIBZINT_LIBS)                         \
@@ -35,6 +42,7 @@ glabels_3_batch_LDFLAGS = -export-dynamic
 glabels_3_batch_LDADD =                        \
        $(GLABELS_LIBS)                         \
        ../libglabels/$(LIBGLABELS_BRANCH).la   \
+       ../libglbarcode/$(LIBGLBARCODE_BRANCH).la       \
        $(LIBEBOOK_LIBS)                        \
        $(LIBBARCODE_LIBS)                      \
        $(LIBZINT_LIBS)                         \
@@ -54,8 +62,6 @@ glabels_3_SOURCES =                   \
        critical-error-handler.h        \
        window.c                        \
        window.h                        \
-       stock.c                         \
-       stock.h                         \
        ui.h                            \
        ui.c                            \
        ui-util.h                       \
@@ -80,7 +86,6 @@ glabels_3_SOURCES =                   \
        prefs-model.h                   \
        prefs-dialog.c                  \
        prefs-dialog.h                  \
-       hig.h                           \
        view.c                          \
        view.h                          \
        view-box.c                      \
@@ -119,16 +124,14 @@ glabels_3_SOURCES =                       \
        print-op-dialog.h               \
        template-designer.c             \
        template-designer.h             \
-       bc.c                            \
-       bc.h                            \
        bc-backends.c                   \
        bc-backends.h                   \
+       bc-builtin.c                    \
+       bc-builtin.h                    \
        bc-gnubarcode.c                 \
        bc-gnubarcode.h                 \
        bc-zint.c                       \
        bc-zint.h                       \
-       bc-postnet.c                    \
-       bc-postnet.h                    \
        bc-iec16022.c                   \
        bc-iec16022.h                   \
        bc-iec18004.c                   \
@@ -248,16 +251,14 @@ glabels_3_batch_SOURCES =                 \
        print.h                         \
        print-op.c                      \
        print-op.h                      \
-       bc.c                            \
-       bc.h                            \
        bc-backends.c                   \
        bc-backends.h                   \
+       bc-builtin.c                    \
+       bc-builtin.h                    \
        bc-gnubarcode.c                 \
        bc-gnubarcode.h                 \
        bc-zint.c                       \
        bc-zint.h                       \
-       bc-postnet.c                    \
-       bc-postnet.h                    \
        bc-iec16022.c                   \
        bc-iec16022.h                   \
        bc-iec18004.c                   \
@@ -320,7 +321,6 @@ glabels_3_batch_SOURCES =           \
        color.h                         \
        debug.c                         \
        debug.h                         \
-       hig.h                           \
        cairo-label-path.c              \
        cairo-label-path.h              \
        cairo-ellipse-path.c            \
@@ -339,8 +339,11 @@ EXTRA_DIST = \
 
 CLEANFILES = $(BUILT_SOURCES)
 
-$(bin_PROGRAMS): ../libglabels/$(LIBGLABELS_BRANCH).la
+$(bin_PROGRAMS): ../libglabels/$(LIBGLABELS_BRANCH).la ../libglbarcode/$(LIBGLBARCODE_BRANCH).la
 
 ../libglabels/$(LIBGLABELS_BRANCH).la:
        cd ../libglabels; $(MAKE)
 
+../libglbarcode/$(LIBGLBARCODE_BRANCH).la:
+       cd ../libglbarcode; $(MAKE)
+