50 lines
1.5 KiB
Text
50 lines
1.5 KiB
Text
--- src/Makefile.in.orig Fri Oct 24 00:22:46 2003
|
|
+++ src/Makefile.in Sun Nov 2 14:10:46 2003
|
|
@@ -101,8 +101,8 @@
|
|
LY_HFILES := kimwy.h
|
|
LY_TFILE := kimwy.output
|
|
LY_OBJS := $(LY_CFILES:cc=o)
|
|
-GETOPT_CFILES := getopt.h getopt.c getopt1.c
|
|
-GETOPT_OBJS := getopt.o getopt1.o
|
|
+#GETOPT_CFILES := getopt.h getopt.c getopt1.c
|
|
+#GETOPT_OBJS := getopt.o getopt1.o
|
|
DF_HFILES := defs.h defs.hh
|
|
ERRMSG_CC_FILE := errmsg.inc
|
|
|
|
@@ -160,20 +160,20 @@
|
|
#YCFLAGS += -DMYLEXDEBUG
|
|
#YCFLAGS += -DYYDEBUG=1 -DMYLEXDEBUG
|
|
DEFINES := -DARCH=$(ARCH) @hashset@
|
|
-CXXFLAGS := -g
|
|
-CXXFLAGSOPT := -O2
|
|
+#CXXFLAGS := -g
|
|
+CXXFLAGSOPT := @CXXFLAGS@ @CPPFLAGS@
|
|
CFLAGS := $(CXXFLAGS) -DHAVE_CONFIG_H -I.
|
|
|
|
ifneq (,$(findstring ++,$(CXX)))
|
|
# -ansi should be here but it's buggy (and should be called -iso anyway)
|
|
-CXXFLAGS := -Wall -Wno-unused -Wno-uninitialized -g
|
|
-CXXFLAGSOPT := $(CXXFLAGSOPT)\ -s\ -Os
|
|
+#CXXFLAGS := -Wall -Wno-unused -Wno-uninitialized -g
|
|
+#CXXFLAGSOPT := $(CXXFLAGSOPT)\ -s\ -Os
|
|
ifeq "$(WARN)" "y"
|
|
CXXFLAGS += -Wold-style-cast -Weffc++
|
|
endif
|
|
endif
|
|
override CXXFLAGS += $(INCLUDES) $(DEFINES)
|
|
-LIBS := @PYLIBS@
|
|
+LIBS := @PYLIBS@ @LDFLAGS@
|
|
PYCFLAGS := @PYCFLAGS@
|
|
LINT_CFLAGS := $(INCLUDES) $(GENDEFINES)
|
|
MALLOC_LDFLAGS := $(ANY_ARCH_MALLOC_LDFLAGS)
|
|
@@ -202,8 +202,8 @@
|
|
cp $(MAKERUNDIR)/$(CONFIGFILE) $(CONFIGFILE); \
|
|
touch tstamp.kc ; \
|
|
$(MAKE) -e -f $(MAKERUNDIR)/Makefile \
|
|
- MAKERUNDIR=$(MAKERUNDIR) \
|
|
- CXXFLAGS=$(CXXFLAGSOPT) \
|
|
+ MAKERUNDIR="$(MAKERUNDIR)" \
|
|
+ CXXFLAGS="$(CXXFLAGSOPT)" \
|
|
$(BOOTSTRAPTARGET)
|
|
|
|
s1:
|