diff options
Diffstat (limited to 'libtiff')
| -rw-r--r-- | libtiff/Makefile.am | 13 | ||||
| -rw-r--r-- | libtiff/Makefile.in | 68 | ||||
| -rw-r--r-- | libtiff/config.h.in | 27 | ||||
| -rw-r--r-- | libtiff/mkg3states.c | 6 |
4 files changed, 59 insertions, 55 deletions
diff --git a/libtiff/Makefile.am b/libtiff/Makefile.am index cc8bea3c..6637d692 100644 --- a/libtiff/Makefile.am +++ b/libtiff/Makefile.am @@ -23,6 +23,8 @@ # Process this file with automake to produce Makefile.in. +LIBPORT = $(top_builddir)/port/libport.a + EXTRA_DIST = Makefile.vc libtiffincludedir = $(includedir) @@ -33,7 +35,6 @@ libtiffinclude_HEADERS = \ noinst_HEADERS = \ t4.h \ tif_dir.h \ - tif_fax3.h \ tif_predict.h \ tiffiop.h \ uvcode.h @@ -85,8 +86,12 @@ libtiff_la_LDFLAGS = \ # are generated by the mkg3states program. On systems without # make these rules have to be manually carried out. # -tif_fax3sm.c: mkg3states.c tif_fax3.h - ${CC} -o mkg3states ${CFLAGS} mkg3states.c - rm -f tif_fax3sm.c; ./mkg3states -c const tif_fax3sm.c +BUILT_SOURCES = tif_fax3sm.c +CLEANFILES = tif_fax3sm.c +noinst_PROGRAMS = mkg3states +mkg3states_SOURCES = mkg3states.c tif_fax3.h +mkg3states_LDADD = $(LIBPORT) +tif_fax3sm.c: mkg3states + (rm -f tif_fax3sm.c && ./mkg3states -c const tif_fax3sm.c) diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in index 7f374dd5..01dcc945 100644 --- a/libtiff/Makefile.in +++ b/libtiff/Makefile.in @@ -40,7 +40,8 @@ # Process this file with automake to produce Makefile.in. -SOURCES = $(libtiff_la_SOURCES) + +SOURCES = $(libtiff_la_SOURCES) $(mkg3states_SOURCES) srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -63,6 +64,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ +noinst_PROGRAMS = mkg3states$(EXEEXT) subdir = libtiff DIST_COMMON = $(libtiffinclude_HEADERS) $(noinst_HEADERS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ @@ -88,11 +90,16 @@ am_libtiff_la_OBJECTS = tif_aux.lo tif_close.lo tif_codec.lo \ tif_strip.lo tif_thunder.lo tif_tile.lo tif_unix.lo \ tif_version.lo tif_warning.lo tif_write.lo tif_zip.lo libtiff_la_OBJECTS = $(am_libtiff_la_OBJECTS) +PROGRAMS = $(noinst_PROGRAMS) +am_mkg3states_OBJECTS = mkg3states.$(OBJEXT) +mkg3states_OBJECTS = $(am_mkg3states_OBJECTS) +am__DEPENDENCIES_1 = $(top_builddir)/port/libport.a +mkg3states_DEPENDENCIES = $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/tif_aux.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/tif_close.Plo \ +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mkg3states.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/tif_aux.Plo ./$(DEPDIR)/tif_close.Plo \ @AMDEP_TRUE@ ./$(DEPDIR)/tif_codec.Plo \ @AMDEP_TRUE@ ./$(DEPDIR)/tif_color.Plo \ @AMDEP_TRUE@ ./$(DEPDIR)/tif_compress.Plo \ @@ -128,8 +135,8 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libtiff_la_SOURCES) -DIST_SOURCES = $(libtiff_la_SOURCES) +SOURCES = $(libtiff_la_SOURCES) $(mkg3states_SOURCES) +DIST_SOURCES = $(libtiff_la_SOURCES) $(mkg3states_SOURCES) libtiffincludeHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(libtiffinclude_HEADERS) $(noinst_HEADERS) ETAGS = etags @@ -236,6 +243,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +LIBPORT = $(top_builddir)/port/libport.a EXTRA_DIST = Makefile.vc libtiffincludedir = $(includedir) libtiffinclude_HEADERS = \ @@ -246,7 +254,6 @@ libtiffinclude_HEADERS = \ noinst_HEADERS = \ t4.h \ tif_dir.h \ - tif_fax3.h \ tif_predict.h \ tiffiop.h \ uvcode.h @@ -294,7 +301,17 @@ libtiff_la_LDFLAGS = \ -no-undefined \ -version-number $(LIBTIFF_MAJOR_VERSION):$(LIBTIFF_MINOR_VERSION):$(LIBTIFF_MICRO_VERSION) -all: config.h + +# +# The finite state machine tables used by the G3/G4 decoders +# are generated by the mkg3states program. On systems without +# make these rules have to be manually carried out. +# +BUILT_SOURCES = tif_fax3sm.c +CLEANFILES = tif_fax3sm.c +mkg3states_SOURCES = mkg3states.c tif_fax3.h +mkg3states_LDADD = $(LIBPORT) +all: $(BUILT_SOURCES) config.h $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: @@ -375,12 +392,23 @@ clean-libLTLIBRARIES: libtiff.la: $(libtiff_la_OBJECTS) $(libtiff_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libtiff_la_LDFLAGS) $(libtiff_la_OBJECTS) $(libtiff_la_LIBADD) $(LIBS) +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +mkg3states$(EXEEXT): $(mkg3states_OBJECTS) $(mkg3states_DEPENDENCIES) + @rm -f mkg3states$(EXEEXT) + $(LINK) $(mkg3states_LDFLAGS) $(mkg3states_OBJECTS) $(mkg3states_LDADD) $(LIBS) + mostlyclean-compile: -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkg3states.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_aux.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_close.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tif_codec.Plo@am__quote@ @@ -543,13 +571,15 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) config.h installdirs: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libtiffincludedir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done -install: install-am +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -566,6 +596,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -rm -f $(CONFIG_CLEAN_FILES) @@ -573,10 +604,11 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - mostlyclean-am + clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -626,8 +658,8 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ uninstall-libtiffincludeHEADERS .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-hdr \ + clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS ctags \ + distclean distclean-compile distclean-generic distclean-hdr \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-exec install-exec-am install-info \ @@ -640,14 +672,8 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ uninstall-libLTLIBRARIES uninstall-libtiffincludeHEADERS -# -# The finite state machine tables used by the G3/G4 decoders -# are generated by the mkg3states program. On systems without -# make these rules have to be manually carried out. -# -tif_fax3sm.c: mkg3states.c tif_fax3.h - ${CC} -o mkg3states ${CFLAGS} mkg3states.c - rm -f tif_fax3sm.c; ./mkg3states -c const tif_fax3sm.c +tif_fax3sm.c: mkg3states + (rm -f tif_fax3sm.c && ./mkg3states -c const tif_fax3sm.c) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/libtiff/config.h.in b/libtiff/config.h.in index 9f2cacee..6fde0483 100644 --- a/libtiff/config.h.in +++ b/libtiff/config.h.in @@ -3,17 +3,14 @@ /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -#undef HAVE_DOPRNT - /* Define to 1 if you have the <fcntl.h> header file. */ #undef HAVE_FCNTL_H /* Define to 1 if you have the `floor' function. */ #undef HAVE_FLOOR -/* Define to 1 if you have the `getpagesize' function. */ -#undef HAVE_GETPAGESIZE +/* Define to 1 if you have the `getopt' function. */ +#undef HAVE_GETOPT /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY @@ -33,10 +30,6 @@ /* Define to 1 if you have the <limits.h> header file. */ #undef HAVE_LIMITS_H -/* Define to 1 if your system has a GNU libc compatible `malloc' function, and - to 0 otherwise. */ -#undef HAVE_MALLOC - /* Define to 1 if you have the <malloc.h> header file. */ #undef HAVE_MALLOC_H @@ -49,19 +42,12 @@ /* Define to 1 if you have the `memset' function. */ #undef HAVE_MEMSET -/* Define to 1 if you have a working `mmap' system call. */ -#undef HAVE_MMAP - /* Define to 1 if you have the `munmap' function. */ #undef HAVE_MUNMAP /* Define to 1 if you have the `pow' function. */ #undef HAVE_POW -/* Define to 1 if your system has a GNU libc compatible `realloc' function, - and to 0 otherwise. */ -#undef HAVE_REALLOC - /* Define to 1 if you have the `sqrt' function. */ #undef HAVE_SQRT @@ -113,9 +99,6 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the `vprintf' function. */ -#undef HAVE_VPRINTF - /* Define to 1 if the system has the type `_Bool'. */ #undef HAVE__BOOL @@ -162,14 +145,8 @@ /* Define to empty if `const' does not conform to ANSI C. */ #undef const -/* Define to rpl_malloc if the replacement function should be used. */ -#undef malloc - /* Define to `long' if <sys/types.h> does not define. */ #undef off_t -/* Define to rpl_realloc if the replacement function should be used. */ -#undef realloc - /* Define to `unsigned' if <sys/types.h> does not define. */ #undef size_t diff --git a/libtiff/mkg3states.c b/libtiff/mkg3states.c index 074c911f..91cdf7f3 100644 --- a/libtiff/mkg3states.c +++ b/libtiff/mkg3states.c @@ -1,4 +1,4 @@ -/* "$Header: /cvs/maptools/cvsroot/libtiff/libtiff/mkg3states.c,v 1.2 1999-11-27 21:50:41 warmerda Exp $ */ +/* "$Header: /cvs/maptools/cvsroot/libtiff/libtiff/mkg3states.c,v 1.3 2004-04-08 14:30:51 dron Exp $ */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -29,13 +29,9 @@ * in Frank Cringle's viewfax program; * Copyright (C) 1990, 1995 Frank D. Cringle. */ -#if defined(unix) || defined(__unix) -#include "port.h" -#else #include <stdio.h> #include <stdlib.h> #include <string.h> -#endif #include "tif_fax3.h" |