From d629112ec3920ca158e7f1abf24c0bd4c728e12b Mon Sep 17 00:00:00 2001 From: Ori Avtalion Date: Mon, 9 Feb 2009 22:08:32 +0200 Subject: [PATCH] Move config.h to includes/, include it in syn86k_public.h --- configure.ac | 2 +- include/syn68k_public.h | 4 ++++ runtime/Makefile.am | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 2be57fc..4f06929 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(syn68k, 1.0, ctm@ardi.com) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([syngen/main.c]) -AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_HEADERS([include/config.h]) # Checks for programs. AC_PROG_CC diff --git a/include/syn68k_public.h b/include/syn68k_public.h index 693fd4a..8f0f845 100644 --- a/include/syn68k_public.h +++ b/include/syn68k_public.h @@ -4,6 +4,10 @@ /* $Id: syn68k_public.h 83 2005-05-12 02:33:41Z ctm $ */ #include + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif /* Define this for CPUs that require n byte data be aligned * on addresses congruent to zero modulo n. The name "QUADALIGN" diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 9e4aa26..6048103 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -16,7 +16,7 @@ LOCAL_CFLAGS = -DRUNTIME -Iinclude all: libsyn68k.a %.o:%.c - $(CC) $(CFLAGS) -c $(LOCAL_INCLUDES) $< -o $@ + $(CC) $(DEFS) $(CFLAGS) -c $(LOCAL_INCLUDES) $< -o $@ OBJS = block.o diagnostics.o hash.o rangetree.o translate.o alloc.o \ blockinfo.o trap.o destroyblock.o callback.o init.o interrupt.o \