diff --git a/Makefile.am b/Makefile.am index fd5d0574..5f573456 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,6 +23,8 @@ # Process this file with automake to produce Makefile.in. +AUTOMAKE_OPTIONS = foreign dist-zip + EXTRA_DIST = \ COPYRIGHT \ ChangeLog \ diff --git a/Makefile.in b/Makefile.in index 7f745b76..44324159 100644 --- a/Makefile.in +++ b/Makefile.in @@ -91,7 +91,7 @@ am__remove_distdir = \ { test ! -d $(distdir) \ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).zip GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print @@ -201,6 +201,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ +AUTOMAKE_OPTIONS = foreign dist-zip EXTRA_DIST = \ COPYRIGHT \ ChangeLog \ @@ -439,7 +440,6 @@ dist-tarZ: distdir dist-shar: distdir shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__remove_distdir) - dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) @@ -447,6 +447,8 @@ dist-zip: distdir dist dist-all: distdir $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then diff --git a/tools/Makefile.am b/tools/Makefile.am index 8a1d448c..f35e33a8 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -23,8 +23,8 @@ # Process this file with automake to produce Makefile.in. -LIBPORT = $(top_builddir)/port/libport.a -LIBTIFF = $(top_builddir)/libtiff/libtiff.la +LIBPORT = -L$(top_builddir)/port -lport +LIBTIFF = -L$(top_builddir)/libtiff -ltiff EXTRA_DIST = Makefile.vc @@ -52,7 +52,6 @@ bin_PROGRAMS = \ tiffcp \ tiffdither \ tiffdump \ - tiffgt \ tiffinfo \ tiffmedian \ tiffset \ diff --git a/tools/Makefile.in b/tools/Makefile.in index f778595b..bdf856da 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -67,9 +67,9 @@ bin_PROGRAMS = fax2ps$(EXEEXT) fax2tiff$(EXEEXT) gif2tiff$(EXEEXT) \ raw2tiff$(EXEEXT) rgb2ycbcr$(EXEEXT) thumbnail$(EXEEXT) \ tiff2bw$(EXEEXT) tiff2pdf$(EXEEXT) tiff2ps$(EXEEXT) \ tiff2rgba$(EXEEXT) tiffcmp$(EXEEXT) tiffcp$(EXEEXT) \ - tiffdither$(EXEEXT) tiffdump$(EXEEXT) tiffgt$(EXEEXT) \ - tiffinfo$(EXEEXT) tiffmedian$(EXEEXT) tiffset$(EXEEXT) \ - tiffsplit$(EXEEXT) $(am__EXEEXT_1) + tiffdither$(EXEEXT) tiffdump$(EXEEXT) tiffinfo$(EXEEXT) \ + tiffmedian$(EXEEXT) tiffset$(EXEEXT) tiffsplit$(EXEEXT) \ + $(am__EXEEXT_1) EXTRA_PROGRAMS = $(am__EXEEXT_1) sgi2tiff$(EXEEXT) sgisv$(EXEEXT) \ ycbcr$(EXEEXT) subdir = tools @@ -87,30 +87,29 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_fax2ps_OBJECTS = fax2ps.$(OBJEXT) fax2ps_OBJECTS = $(am_fax2ps_OBJECTS) -am__DEPENDENCIES_1 = $(top_builddir)/libtiff/libtiff.la -am__DEPENDENCIES_2 = $(top_builddir)/port/libport.a -fax2ps_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +am__DEPENDENCIES_1 = +fax2ps_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_fax2tiff_OBJECTS = fax2tiff.$(OBJEXT) fax2tiff_OBJECTS = $(am_fax2tiff_OBJECTS) -fax2tiff_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +fax2tiff_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_gif2tiff_OBJECTS = gif2tiff.$(OBJEXT) gif2tiff_OBJECTS = $(am_gif2tiff_OBJECTS) -gif2tiff_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +gif2tiff_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_pal2rgb_OBJECTS = pal2rgb.$(OBJEXT) pal2rgb_OBJECTS = $(am_pal2rgb_OBJECTS) -pal2rgb_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +pal2rgb_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_ppm2tiff_OBJECTS = ppm2tiff.$(OBJEXT) ppm2tiff_OBJECTS = $(am_ppm2tiff_OBJECTS) -ppm2tiff_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +ppm2tiff_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_ras2tiff_OBJECTS = ras2tiff.$(OBJEXT) ras2tiff_OBJECTS = $(am_ras2tiff_OBJECTS) -ras2tiff_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +ras2tiff_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_raw2tiff_OBJECTS = raw2tiff.$(OBJEXT) raw2tiff_OBJECTS = $(am_raw2tiff_OBJECTS) -raw2tiff_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +raw2tiff_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_rgb2ycbcr_OBJECTS = rgb2ycbcr.$(OBJEXT) rgb2ycbcr_OBJECTS = $(am_rgb2ycbcr_OBJECTS) -rgb2ycbcr_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +rgb2ycbcr_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) sgi2tiff_SOURCES = sgi2tiff.c sgi2tiff_OBJECTS = sgi2tiff.$(OBJEXT) sgi2tiff_LDADD = $(LDADD) @@ -119,46 +118,46 @@ sgisv_OBJECTS = sgisv.$(OBJEXT) sgisv_LDADD = $(LDADD) am_thumbnail_OBJECTS = thumbnail.$(OBJEXT) thumbnail_OBJECTS = $(am_thumbnail_OBJECTS) -thumbnail_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +thumbnail_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_tiff2bw_OBJECTS = tiff2bw.$(OBJEXT) tiff2bw_OBJECTS = $(am_tiff2bw_OBJECTS) -tiff2bw_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +tiff2bw_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_tiff2pdf_OBJECTS = tiff2pdf.$(OBJEXT) tiff2pdf_OBJECTS = $(am_tiff2pdf_OBJECTS) -tiff2pdf_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +tiff2pdf_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_tiff2ps_OBJECTS = tiff2ps.$(OBJEXT) tiff2ps_OBJECTS = $(am_tiff2ps_OBJECTS) -tiff2ps_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +tiff2ps_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_tiff2rgba_OBJECTS = tiff2rgba.$(OBJEXT) tiff2rgba_OBJECTS = $(am_tiff2rgba_OBJECTS) -tiff2rgba_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +tiff2rgba_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_tiffcmp_OBJECTS = tiffcmp.$(OBJEXT) tiffcmp_OBJECTS = $(am_tiffcmp_OBJECTS) -tiffcmp_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +tiffcmp_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_tiffcp_OBJECTS = tiffcp.$(OBJEXT) tiffcp_OBJECTS = $(am_tiffcp_OBJECTS) -tiffcp_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +tiffcp_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_tiffdither_OBJECTS = tiffdither.$(OBJEXT) tiffdither_OBJECTS = $(am_tiffdither_OBJECTS) -tiffdither_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +tiffdither_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_tiffdump_OBJECTS = tiffdump.$(OBJEXT) tiffdump_OBJECTS = $(am_tiffdump_OBJECTS) -tiffdump_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +tiffdump_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_tiffgt_OBJECTS = tiffgt.$(OBJEXT) tiffgt_OBJECTS = $(am_tiffgt_OBJECTS) -tiffgt_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +tiffgt_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_tiffinfo_OBJECTS = tiffinfo.$(OBJEXT) tiffinfo_OBJECTS = $(am_tiffinfo_OBJECTS) -tiffinfo_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +tiffinfo_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_tiffmedian_OBJECTS = tiffmedian.$(OBJEXT) tiffmedian_OBJECTS = $(am_tiffmedian_OBJECTS) -tiffmedian_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +tiffmedian_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_tiffset_OBJECTS = tiffset.$(OBJEXT) tiffset_OBJECTS = $(am_tiffset_OBJECTS) -tiffset_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +tiffset_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_tiffsplit_OBJECTS = tiffsplit.$(OBJEXT) tiffsplit_OBJECTS = $(am_tiffsplit_OBJECTS) -tiffsplit_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +tiffsplit_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ycbcr_SOURCES = ycbcr.c ycbcr_OBJECTS = ycbcr.$(OBJEXT) ycbcr_LDADD = $(LDADD) @@ -312,8 +311,8 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -LIBPORT = $(top_builddir)/port/libport.a -LIBTIFF = $(top_builddir)/libtiff/libtiff.la +LIBPORT = -L$(top_builddir)/port -lport +LIBTIFF = -L$(top_builddir)/libtiff -ltiff EXTRA_DIST = Makefile.vc @HAVE_OPENGL_FALSE@BIN_TIFFGT = @HAVE_OPENGL_TRUE@BIN_TIFFGT = tiffgt