From 944f116c960aac9cc9bdbfe85aada41b91398eb2 Mon Sep 17 00:00:00 2001 From: jjgarcia Date: Tue, 28 Feb 2006 17:17:34 +0000 Subject: [PATCH] MINGW's gcc does not like having '..' in include paths --- src/Makefile.in | 5 +++-- src/c/Makefile.in | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 9348a8614..bcbe73312 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -56,9 +56,10 @@ all: $(TARGETS) bin/ecl-config doc # declarations, because the variables that they mark are in the # in the library and can be referenced without indirection. # -c/external.h: $(top_srcdir)/h/external.h +c/ecl/external.h: $(top_srcdir)/h/external.h + -mkdir c/ecl sed 's,__declspec(dllimport),,g' $(top_srcdir)/h/external.h > $@ -ecl/external.h: c/external.h +ecl/external.h: c/ecl/external.h c/ecl/external.h cp $(srcdir)/h/*.h ecl/ if grep 'undef ENABLE_DLOPEN' ecl/config.h; then cp c/external.h h; fi diff --git a/src/c/Makefile.in b/src/c/Makefile.in index 7b2584425..d00e3dd65 100644 --- a/src/c/Makefile.in +++ b/src/c/Makefile.in @@ -9,8 +9,8 @@ VPATH = @srcdir@ # TRUE_CC = @CC@ CC = @CC@ -CFLAGS = -c -I. -I$(srcdir) -I$(srcdir)/gc -I../ecl/gc -I../ @CPPFLAGS@ @CFLAGS@ \ - @ECL_CFLAGS@ \ +CFLAGS = -c -I. -I@true_builddir@ -I$(srcdir) -I$(srcdir)/gc -I../ecl/gc\ + @CPPFLAGS@ @CFLAGS@ @ECL_CFLAGS@ \ # -Wall -W -Wfloat-equal -Wundef -Wendif-labels -Wpointer-arith -Wcast-align \ # -Wwrite-strings -Wconversion -Wsign-compare -Wmissing-prototypes -Wredundant-decls \ # -Wunreachable-code -Winline @@ -86,7 +86,7 @@ clean: $(DPP): $(srcdir)/dpp.c $(srcdir)/symbols_list2.h if test -f ../CROSS-DPP; then touch dpp; else \ - $(TRUE_CC) @CFLAGS@ @ECL_CFLAGS@ -I$(srcdir) -I../ -I./ $(DEFS) $(srcdir)/dpp.c -o $@ ; \ + $(TRUE_CC) @CFLAGS@ @ECL_CFLAGS@ -I$(srcdir) -I@true_builddir@ -I./ $(DEFS) $(srcdir)/dpp.c -o $@ ; \ fi $(srcdir)/symbols_list2.h: $(srcdir)/symbols_list.h Makefile cat $(srcdir)/symbols_list.h | \