diff options
| author | miguel <medalist@sapo.pt> | 2021-01-07 11:35:10 +0000 |
|---|---|---|
| committer | miguel <medalist@sapo.pt> | 2021-01-07 11:35:10 +0000 |
| commit | 3517708d204228f653943e309f9b39a30ef659be (patch) | |
| tree | 12b7f30d2cca50a89b8bdaec28a65926d40c0db4 | |
| parent | f2bfeb92b7d63ee4edbbe7f4e6078187a8e86ea0 (diff) | |
| download | libtiff-git-3517708d204228f653943e309f9b39a30ef659be.tar.gz | |
tiff tools: include 'libport.h', remove local definition of 'getopt()'
| -rw-r--r-- | libtiff/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | libtiff/Makefile.am | 2 | ||||
| -rw-r--r-- | libtiff/mkg3states.c | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt index a186f5dd..afadbea0 100644 --- a/libtiff/CMakeLists.txt +++ b/libtiff/CMakeLists.txt @@ -30,6 +30,11 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tiffconf.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/tiffconf.h @ONLY) +include_directories(${PROJECT_SOURCE_DIR}/libtiff + ${PROJECT_BINARY_DIR}/libtiff + ${PROJECT_SOURCE_DIR}/port + ${CMAKE_CURRENT_BINARY_DIR}) + extra_dist( SConstruct tif_config.vc.h diff --git a/libtiff/Makefile.am b/libtiff/Makefile.am index 9f4a821c..e50b0d62 100644 --- a/libtiff/Makefile.am +++ b/libtiff/Makefile.am @@ -147,7 +147,7 @@ libtiffxx_la_DEPENDENCIES = libtiff.la noinst_PROGRAMS = mkg3states mkg3states_SOURCES = mkg3states.c tif_fax3.h mkg3states_LDADD = $(LIBPORT) - faxtable: mkg3states (rm -f tif_fax3sm.c && ./mkg3states -b -c const tif_fax3sm.c) +AM_CPPFLAGS = -I$(top_srcdir)/libtiff -I$(top_srcdir)/port diff --git a/libtiff/mkg3states.c b/libtiff/mkg3states.c index 5612a56c..f3421d67 100644 --- a/libtiff/mkg3states.c +++ b/libtiff/mkg3states.c @@ -28,6 +28,7 @@ * Copyright (C) 1990, 1995 Frank D. Cringle. */ #include "tif_config.h" +#include "libport.h" #include <stdio.h> #include <stdlib.h> @@ -39,10 +40,6 @@ #include "tif_fax3.h" -#ifndef HAVE_GETOPT -extern int getopt(int argc, char * const argv[], const char *optstring); -#endif - #define streq(a,b) (strcmp(a,b) == 0) /* NB: can't use names in tif_fax3.h 'cuz they are declared const */ |