partially fix breakage caused by automake update

diff --git a/configure.ac b/configure.ac
index 08215deb87825120ccba3e47ec740b4eb31e558a..c80fd64dcf68889b8f04fb48eb5e9f7666f8c43a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -208,7 +208,7 @@ DEFAULT_DPI=96
 AC_DEFINE_UNQUOTED(DEFAULT_DPI,$DEFAULT_DPI,Default DPI.)
 AC_DEFINE_UNQUOTED(BROWSER,"$BROWSER",[Command to open a browser on a URL])
 
-AM_INIT_AUTOMAKE([no-define])
+AM_INIT_AUTOMAKE([no-define subdir-objects])
 
 # Suppress verbose compile lines
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

diff --git a/tclpkg/gdtclft/Makefile.am b/tclpkg/gdtclft/Makefile.am
index 0eb06c390d6b131a373cb8b22361995a20d04da9..bc1492a7efb64c4b53c0ff9020625614d70e82f0 100644 (file)
--- a/tclpkg/gdtclft/Makefile.am
+++ b/tclpkg/gdtclft/Makefile.am
@@ -22,10 +22,12 @@ if WITH_TCL
 pkgtcl_LTLIBRARIES = libgdtclft.la
 man_MANS = $(man)
 pdf_DATA = $(pdf)
+noinst_LTLIBRARIES = libgdtclft_C.la
 endif
 endif
 
 libgdtclft_la_SOURCES = gdtclft.c
+libgdtclft_C_la_SOURCES = gdtclft.c
 
 libgdtclft_la_LDFLAGS = -no-undefined
 

diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index df2b1cefef0ab344be82deef2acdb7d922c85b1b..58c88f41438272e22f85d65fb76b541c6639b6dc 100644 (file)
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -6,6 +6,9 @@ SUBDIRS = demo
 # tclhandle still needed for gd
 TCLHANDLE_INCLUDES=-I$(top_srcdir)/tclpkg/tclhandle
 TCLHANDLE_LIBS=$(top_builddir)/tclpkg/tclhandle/libtclhandle_C.la
+if WITH_LIBGD
+GDTCLFT_LIBS = $(top_srcdir)/tclpkg/gdtclft/libgdtclft_C.la
+endif
 
 pdfdir = $(pkgdatadir)/doc/pdf
 htmldir = $(pkgdatadir)/doc/html
@@ -37,10 +40,6 @@ pdf_DATA = $(pdf)
 html_DATA = $(html)
 endif
 
-if WITH_LIBGD
-GDTCLFT = $(top_srcdir)/tclpkg/gdtclft/gdtclft.c
-endif
-
 libtcldot_la_SOURCES = \
        tcldot.c \
        tcldot-graphcmd.c \
@@ -53,8 +52,8 @@ libtcldot_la_SOURCES = \
 libtcldot_la_CPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=1
 libtcldot_la_LDFLAGS = -no-undefined 
 
-libtcldot_la_LIBADD = $(TCLHANDLE_LIBS) \
-       $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la \
+libtcldot_la_LIBADD = $(TCLHANDLE_LIBS) $(GDTCLFT_LIBS) \
+       $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la  \
        $(top_builddir)/lib/cdt/libcdt.la \
        $(top_builddir)/lib/cgraph/libcgraph.la \
        $(top_builddir)/lib/pathplan/libpathplan_C.la \