From 782844a100ececaaa2026683f14a6bf56e42e319 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Fri, 24 Feb 2012 21:28:51 -0500 Subject: [PATCH] Avoid per-target CFLAGS (for now). There's no real reason to use per-target CFLAGS to specify $(GSL_CFLAGS) only on libtest, as the flags will simply be harmless (and useless) on other targets. Set them globally and completely avoid the mess resulting from the use of per-target flags. --- Makefile.am | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 535eff8..5f5743d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,6 +17,8 @@ AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \ -DBISON_LOCALEDIR=\"$(BISON_LOCALEDIR)\" \ -DLOCALEDIR=\"$(localedir)\" +AM_CFLAGS = $(GSL_CFLAGS) + MAINTAINERCLEANFILES = src/scan.c src/scan.h src/scan.stamp \ src/parse.c src/parse.h src/parse.stamp @@ -50,7 +52,6 @@ bin_PROGRAMS = cdecl99 check_PROGRAMS = EXTRA_LTLIBRARIES = libtest.la -libtest_la_CFLAGS = $(AM_CFLAGS) $(GSL_CFLAGS) libtest_la_LIBADD = $(GSL_LIBS) libtest_la_SOURCES = test/testlib.c @@ -73,10 +74,7 @@ src/typemap.lo: src/validtypes.h src/error.lo: src/errtab.h src/normalize.lo: src/ordspecs.h src/output.lo: src/namespecs.h - -# This is gross. -declgen_o = test/libtest_la-declgen.lo -$(declgen_o): test/typegen.h +test/declgen.lo: test/typegen.h src/validtypes.h: $(srcdir)/src/types.lst $(srcdir)/src/validtypes.sed $(AM_V_GEN)sed -f $(srcdir)/src/validtypes.sed \ -- 2.43.2