diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2006-07-07 17:34:58 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2006-07-07 17:34:58 +0000 |
| commit | 1908328c49a62b1a57297f4ecc66f8ff0e48afeb (patch) | |
| tree | 0ed945b3f482f0fd39e6b57a4549f6e908075523 /nad | |
| parent | 8e3d98cb689bea1d0418351f0d30ed89e2d5fe50 (diff) | |
| download | PROJ-1908328c49a62b1a57297f4ecc66f8ff0e48afeb.tar.gz PROJ-1908328c49a62b1a57297f4ecc66f8ff0e48afeb.zip | |
autotools update, added .extra init files
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1339 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'nad')
| -rw-r--r-- | nad/Makefile.in | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/nad/Makefile.in b/nad/Makefile.in index 619ed3bf..cf801d50 100644 --- a/nad/Makefile.in +++ b/nad/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.8.3 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -34,6 +34,7 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ subdir = nad DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in @@ -46,6 +47,12 @@ CONFIG_HEADER = $(top_builddir)/src/proj_config.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(pkgdatadir)" pkgdataDATA_INSTALL = $(INSTALL_DATA) DATA = $(pkgdata_DATA) @@ -120,6 +127,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -148,10 +157,13 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -pkgdata_DATA = GL27 nad.lst nad27 nad83 proj_def.dat world epsg esri +pkgdata_DATA = GL27 nad.lst nad27 nad83 proj_def.dat world epsg esri \ + esri.extra other.extra + EXTRA_DIST = GL27 nad.lst nad27 nad83 pj_out27.dist pj_out83.dist td_out.dist \ proj_def.dat test27 test83 world epsg esri \ - testvarious testntv2 ntv2_out.dist + testvarious testntv2 ntv2_out.dist \ + esri.extra other.extra all: all-am @@ -200,7 +212,7 @@ install-pkgdataDATA: $(pkgdata_DATA) test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)" @list='$(pkgdata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ + f=$(am__strip_dir) \ echo " $(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \ $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ done @@ -208,7 +220,7 @@ install-pkgdataDATA: $(pkgdata_DATA) uninstall-pkgdataDATA: @$(NORMAL_UNINSTALL) @list='$(pkgdata_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ + f=$(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \ rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \ done @@ -272,7 +284,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" |