summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/dbs/xtiff/Makefile.in2
-rw-r--r--html/Makefile.in2
-rw-r--r--libtiff/Makefile.in11
3 files changed, 9 insertions, 6 deletions
diff --git a/contrib/dbs/xtiff/Makefile.in b/contrib/dbs/xtiff/Makefile.in
index f742848f..459d72f6 100644
--- a/contrib/dbs/xtiff/Makefile.in
+++ b/contrib/dbs/xtiff/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-# $Id: Makefile.in,v 1.21 2005-03-15 15:42:55 dron Exp $
+# $Id: Makefile.in,v 1.22 2005-03-17 14:49:52 dron Exp $
#
# Tag Image File Format (TIFF) Software
#
diff --git a/html/Makefile.in b/html/Makefile.in
index 7aa0925c..5b60f165 100644
--- a/html/Makefile.in
+++ b/html/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-# $Id: Makefile.in,v 1.35 2005-03-15 15:42:55 dron Exp $
+# $Id: Makefile.in,v 1.36 2005-03-17 14:49:52 dron Exp $
#
# Tag Image File Format (TIFF) Software
#
diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in
index cc1365b3..61223245 100644
--- a/libtiff/Makefile.in
+++ b/libtiff/Makefile.in
@@ -103,7 +103,8 @@ am__objects_1 = tif_aux.lo tif_close.lo tif_codec.lo tif_color.lo \
tif_warning.lo tif_write.lo tif_zip.lo
am_libtiff_la_OBJECTS = $(am__objects_1)
libtiff_la_OBJECTS = $(am_libtiff_la_OBJECTS)
-libtiffxx_la_LIBADD =
+am__DEPENDENCIES_1 = $(top_builddir)/libtiff/libtiff.la
+libtiffxx_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am__objects_2 = tif_stream.lo
am_libtiffxx_la_OBJECTS = $(am__objects_2)
libtiffxx_la_OBJECTS = $(am_libtiffxx_la_OBJECTS)
@@ -111,8 +112,8 @@ libtiffxx_la_OBJECTS = $(am_libtiffxx_la_OBJECTS)
PROGRAMS = $(noinst_PROGRAMS)
am_mkg3states_OBJECTS = mkg3states.$(OBJEXT)
mkg3states_OBJECTS = $(am_mkg3states_OBJECTS)
-am__DEPENDENCIES_1 =
-mkg3states_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_2 = $(top_builddir)/port/libport.la
+mkg3states_DEPENDENCIES = $(am__DEPENDENCIES_2)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -271,7 +272,8 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-LIBPORT = -L$(top_builddir)/port -lport
+LIBPORT = $(top_builddir)/port/libport.la
+LIBTIFF = $(top_builddir)/libtiff/libtiff.la
EXTRA_DIST = Makefile.vc tif_config.h.vc tiffconf.h.vc libtiff.def \
$(EXTRA_SRCS)
@@ -347,6 +349,7 @@ libtiffxx_la_LDFLAGS = \
-no-undefined \
-version-number $(LIBTIFF_MAJOR_VERSION):$(LIBTIFF_MINOR_VERSION):$(LIBTIFF_MICRO_VERSION)
+libtiffxx_la_LIBADD = $(LIBTIFF)
mkg3states_SOURCES = mkg3states.c tif_fax3.h
mkg3states_LDADD = $(LIBPORT)
all: tif_config.h tiffconf.h