ChangeLogTag:Wed Jul 14 20:02:55 1999 Gonzalo A. Diethelm <Gonzalo.Diethelm@jda.cl>
This commit is contained in:
@@ -1,3 +1,22 @@
|
||||
Wed Jul 14 20:02:55 1999 Gonzalo A. Diethelm <Gonzalo.Diethelm@jda.cl>
|
||||
|
||||
* config/bin.cf:
|
||||
* config/c.cf:
|
||||
* config/global.cf:
|
||||
* config/header.cf:
|
||||
* config/lib.cf:
|
||||
* config/rules.cf:
|
||||
* config/win32/bcc32.cf:
|
||||
* config/win32/gcc.cf:
|
||||
* config/win32/icc.cf:
|
||||
* config/win32/msvc.cf:
|
||||
Now there are two sets of variables to control compilation and
|
||||
installation: HB_*_COMPILE points to where to get all the files
|
||||
(binaries, includes, etc.); if not defined, it will pick them off
|
||||
the working repository. HB_*_INSTALL points to where you want to
|
||||
install the files (binaries, includes, etc.) when you issue a
|
||||
"make install".
|
||||
|
||||
Wed Jul 14 18:20:24 1999 Gonzalo A. Diethelm <Gonzalo.Diethelm@jda.cl>
|
||||
|
||||
* config/global.cf:
|
||||
|
||||
@@ -27,6 +27,6 @@ $(EXE_NAME) : $(ALL_OBJS)
|
||||
|
||||
|
||||
INSTALL_OBJS = $(EXE_ARCH)
|
||||
INSTALL_DIR = $(HB_BIN_DIR)
|
||||
INSTALL_DIR = $(HB_BIN_INSTALL)
|
||||
|
||||
include $(TOP)$(ROOT)config/install.cf
|
||||
|
||||
@@ -13,14 +13,14 @@ YACC_H_TMP = $(YACC_C:.c=.h)
|
||||
YACC_H = y_tab.h
|
||||
YACC_OUTPUT = $(YACC_C:.c=.out)
|
||||
YACC_OBJ = $(YACC_C:.c=$(OBJ_EXT))
|
||||
YACC_HB_H := $(foreach h, $(YACC_HEADERS), $(HB_INC_DIR)/$(h))
|
||||
YACC_HB_H := $(foreach h, $(YACC_HEADERS), $(HB_INC_COMPILE)/$(h))
|
||||
endif
|
||||
|
||||
ifdef LEX_SOURCE
|
||||
LEX_BASE = $(LEX_SOURCE:.l=)
|
||||
LEX_C = $(LEX_BASE)l.c
|
||||
LEX_OBJ = $(LEX_C:.c=$(OBJ_EXT))
|
||||
LEX_HB_H := $(foreach h, $(LEX_HEADERS), $(HB_INC_DIR)/$(h))
|
||||
LEX_HB_H := $(foreach h, $(LEX_HEADERS), $(HB_INC_COMPILE)/$(h))
|
||||
endif
|
||||
|
||||
ALL_C_OBJS = $(C_OBJS) $(MAIN_OBJ) $(YACC_OBJ) $(LEX_OBJ)
|
||||
|
||||
@@ -11,23 +11,23 @@ include $(TOP)$(ROOT)config/$(ARCH).cf
|
||||
# How to run Harbour.
|
||||
#
|
||||
|
||||
ifeq ($(HB_BIN_DIR),)
|
||||
HB_BIN_DIR := $(TOP)$(ROOT)source/compiler/$(ARCH)
|
||||
ifeq ($(HB_BIN_COMPILE),)
|
||||
HB_BIN_COMPILE := $(TOP)$(ROOT)source/compiler/$(ARCH)
|
||||
endif
|
||||
|
||||
ifeq ($(HB_INC_DIR),)
|
||||
HB_INC_DIR := $(TOP)$(ROOT)include
|
||||
ifeq ($(HB_INC_COMPILE),)
|
||||
HB_INC_COMPILE := $(TOP)$(ROOT)include
|
||||
endif
|
||||
|
||||
ifeq ($(HB_LIB_DIR),)
|
||||
HB_LIB_DIR :=
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
HB_LIB_COMPILE :=
|
||||
endif
|
||||
|
||||
HB := $(notdir $(HB_BIN_DIR))
|
||||
HB := $(notdir $(HB_BIN_COMPILE))
|
||||
ifneq ($(HB),)
|
||||
# there is no slash at the end
|
||||
HB := $(HB_BIN_DIR)/
|
||||
HB := $(HB_BIN_COMPILE)/
|
||||
endif
|
||||
HB := $(HB)harbour$(EXE_EXT)
|
||||
|
||||
HB_FLAGS = -n -q -I$(TOP) -I$(HB_INC_DIR)
|
||||
HB_FLAGS = -n -q -I$(TOP) -I$(HB_INC_COMPILE)
|
||||
|
||||
@@ -12,6 +12,6 @@ ALL_HEADERS = $(C_HEADERS) $(PRG_HEADERS) $(API_HEADERS)
|
||||
first :
|
||||
|
||||
INSTALL_OBJS = $(ALL_HEADERS)
|
||||
INSTALL_DIR = $(HB_INC_DIR)
|
||||
INSTALL_DIR = $(HB_INC_INSTALL)
|
||||
|
||||
include $(TOP)$(ROOT)config/install.cf
|
||||
|
||||
@@ -29,6 +29,6 @@ $(LIB_NAME) : $(ALL_OBJS)
|
||||
|
||||
|
||||
INSTALL_OBJS = $(LIB_ARCH)
|
||||
INSTALL_DIR = $(HB_LIB_DIR)
|
||||
INSTALL_DIR = $(HB_LIB_INSTALL)
|
||||
|
||||
include $(TOP)$(ROOT)config/install.cf
|
||||
|
||||
@@ -10,33 +10,14 @@ YACC_FLAGS = -d
|
||||
LEX = flex
|
||||
LEX_FLAGS = -i -8
|
||||
|
||||
#
|
||||
# How to run Harbour.
|
||||
#
|
||||
|
||||
# First, check whether an executable exists in the working repository.
|
||||
HB := $(wildcard $(TOP)$(ROOT)source/compiler/$(ARCH)/harbour$(EXE_EXT))
|
||||
|
||||
ifneq ($(HB),)
|
||||
|
||||
# OK, we work off the working repository.
|
||||
HBINC := $(TOP)$(ROOT)source/include
|
||||
|
||||
else
|
||||
|
||||
# Use an executable installed in the BIN directory.
|
||||
|
||||
HB := $(notdir $(HB_BIN_DIR))
|
||||
HB := $(notdir $(HB_BIN_COMPILE))
|
||||
ifneq ($(HB),)
|
||||
# there is no slash at the end
|
||||
HB := $(HB_BIN_DIR)/
|
||||
HB := $(HB_BIN_COMPILE)/
|
||||
endif
|
||||
HB := $(HB)harbour$(EXE_EXT)
|
||||
HBINC := $(HB_INC_DIR)
|
||||
|
||||
endif
|
||||
|
||||
HB_FLAGS = -n -q -I$(TOP) -I$(HBINC)
|
||||
HB_FLAGS = -n -q -I$(TOP) -I$(HB_INC_COMPILE)
|
||||
|
||||
# The rule to link an executable.
|
||||
ifeq ($(LD_RULE),)
|
||||
|
||||
@@ -14,20 +14,20 @@ LIB_PREF =
|
||||
LIB_EXT = .lib
|
||||
|
||||
$(HB_ARCHITECTURE)_$(HB_COMPILER)_GRANDP = $(subst /,\\,$(GRANDP))
|
||||
_HB_INC_DIR = $(subst /,\\,$(HB_INC_DIR))
|
||||
_HL = $(notdir $(HB_LIB_DIR))
|
||||
_HB_INC_COMPILE = $(subst /,\\,$(HB_INC_COMPILE))
|
||||
_HL = $(notdir $(HB_LIB_COMPILE))
|
||||
ifeq ($(_HL),)
|
||||
#there is an ending slash
|
||||
_HB_LIB_DIR = $(subst /,\,$(HB_LIB_DIR))
|
||||
_HB_LIB_COMPILE = $(subst /,\,$(HB_LIB_COMPILE))
|
||||
else
|
||||
_HB_LIB_DIR = $(subst /,\,$(HB_LIB_DIR)/)
|
||||
_HB_LIB_COMPILE = $(subst /,\,$(HB_LIB_COMPILE)/)
|
||||
endif
|
||||
|
||||
CC = bcc32
|
||||
CC_IN = -c
|
||||
CC_OUT = -o
|
||||
CPPFLAGS = -O2
|
||||
CFLAGS = -i. -i$(_HB_INC_DIR)
|
||||
CFLAGS = -i. -i$(_HB_INC_COMPILE)
|
||||
|
||||
#Note: The empty line below HAVE TO exist!
|
||||
define link_file
|
||||
@@ -45,7 +45,7 @@ endef
|
||||
|
||||
LD = bcc32
|
||||
LDFLAGS = -O2
|
||||
LINKLIBS = $(foreach lib, $(LIBS), $(_HB_LIB_DIR)$(lib))
|
||||
LINKLIBS = $(foreach lib, $(LIBS), $(_HB_LIB_COMPILE)$(lib))
|
||||
LD_RULE = $(link_exe_file)
|
||||
|
||||
#Note: The empty line below HAVE TO exist!
|
||||
|
||||
@@ -12,15 +12,15 @@ LIB_EXT = .a
|
||||
CC = gcc
|
||||
CC_IN = -c
|
||||
CC_OUT = -o
|
||||
CPPFLAGS = -DDEBUG -I. -I$(HB_INC_DIR)
|
||||
CPPFLAGS = -DDEBUG -I. -I$(HB_INC_COMPILE)
|
||||
CFLAGS = -Wall -g
|
||||
|
||||
LD = gcc
|
||||
LD_OUT = -o
|
||||
ifeq ($(HB_LIB_DIR),)
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKPATHS = $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH))
|
||||
else
|
||||
LINKPATHS = -L$(HB_LIB_DIR)
|
||||
LINKPATHS = -L$(HB_LIB_COMPILE)
|
||||
endif
|
||||
LINKLIBS = $(foreach lib, $(LIBS), -l$(lib))
|
||||
# LINKLIBS += -lm
|
||||
|
||||
@@ -14,20 +14,20 @@ LIB_PREF =
|
||||
LIB_EXT = .lib
|
||||
|
||||
$(HB_ARCHITECTURE)_$(HB_COMPILER)_GRANDP = $(subst /,\\,$(GRANDP))
|
||||
_HB_INC_DIR = $(subst /,\\,$(HB_INC_DIR))
|
||||
_HL = $(notdir $(HB_LIB_DIR))
|
||||
_HB_INC_COMPILE = $(subst /,\\,$(HB_INC_COMPILE))
|
||||
_HL = $(notdir $(HB_LIB_COMPILE))
|
||||
ifeq ($(_HL),)
|
||||
#there is an ending slash
|
||||
_HB_LIB_DIR = $(subst /,\,$(HB_LIB_DIR))
|
||||
_HB_LIB_COMPILE = $(subst /,\,$(HB_LIB_COMPILE))
|
||||
else
|
||||
_HB_LIB_DIR = $(subst /,\,$(HB_LIB_DIR)/)
|
||||
_HB_LIB_COMPILE = $(subst /,\,$(HB_LIB_COMPILE)/)
|
||||
endif
|
||||
|
||||
CC = icc
|
||||
CC_IN = /Tp
|
||||
CC_OUT = /Fo
|
||||
CPPFLAGS = /C+
|
||||
CFLAGS = /W2 /Sd /Se+ /Ti+ /i. /i$(_HB_INC_DIR)
|
||||
CFLAGS = /W2 /Sd /Se+ /Ti+ /i. /i$(_HB_INC_COMPILE)
|
||||
|
||||
#Note: The empty line below HAVE TO exist!
|
||||
define link_file
|
||||
@@ -45,7 +45,7 @@ endef
|
||||
|
||||
LD = icc
|
||||
LDFLAGS = $(CFLAGS)
|
||||
LINKLIBS = $(foreach lib, $(LIBS), $(_HB_LIB_DIR)$(lib))
|
||||
LINKLIBS = $(foreach lib, $(LIBS), $(_HB_LIB_COMPILE)$(lib))
|
||||
LD_RULE = $(link_exe_file)
|
||||
|
||||
#Note: The empty line below HAVE TO exist!
|
||||
|
||||
@@ -10,15 +10,15 @@ LIB_EXT = .lib
|
||||
CC = cl.exe
|
||||
CC_IN = -c
|
||||
CC_OUT = -Fo
|
||||
CPPFLAGS = -DDEBUG -I. -I$(HB_INC_DIR)
|
||||
CPPFLAGS = -DDEBUG -I. -I$(HB_INC_COMPILE)
|
||||
CFLAGS = -W0 -Zi # -W4 for max warnings
|
||||
|
||||
LD = cl.exe
|
||||
LD_OUT = -Fe
|
||||
ifeq ($(HB_LIB_DIR),)
|
||||
ifeq ($(HB_LIB_COMPILE),)
|
||||
LINKPATHS = -link $(foreach lib, $(LIBS), -LIBPATH:$(TOP)$(ROOT)source/$(lib)/$(ARCH))
|
||||
else
|
||||
LINKPATHS = -link -LIBPATH:$(HB_LIB_DIR)
|
||||
LINKPATHS = -link -LIBPATH:$(HB_LIB_COMPILE)
|
||||
endif
|
||||
LINKLIBS = $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
|
||||
# LINKLIBS += -lm
|
||||
|
||||
Reference in New Issue
Block a user