Imported Upstream version 3.4.0

[glabels] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index e2001f0fab67987dc4348b2812071b2800179ae1..3e9857cc216a573bd52f23737d9dfc95991c140b 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -80,12 +90,11 @@ build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = glabels-3$(EXEEXT) glabels-3-batch$(EXEEXT)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-       $(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -121,12 +130,13 @@ am_glabels_3_OBJECTS = glabels.$(OBJEXT) warning-handler.$(OBJEXT) \
        label-object.$(OBJEXT) label-text.$(OBJEXT) \
        label-box.$(OBJEXT) label-line.$(OBJEXT) \
        label-ellipse.$(OBJEXT) label-image.$(OBJEXT) \
-       label-barcode.$(OBJEXT) pixbuf-util.$(OBJEXT) \
-       xml-label.$(OBJEXT) xml-label-04.$(OBJEXT) \
-       pixbuf-cache.$(OBJEXT) svg-cache.$(OBJEXT) merge.$(OBJEXT) \
-       merge-init.$(OBJEXT) merge-text.$(OBJEXT) \
-       merge-evolution.$(OBJEXT) merge-vcard.$(OBJEXT) \
-       text-node.$(OBJEXT) mini-preview-pixbuf.$(OBJEXT) \
+       label-barcode.$(OBJEXT) label-properties-dialog.$(OBJEXT) \
+       pixbuf-util.$(OBJEXT) xml-label.$(OBJEXT) \
+       xml-label-04.$(OBJEXT) pixbuf-cache.$(OBJEXT) \
+       svg-cache.$(OBJEXT) merge.$(OBJEXT) merge-init.$(OBJEXT) \
+       merge-text.$(OBJEXT) merge-evolution.$(OBJEXT) \
+       merge-vcard.$(OBJEXT) text-node.$(OBJEXT) \
+       mini-preview-pixbuf.$(OBJEXT) \
        mini-preview-pixbuf-cache.$(OBJEXT) media-select.$(OBJEXT) \
        message-bar.$(OBJEXT) template-history.$(OBJEXT) \
        template-history-model.$(OBJEXT) mini-preview.$(OBJEXT) \
@@ -266,6 +276,7 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -434,6 +445,8 @@ VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 XGETTEXT = @XGETTEXT@
 XMLLINT = @XMLLINT@
+YELP_LC_DIST = @YELP_LC_DIST@
+YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -638,6 +651,8 @@ glabels_3_SOURCES = \
        label-image.h                   \
        label-barcode.c                 \
        label-barcode.h                 \
+       label-properties-dialog.c       \
+       label-properties-dialog.h       \
        pixbuf-util.c                   \
        pixbuf-util.h                   \
        xml-label.c                     \
@@ -833,7 +848,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
        $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --gnu src/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
          *config.status*) \
@@ -954,6 +968,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/label-image.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/label-line.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/label-object.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/label-properties-dialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/label-text.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/label.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/marshal.Po@am__quote@
@@ -1327,6 +1342,8 @@ uninstall-am: uninstall-binPROGRAMS
        mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
        uninstall-am uninstall-binPROGRAMS
 
+.PRECIOUS: Makefile
+
 
 marshal.h: marshal.list $(GLIB_GENMARSHAL)
        $(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=gl_marshal > $@