From bb419d28b771a8eae965253c53f6c330af2fb268 Mon Sep 17 00:00:00 2001 From: Adam Sampson Date: Wed, 5 Mar 2008 16:43:15 +0000 Subject: [PATCH] Move the headers into their own directory, and install them. This should make it possible to use Tock from outside its own source directory. --- Makefile.am | 8 ++++++-- tock_support.h => support/tock_support.h | 0 tock_support_cppcsp.h => support/tock_support_cppcsp.h | 0 3 files changed, 6 insertions(+), 2 deletions(-) rename tock_support.h => support/tock_support.h (100%) rename tock_support_cppcsp.h => support/tock_support_cppcsp.h (100%) diff --git a/Makefile.am b/Makefile.am index 8b449ae..aeb9387 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,11 +36,13 @@ GenOrdAST$(EXEEXT): $(GenOrdAST_SOURCES) @MKDIR_P@ obj ghc $(GHC_OPTS) -o GenOrdAST$(EXEEXT) -main-is GenOrdAST --make GenOrdAST -odir obj -hidir obj -TOCK_CFLAGS = @gnu89_inline@ @CPPFLAGS@ @CFLAGS@ -Wall `kroc --cflags` `kroc --ccincpath` -fno-strict-aliasing +common_cflags = -Wall -ggdb3 -Isupport -I$(pkgincludedir) -fno-strict-aliasing + +TOCK_CFLAGS = @gnu89_inline@ @CPPFLAGS@ @CFLAGS@ $(common_cflags) `kroc --cflags` `kroc --ccincpath` # FIXME: -ldl is only necessary on some platforms for CCSP TOCK_CLDFLAGS = @LDFLAGS@ `kroc --cclibpath` -lccsp -lpthread -ldl -lm -TOCK_CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ -Wall -ggdb3 -I. -fno-strict-aliasing +TOCK_CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ $(common_cflags) TOCK_CXXLDFLAGS = @LDFLAGS@ -lcppcsp2 -pthread CompilerCommands.hs: Makefile @@ -166,6 +168,8 @@ GenOrdAST_SOURCES = GenOrdAST.hs bin_PROGRAMS = tock noinst_PROGRAMS = tocktest GenTagAST GenOrdAST +pkginclude_HEADERS = support/tock_support.h +pkginclude_HEADERS += support/tock_support_cppcsp.h clean-local: rm -f obj/*.o obj/*.hi diff --git a/tock_support.h b/support/tock_support.h similarity index 100% rename from tock_support.h rename to support/tock_support.h diff --git a/tock_support_cppcsp.h b/support/tock_support_cppcsp.h similarity index 100% rename from tock_support_cppcsp.h rename to support/tock_support_cppcsp.h