[libgeotiff-dfsg] 01/06: Imported Upstream version 1.4.2~rc3

Bas Couwenberg sebastic at debian.org
Wed Aug 17 14:44:24 UTC 2016 

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository libgeotiff-dfsg.

commit c6f0acc5641c356f9de59762f53a46403d7b839d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Aug 17 16:27:21 2016 +0200

    Imported Upstream version 1.4.2~rc3
---
 ChangeLog   |  19 +++++++++++
 Makefile.am |   2 +-
 Makefile.in | 112 ++++++++++++++++++++++++------------------------------------
 3 files changed, 64 insertions(+), 69 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ac1d5b5..6946b01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,24 @@
 2016-08-16 Even Rouault <even dot rouault at spatialys dot com>
 
+	* Prepare for 1.4.2RC3
+
+2016-08-17 Howard Butler <howard at hobu.co>
+
+	* csv: update to EPSG v8.9
+
+2016-08-16 Even Rouault <even dot rouault at spatialys dot com>
+
+	* Makefile.am: add subdir-objects to AUTOMAKE_OPTIONS. Patch by
+	Bas Couwenberg (#80)
+
+2016-08-16 Even Rouault <even dot rouault at spatialys dot com>
+
+	* add autogen.sh in extradist
+	* run it on a newer system
+	* prepare for 1.4.2RC2
+
+2016-08-16 Even Rouault <even dot rouault at spatialys dot com>
+
     * make dist: include files in docs/ directory (#78)
 
 2016-08-16 Even Rouault <even dot rouault at spatialys dot com>
diff --git a/Makefile.am b/Makefile.am
index 688d70c..805bd81 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = libxtiff . bin man cmake
 
-AUTOMAKE_OPTIONS =	dist-zip
+AUTOMAKE_OPTIONS = dist-zip subdir-objects
 ACLOCAL_AMFLAGS = -I m4
 
 include $(top_srcdir)/m4/doxygen.am
diff --git a/Makefile.in b/Makefile.in
index 726b69f..6f4323c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -177,9 +177,11 @@ am__libgeotiff_la_SOURCES_DIST = cpl_serv.c cpl_csv.c geo_extra.c \
 	geo_write.c geo_strtod.c geotiff_proj4.c csv/datum.c \
 	csv/ellipsoid.c csv/gcs.c csv/pcs.c csv/prime_meridian.c \
 	csv/projop_wparm.c csv/unit_of_measure.c
- at CSV_IS_CONFIG_TRUE@am__objects_1 = datum.lo ellipsoid.lo gcs.lo \
- at CSV_IS_CONFIG_TRUE@	pcs.lo prime_meridian.lo projop_wparm.lo \
- at CSV_IS_CONFIG_TRUE@	unit_of_measure.lo
+am__dirstamp = $(am__leading_dot)dirstamp
+ at CSV_IS_CONFIG_TRUE@am__objects_1 = csv/datum.lo csv/ellipsoid.lo \
+ at CSV_IS_CONFIG_TRUE@	csv/gcs.lo csv/pcs.lo \
+ at CSV_IS_CONFIG_TRUE@	csv/prime_meridian.lo csv/projop_wparm.lo \
+ at CSV_IS_CONFIG_TRUE@	csv/unit_of_measure.lo
 am_libgeotiff_la_OBJECTS = cpl_serv.lo cpl_csv.lo geo_extra.lo \
 	geo_free.lo geo_get.lo geo_names.lo geo_new.lo \
 	geo_normalize.lo geo_print.lo geo_set.lo geo_simpletags.lo \
@@ -471,7 +473,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = libxtiff . bin man cmake
-AUTOMAKE_OPTIONS = dist-zip
+AUTOMAKE_OPTIONS = dist-zip subdir-objects
 ACLOCAL_AMFLAGS = -I m4
 @DX_COND_doc_TRUE@@DX_COND_html_TRUE at DX_CLEAN_HTML = @DX_DOCDIR@/html
 @DX_COND_chm_TRUE@@DX_COND_doc_TRUE at DX_CLEAN_CHM = @DX_DOCDIR@/chm
@@ -676,21 +678,35 @@ clean-libLTLIBRARIES:
 	  echo rm -f $${locs}; \
 	  rm -f $${locs}; \
 	}
+csv/$(am__dirstamp):
+	@$(MKDIR_P) csv
+	@: > csv/$(am__dirstamp)
+csv/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) csv/$(DEPDIR)
+	@: > csv/$(DEPDIR)/$(am__dirstamp)
+csv/datum.lo: csv/$(am__dirstamp) csv/$(DEPDIR)/$(am__dirstamp)
+csv/ellipsoid.lo: csv/$(am__dirstamp) csv/$(DEPDIR)/$(am__dirstamp)
+csv/gcs.lo: csv/$(am__dirstamp) csv/$(DEPDIR)/$(am__dirstamp)
+csv/pcs.lo: csv/$(am__dirstamp) csv/$(DEPDIR)/$(am__dirstamp)
+csv/prime_meridian.lo: csv/$(am__dirstamp) \
+	csv/$(DEPDIR)/$(am__dirstamp)
+csv/projop_wparm.lo: csv/$(am__dirstamp) csv/$(DEPDIR)/$(am__dirstamp)
+csv/unit_of_measure.lo: csv/$(am__dirstamp) \
+	csv/$(DEPDIR)/$(am__dirstamp)
 
 libgeotiff.la: $(libgeotiff_la_OBJECTS) $(libgeotiff_la_DEPENDENCIES) $(EXTRA_libgeotiff_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libgeotiff_la_LINK) -rpath $(libdir) $(libgeotiff_la_OBJECTS) $(libgeotiff_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
+	-rm -f csv/*.$(OBJEXT)
+	-rm -f csv/*.lo
 
 distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cpl_csv.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cpl_serv.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/datum.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ellipsoid.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gcs.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/geo_extra.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/geo_free.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/geo_get.Plo at am__quote@
@@ -705,86 +721,44 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/geo_trans.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/geo_write.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/geotiff_proj4.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pcs.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/prime_meridian.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/projop_wparm.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/unit_of_measure.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at csv/$(DEPDIR)/datum.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at csv/$(DEPDIR)/ellipsoid.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at csv/$(DEPDIR)/gcs.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at csv/$(DEPDIR)/pcs.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at csv/$(DEPDIR)/prime_meridian.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at csv/$(DEPDIR)/projop_wparm.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at csv/$(DEPDIR)/unit_of_measure.Plo at am__quote@
 
 .c.o:
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ at am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-datum.lo: csv/datum.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT datum.lo -MD -MP -MF $(DEPDIR)/datum.Tpo -c -o datum.lo `test -f 'csv/datum.c' || echo '$(srcdir)/'`csv/datum.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/datum.Tpo $(DEPDIR)/datum.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='csv/datum.c' object='datum.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o datum.lo `test -f 'csv/datum.c' || echo '$(srcdir)/'`csv/datum.c
-
-ellipsoid.lo: csv/ellipsoid.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ellipsoid.lo -MD -MP -MF $(DEPDIR)/ellipsoid.Tpo -c -o ellipsoid.lo `test -f 'csv/ellipsoid.c' || echo '$(srcdir)/'`csv/ellipsoid.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ellipsoid.Tpo $(DEPDIR)/ellipsoid.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='csv/ellipsoid.c' object='ellipsoid.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ellipsoid.lo `test -f 'csv/ellipsoid.c' || echo '$(srcdir)/'`csv/ellipsoid.c
-
-gcs.lo: csv/gcs.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gcs.lo -MD -MP -MF $(DEPDIR)/gcs.Tpo -c -o gcs.lo `test -f 'csv/gcs.c' || echo '$(srcdir)/'`csv/gcs.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gcs.Tpo $(DEPDIR)/gcs.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='csv/gcs.c' object='gcs.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gcs.lo `test -f 'csv/gcs.c' || echo '$(srcdir)/'`csv/gcs.c
-
-pcs.lo: csv/pcs.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pcs.lo -MD -MP -MF $(DEPDIR)/pcs.Tpo -c -o pcs.lo `test -f 'csv/pcs.c' || echo '$(srcdir)/'`csv/pcs.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcs.Tpo $(DEPDIR)/pcs.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='csv/pcs.c' object='pcs.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pcs.lo `test -f 'csv/pcs.c' || echo '$(srcdir)/'`csv/pcs.c
-
-prime_meridian.lo: csv/prime_meridian.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT prime_meridian.lo -MD -MP -MF $(DEPDIR)/prime_meridian.Tpo -c -o prime_meridian.lo `test -f 'csv/prime_meridian.c' || echo '$(srcdir)/'`csv/prime_meridian.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/prime_meridian.Tpo $(DEPDIR)/prime_meridian.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='csv/prime_meridian.c' object='prime_meridian.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o prime_meridian.lo `test -f 'csv/prime_meridian.c' || echo '$(srcdir)/'`csv/prime_meridian.c
-
-projop_wparm.lo: csv/projop_wparm.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT projop_wparm.lo -MD -MP -MF $(DEPDIR)/projop_wparm.Tpo -c -o projop_wparm.lo `test -f 'csv/projop_wparm.c' || echo '$(srcdir)/'`csv/projop_wparm.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/projop_wparm.Tpo $(DEPDIR)/projop_wparm.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='csv/projop_wparm.c' object='projop_wparm.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o projop_wparm.lo `test -f 'csv/projop_wparm.c' || echo '$(srcdir)/'`csv/projop_wparm.c
-
-unit_of_measure.lo: csv/unit_of_measure.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unit_of_measure.lo -MD -MP -MF $(DEPDIR)/unit_of_measure.Tpo -c -o unit_of_measure.lo `test -f 'csv/unit_of_measure.c' || echo '$(srcdir)/'`csv/unit_of_measure.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unit_of_measure.Tpo $(DEPDIR)/unit_of_measure.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='csv/unit_of_measure.c' object='unit_of_measure.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unit_of_measure.lo `test -f 'csv/unit_of_measure.c' || echo '$(srcdir)/'`csv/unit_of_measure.c
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
+	-rm -rf csv/.libs csv/_libs
 
 distclean-libtool:
 	-rm -f libtool config.lt
@@ -1159,6 +1133,8 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f csv/$(DEPDIR)/$(am__dirstamp)
+	-rm -f csv/$(am__dirstamp)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -1170,7 +1146,7 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR)
+	-rm -rf ./$(DEPDIR) csv/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-libtool distclean-tags
@@ -1218,7 +1194,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR)
+	-rm -rf ./$(DEPDIR) csv/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libgeotiff-dfsg.git

More information about the Pkg-grass-devel mailing list