Use target specific build flags

diff --git a/tclpkg/tclpathplan/Makefile.am b/tclpkg/tclpathplan/Makefile.am
index dde5d8ecad7a8011f6feb1b5e9423cd13ac30f72..ee29105a4f92c2a973567f5bb32a202c29a38218 100644 (file)
--- a/tclpkg/tclpathplan/Makefile.am
+++ b/tclpkg/tclpathplan/Makefile.am
@@ -4,26 +4,23 @@ SUBDIRS = demo
 
 pkgtcldir = $(pkglibdir)/tcl
 
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/lib \
-       -I$(top_srcdir)/tclpkg/tclhandle \
-       -I$(top_srcdir)/lib/pathplan $(TCL_INCLUDES)
-
-AM_CFLAGS = $(TCL_CFLAGS)
-
-LIBS = -lc $(TCL_STUB_LIB_SPEC)
-
 noinst_HEADERS = makecw.h simple.h
 if WITH_TCL
 pkgtcl_LTLIBRARIES = libtclplan.la
 endif
 
 libtclplan_la_SOURCES = find_ints.c intersect.c makecw.c tclpathplan.c wrapper.c
+libtclplan_la_CPPFLAGS = \
+       -I$(top_srcdir)/lib \
+       -I$(top_srcdir)/tclpkg/tclhandle \
+       -I$(top_srcdir)/lib/pathplan $(TCL_INCLUDES)
+libtclplan_la_CFLAGS = $(TCL_CFLAGS)
 libtclplan_la_LDFLAGS = -no-undefined
 libtclplan_la_LIBADD = \
        $(top_builddir)/tclpkg/tclhandle/libtclhandle_C.la \
        $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la \
-       $(top_builddir)/lib/pathplan/libpathplan.la $(MATH_LIBS)
+       $(top_builddir)/lib/pathplan/libpathplan.la $(MATH_LIBS) \
+       -lc $(TCL_STUB_LIB_SPEC)
 
 if WITH_TCL
 all-local: pkgIndex.tcl

diff --git a/tclpkg/tclstubs/Makefile.am b/tclpkg/tclstubs/Makefile.am
index 66427b65ddeeb023e16b60c6179189894be676d7..a9adb7566c714922d9fa2a01c9ce3237cbe833b6 100644 (file)
--- a/tclpkg/tclstubs/Makefile.am
+++ b/tclpkg/tclstubs/Makefile.am
@@ -1,9 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-AM_CPPFLAGS = $(TCL_CFLAGS) $(TCL_INCLUDES)
-
-LIBS = $(TCL_STUB_LIB_SPEC)
-
 if WITH_TCL
 noinst_LTLIBRARIES = libtclstubs_C.la
 noinst_HEADERS = tclInt.h
@@ -11,3 +7,5 @@ endif
 
 # tclStubLib.c is a dummy file just to fool automake
 libtclstubs_C_la_SOURCES = tclStubLib.c
+libtclstubs_C_la_CPPFLAGS = $(TCL_CFLAGS) $(TCL_INCLUDES)
+libtclstubs_C_la_LIBADD = $(TCL_STUB_LIB_SPEC)

diff --git a/tclpkg/tkstubs/Makefile.am b/tclpkg/tkstubs/Makefile.am
index d5dd3b7852af12af93f89645da990c980b047c3e..c63aed87381de2a0a05ff550f2074290f552de9e 100644 (file)
--- a/tclpkg/tkstubs/Makefile.am
+++ b/tclpkg/tkstubs/Makefile.am
@@ -1,9 +1,5 @@
 # Process this file with automake to produce Makefile.in
 
-AM_CPPFLAGS = $(TCL_CFLAGS) $(TK_CFLAGS) $(TCL_INCLUDES) $(TK_INCLUDES) $(TK_XINCLUDES)
-
-LIBS = $(TK_STUB_LIB_SPEC)
-
 if WITH_TK
 noinst_LTLIBRARIES = libtkstubs_C.la
 noinst_HEADERS = tkInt.h
@@ -11,3 +7,5 @@ endif
 
 # tkStubLib.c is a dummy file just to fool automake
 libtkstubs_C_la_SOURCES = tkStubLib.c tkStubImg.c
+libtkstubs_C_la_CPPFLAGS = $(TCL_CFLAGS) $(TK_CFLAGS) $(TCL_INCLUDES) $(TK_INCLUDES) $(TK_XINCLUDES)
+libtkstubs_C_la_LIBADD = $(TK_STUB_LIB_SPEC)