Finnish translation update

[glabels] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index aac2b7ef1f522319a0c1f1d369e39018f4f6dc56..e63f32d983b5f6af4fe703d3a2582235280fef3f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,17 @@
 
-SUBDIRS= ../libglabels 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)                                    \
@@ -22,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)                         \
@@ -34,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)                         \
@@ -115,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                   \
@@ -244,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                   \
@@ -334,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)
+