put local -I flags before CFLAGS in Makefiles
svn: r14901
This commit is contained in:
parent
975b825638
commit
6cf91e6dd3
|
@ -174,17 +174,17 @@ mred.@LTO@ : $(srcdir)/mred.cxx \
|
||||||
$(srcdir)/../mzscheme/include/scheme.h \
|
$(srcdir)/../mzscheme/include/scheme.h \
|
||||||
$(srcdir)/wxs/wxsmred.h $(WXINCDEP) $(srcdir)/../wxcommon/wxGC.h \
|
$(srcdir)/wxs/wxsmred.h $(WXINCDEP) $(srcdir)/../wxcommon/wxGC.h \
|
||||||
$(srcdir)/../wxcommon/wx_list.h
|
$(srcdir)/../wxcommon/wx_list.h
|
||||||
$(CXX) $(CXXFLAGS) $(LOCALFLAGS) -c $(srcdir)/mred.cxx -o mred.@LTO@
|
$(CXX) $(LOCALFLAGS) $(CXXFLAGS) -c $(srcdir)/mred.cxx -o mred.@LTO@
|
||||||
|
|
||||||
DEF_COLLECTS_DIR = -DINITIAL_COLLECTS_DIRECTORY='"'"`cd $(srcdir)/../../collects; pwd`"'"'
|
DEF_COLLECTS_DIR = -DINITIAL_COLLECTS_DIRECTORY='"'"`cd $(srcdir)/../../collects; pwd`"'"'
|
||||||
|
|
||||||
mrmain.@LTO@ : $(srcdir)/mrmain.cxx $(srcdir)/mred.h $(srcdir)/wxs/wxsmred.h \
|
mrmain.@LTO@ : $(srcdir)/mrmain.cxx $(srcdir)/mred.h $(srcdir)/wxs/wxsmred.h \
|
||||||
$(srcdir)/../mzscheme/cmdline.inc $(srcdir)/../mzscheme/src/stypes.h \
|
$(srcdir)/../mzscheme/cmdline.inc $(srcdir)/../mzscheme/src/stypes.h \
|
||||||
$(srcdir)/../mzscheme/include/scheme.h
|
$(srcdir)/../mzscheme/include/scheme.h
|
||||||
$(CXX) $(CXXFLAGS) $(LOCALFLAGS) $(DEF_COLLECTS_DIR) -c $(srcdir)/mrmain.cxx -o mrmain.@LTO@
|
$(CXX) $(LOCALFLAGS) $(CXXFLAGS) $(DEF_COLLECTS_DIR) -c $(srcdir)/mrmain.cxx -o mrmain.@LTO@
|
||||||
|
|
||||||
mrmain_ee.@LTO@ : mred.@LTO@
|
mrmain_ee.@LTO@ : mred.@LTO@
|
||||||
$(CXX) $(CXXFLAGS) $(LOCALFLAGS) -DSTANDALONE_WITH_EMBEDDED_EXTENSION $(DEF_COLLECTS_DIR) -c $(srcdir)/mrmain.cxx -o mrmain_ee.@LTO@
|
$(CXX) $(LOCALFLAGS) $(CXXFLAGS) -DSTANDALONE_WITH_EMBEDDED_EXTENSION $(DEF_COLLECTS_DIR) -c $(srcdir)/mrmain.cxx -o mrmain_ee.@LTO@
|
||||||
|
|
||||||
ee-main:
|
ee-main:
|
||||||
$(MAKE) mrmain_ee.@LTO@
|
$(MAKE) mrmain_ee.@LTO@
|
||||||
|
@ -193,28 +193,28 @@ mredx.@LTO@ : $(srcdir)/mredx.cxx $(srcdir)/../mzscheme/include/scheme.h $(srcdi
|
||||||
$(WXINCDEP) \
|
$(WXINCDEP) \
|
||||||
$(srcdir)/../wxcommon/wxGC.h $(srcdir)/../wxcommon/wx_list.h \
|
$(srcdir)/../wxcommon/wxGC.h $(srcdir)/../wxcommon/wx_list.h \
|
||||||
$(srcdir)/../mzscheme/src/stypes.h
|
$(srcdir)/../mzscheme/src/stypes.h
|
||||||
$(CXX) $(CXXFLAGS) $(LOCALFLAGS) -c $(srcdir)/mredx.cxx -o mredx.@LTO@
|
$(CXX) $(LOCALFLAGS) $(CXXFLAGS) -c $(srcdir)/mredx.cxx -o mredx.@LTO@
|
||||||
|
|
||||||
mredmac.@LTO@ : $(srcdir)/mredmac.cxx $(srcdir)/../mzscheme/include/scheme.h $(srcdir)/mred.h \
|
mredmac.@LTO@ : $(srcdir)/mredmac.cxx $(srcdir)/../mzscheme/include/scheme.h $(srcdir)/mred.h \
|
||||||
$(srcdir)/../wxcommon/wxGC.h $(srcdir)/../wxcommon/wx_list.h \
|
$(srcdir)/../wxcommon/wxGC.h $(srcdir)/../wxcommon/wx_list.h \
|
||||||
$(srcdir)/../mzscheme/src/stypes.h
|
$(srcdir)/../mzscheme/src/stypes.h
|
||||||
$(CXX) $(CXXFLAGS) $(LOCALFLAGS) -c $(srcdir)/mredmac.cxx -o mredmac.@LTO@
|
$(CXX) $(LOCALFLAGS) $(CXXFLAGS) -c $(srcdir)/mredmac.cxx -o mredmac.@LTO@
|
||||||
|
|
||||||
wxGC.@LTO@ : $(srcdir)/../wxcommon/wxGC.cxx $(srcdir)/../wxcommon/wxGC.h \
|
wxGC.@LTO@ : $(srcdir)/../wxcommon/wxGC.cxx $(srcdir)/../wxcommon/wxGC.h \
|
||||||
$(srcdir)/../mzscheme/src/stypes.h
|
$(srcdir)/../mzscheme/src/stypes.h
|
||||||
$(CXX) $(CXXFLAGS) $(LOCALFLAGS) -c $(srcdir)/../wxcommon/wxGC.cxx -o wxGC.@LTO@
|
$(CXX) $(LOCALFLAGS) $(CXXFLAGS) -c $(srcdir)/../wxcommon/wxGC.cxx -o wxGC.@LTO@
|
||||||
|
|
||||||
wxJPEG.@LTO@ : $(srcdir)/../wxcommon/wxJPEG.cxx $(srcdir)/../wxcommon/wxGC.h
|
wxJPEG.@LTO@ : $(srcdir)/../wxcommon/wxJPEG.cxx $(srcdir)/../wxcommon/wxGC.h
|
||||||
$(CXX) $(CXXFLAGS) $(LOCALFLAGS) @JPEG_INC@ @ZLIB_INC@ -c $(srcdir)/../wxcommon/wxJPEG.cxx -o wxJPEG.@LTO@
|
$(CXX) $(LOCALFLAGS) $(CXXFLAGS) @JPEG_INC@ @ZLIB_INC@ -c $(srcdir)/../wxcommon/wxJPEG.cxx -o wxJPEG.@LTO@
|
||||||
|
|
||||||
dl_stub.@LTO@: $(srcdir)/misc/dl_stub.c
|
dl_stub.@LTO@: $(srcdir)/misc/dl_stub.c
|
||||||
$(CC) $(CFLAGS) $(LOCALFLAGS) -c $(srcdir)/misc/dl_stub.c -o dl_stub.@LTO@
|
$(CC) $(CFLAGS) $(LOCALFLAGS) -c $(srcdir)/misc/dl_stub.c -o dl_stub.@LTO@
|
||||||
|
|
||||||
simpledrop.@LTO@ : $(srcdir)/../mac/mzscheme/simpledrop.cpp
|
simpledrop.@LTO@ : $(srcdir)/../mac/mzscheme/simpledrop.cpp
|
||||||
$(CXX) $(CXXFLAGS) $(LOCALFLAGS) -o simpledrop.@LTO@ -c $(srcdir)/../mac/mzscheme/simpledrop.cpp
|
$(CXX) $(LOCALFLAGS) $(CXXFLAGS) -o simpledrop.@LTO@ -c $(srcdir)/../mac/mzscheme/simpledrop.cpp
|
||||||
|
|
||||||
sgilinkhack.@LTO@:
|
sgilinkhack.@LTO@:
|
||||||
$(CXX) $(CXXFLAGS) $(LOCALFLAGS) -c $(srcdir)/misc/sgilinkhack.cxx -o sgilinkhack.@LTO@
|
$(CXX) $(LOCALFLAGS) $(CXXFLAGS) -c $(srcdir)/misc/sgilinkhack.cxx -o sgilinkhack.@LTO@
|
||||||
|
|
||||||
$(WXDIR)/libwx_xt.@LIBSFX@:
|
$(WXDIR)/libwx_xt.@LIBSFX@:
|
||||||
$(MAKE) wx
|
$(MAKE) wx
|
||||||
|
|
|
@ -170,10 +170,10 @@ mzscheme.multiboot : libmzscheme.@LIBSFX@ libmzgc.@LIBSFX@ main.@LTO@
|
||||||
DEF_COLLECTS_DIR = -DINITIAL_COLLECTS_DIRECTORY='"'"`cd $(srcdir)/../../collects; pwd`"'"'
|
DEF_COLLECTS_DIR = -DINITIAL_COLLECTS_DIRECTORY='"'"`cd $(srcdir)/../../collects; pwd`"'"'
|
||||||
|
|
||||||
main.@LTO@: $(srcdir)/main.c $(srcdir)/include/scheme.h $(srcdir)/sconfig.h $(srcdir)/src/stypes.h $(srcdir)/cmdline.inc $(srcdir)/oskglue.inc
|
main.@LTO@: $(srcdir)/main.c $(srcdir)/include/scheme.h $(srcdir)/sconfig.h $(srcdir)/src/stypes.h $(srcdir)/cmdline.inc $(srcdir)/oskglue.inc
|
||||||
$(CC) @CFLAGS@ @COMPFLAGS@ @PREFLAGS@ @PROFFLAGS@ @OPTIONS@ @MZOPTIONS@ $(DEF_COLLECTS_DIR) -I$(builddir) -I$(srcdir)/include -c $(srcdir)/main.c -o main.@LTO@
|
$(CC) -I$(builddir) -I$(srcdir)/include @CFLAGS@ @COMPFLAGS@ @PREFLAGS@ @PROFFLAGS@ @OPTIONS@ @MZOPTIONS@ $(DEF_COLLECTS_DIR) -c $(srcdir)/main.c -o main.@LTO@
|
||||||
|
|
||||||
main_ee.@LTO@: main.@LTO@
|
main_ee.@LTO@: main.@LTO@
|
||||||
$(CC) @CFLAGS@ @COMPFLAGS@ @PREFLAGS@ @PROFFLAGS@ @OPTIONS@ @MZOPTIONS@ $(DEF_COLLECTS_DIR) -I$(builddir) -I$(srcdir)/include -DSTANDALONE_WITH_EMBEDDED_EXTENSION -c $(srcdir)/main.c -o main_ee.@LTO@
|
$(CC) -I$(builddir) -I$(srcdir)/include @CFLAGS@ @COMPFLAGS@ @PREFLAGS@ @PROFFLAGS@ @OPTIONS@ @MZOPTIONS@ $(DEF_COLLECTS_DIR) -DSTANDALONE_WITH_EMBEDDED_EXTENSION -c $(srcdir)/main.c -o main_ee.@LTO@
|
||||||
|
|
||||||
ee-main:
|
ee-main:
|
||||||
$(MAKE) main_ee.@LTO@
|
$(MAKE) main_ee.@LTO@
|
||||||
|
|
|
@ -18,8 +18,9 @@ AR = @AR@
|
||||||
ARFLAGS = @ARFLAGS@
|
ARFLAGS = @ARFLAGS@
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
|
|
||||||
CPPFLAGS = @PREFLAGS@ @OPTIONS@ @GC2OPTIONS@ @MZOPTIONS@ -I$(builddir)/.. -I$(srcdir)/../include
|
MOST_CPPFLAGS = @PREFLAGS@ @OPTIONS@ @GC2OPTIONS@ @MZOPTIONS@
|
||||||
CFLAGS = @CFLAGS@ $(CPPFLAGS) @COMPFLAGS@ @PROFFLAGS@
|
CPPFLAGS = -I$(builddir)/.. -I$(srcdir)/../include $(MOST_CPPFLAGS)
|
||||||
|
CFLAGS = -I$(builddir)/.. -I$(srcdir)/../include @CFLAGS@ $(MOST_CPPFLAGS) @COMPFLAGS@ @PROFFLAGS@
|
||||||
LIBS = @LIBS@
|
LIBS = @LIBS@
|
||||||
|
|
||||||
ARLIBFLAGS = @LDFLAGS@ $(LIBS)
|
ARLIBFLAGS = @LDFLAGS@ $(LIBS)
|
||||||
|
|
|
@ -10,7 +10,7 @@ PERL = @PERL@
|
||||||
|
|
||||||
MZSRC = $(srcdir)
|
MZSRC = $(srcdir)
|
||||||
|
|
||||||
CFLAGS = @CFLAGS@ @COMPFLAGS@ @PREFLAGS@ @PROFFLAGS@ @OPTIONS@ @MZOPTIONS@ -I$(builddir)/.. -I$(srcdir)/../include
|
CFLAGS = -I$(builddir)/.. -I$(srcdir)/../include @CFLAGS@ @COMPFLAGS@ @PREFLAGS@ @PROFFLAGS@ @OPTIONS@ @MZOPTIONS@
|
||||||
|
|
||||||
OBJS = salloc.@LTO@ \
|
OBJS = salloc.@LTO@ \
|
||||||
bignum.@LTO@ \
|
bignum.@LTO@ \
|
||||||
|
|
Loading…
Reference in New Issue
Block a user