fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ChangeLogTag:Mon Jun 07 20:20:32 1999 Gonzalo A. Diethelm <Gonzalo.Diethelm@jda.cl>

Browse Source
This commit is contained in:
Gonzalo A. Diethelm
1999-06-08 01:21:08 +00:00
parent eba4c12137
commit a3601c83bc
12 changed files with 54 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
harbour/ChangeLog
View File

@@ -1,3 +1,19 @@
Mon Jun 07 20:20:32 1999 Gonzalo A. Diethelm <Gonzalo.Diethelm@jda.cl>
* config/bin.cf:
* config/c.cf:
* config/dir.cf:
* config/global.cf:
* config/install.cf:
* config/lib.cf:
* config/test.cf:
* config/win32/gcc.cf:
* config/win32/global.cf:
* config/win32/msvc.cf:
* config/win32/rules.cf:
Updated rules so they work under WinNT CMD.EXE without any Unix
utilities installed.
19990607-19:45 EDT David G. Holm <dholm@jsd-llc.com>
* include/extend.h
- Moved "#include <limits.h>" to include/types.h

4
harbour/config/bin.cf
View File

@@ -13,9 +13,7 @@ ALL_OBJS = $(ALL_C_OBJS) $(ALL_PRG_OBJS)
first : dirbase descend
descend :
@cd $(ARCH_DIR); \
$(MAKE) -f $(GRANDP)Makefile 'TOP=$(GRANDP)' $(EXE_NAME); \
cd $(GRANDP)
$(MAKE) -C $(ARCH_DIR) -f $(GRANDP)Makefile 'TOP=$(GRANDP)' $(EXE_NAME)
$(EXE_NAME) : $(ALL_OBJS)
$(LD_RULE)

6
harbour/config/c.cf
View File

@@ -7,7 +7,8 @@ C_OBJS = $(C_SOURCES:.c=$(OBJ_EXT))
MAIN_OBJ = $(C_MAIN:.c=$(OBJ_EXT))
ifdef YACC_SOURCE
YACC_C = $(shell echo $(YACC_SOURCE) | cut -c1-4)_y.c
YACC_BASE = $(YACC_SOURCE:.y=)
YACC_C = $(YACC_BASE)y.c
YACC_H_TMP = $(YACC_C:.c=.h)
YACC_H = y_tab.h
YACC_OUTPUT = $(YACC_C:.c=.out)
@@ -15,7 +16,8 @@ YACC_OBJ = $(YACC_C:.c=$(OBJ_EXT))
endif
ifdef LEX_SOURCE
LEX_C = $(shell echo $(LEX_SOURCE) | cut -c1-4)_l.c
LEX_BASE = $(LEX_SOURCE:.l=)
LEX_C = $(LEX_BASE)l.c
LEX_OBJ = $(LEX_C:.c=$(OBJ_EXT))
endif

4
harbour/config/dir.cf
View File

@@ -5,8 +5,12 @@
all : first
first clean install ::
ifeq (Windows,$(findstring Windows,$(OS)))
@cmd /c FOR /D %d IN ($(DIRS)) DO @$(MAKE) -C %d $@
else # ! Windows
@for d in $(DIRS); do \
if [ -d $$d ]; then \
$(MAKE) -C $$d $@; \
fi \
done
endif # ! Windows

17
harbour/config/global.cf
View File

@@ -7,17 +7,22 @@ all : first
GRANDP = ../../
ARCH = $(HB_ARCHITECTURE)/$(HB_COMPILER)
ifeq (Windows,$(findstring Windows,$(OS)))
ARCH_DIR = $(subst /,\\,$(ARCH))\\
else # ! Windows
ARCH_DIR = $(ARCH)/
endif
include $(TOP)$(ROOT)config/$(ARCH).cf
dirbase::
@if [ ! -d $(HB_ARCH) ]; then \
$(MD) $(HB_ARCH); \
fi; \
if [ ! -d $(ARCH_DIR) ]; then \
$(MD) $(ARCH_DIR); \
fi
ifeq (Windows,$(findstring Windows,$(OS)))
-$(MD) $(HB_ARCHITECTURE)
-$(MD) $(ARCH_DIR) >NUL
else # ! Windows
@[ -d $(HB_ARCHITECTURE) ] || $(MD) $(HB_ARCHITECTURE) ]; \
[ -d $(ARCH_DIR) ] || $(MD) $(ARCH_DIR) ]
endif
clean::
$(RM) -r $(ARCH_DIR)

4
harbour/config/install.cf
View File

@@ -3,6 +3,9 @@
#
install:: first
ifeq (Windows,$(findstring Windows,$(OS)))
@cmd /c FOR %f IN ($(INSTALL_OBJS)) DO @COPY %f $(INSTALL_DIR)
else # ! Windows
@if [ ! -d $(INSTALL_DIR) ]; \
then \
echo "! Can't install, path not found:" $(INSTALL_DIR); \
@@ -18,3 +21,4 @@ install:: first
fi \
done \
fi
endif # ! Windows

4
harbour/config/lib.cf
View File

@@ -14,9 +14,7 @@ ALL_OBJS = $(ALL_C_OBJS) $(ALL_PRG_OBJS)
first : dirbase descend
descend :
@cd $(ARCH_DIR); \
$(MAKE) -f $(GRANDP)Makefile 'TOP=$(GRANDP)' $(LIB_NAME); \
cd $(GRANDP)
$(MAKE) -C $(ARCH_DIR) -f $(GRANDP)Makefile 'TOP=$(GRANDP)' $(LIB_NAME)
$(LIB_NAME) : $(ALL_OBJS)
$(AR_RULE)

4
harbour/config/test.cf
View File

@@ -8,6 +8,4 @@ include $(TOP)$(ROOT)config/prg.cf
first : dirbase descend
descend :
@cd $(ARCH_DIR); \
$(MAKE) -f $(GRANDP)Makefile 'TOP=$(GRANDP)' $(PRG_EXES); \
cd $(GRANDP)
$(MAKE) -C $(ARCH_DIR) -f $(GRANDP)Makefile 'TOP=$(GRANDP)' $(PRG_EXES)

10
harbour/config/win32/gcc.cf
View File

@@ -2,7 +2,7 @@
# $Id$
#
include $(TOP)$(ROOT)config/$(ARCHITECTURE)/global.cf
include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
OBJ_EXT = .o
EXE_EXT = .exe
@@ -11,13 +11,13 @@ LIB_EXT = .a
CC = gcc
CC_OUT = -o
CPPFLAGS = -DDEBUG -I. -I$(INC_DIR)
CPPFLAGS = -DDEBUG -I. -I$(HB_INC_DIR)
CFLAGS = -Wall -g
LD = gcc
LD_OUT = -o
ifdef LIB_DIR
LDFLAGS = -L$(LIB_DIR)
ifdef HB_LIB_DIR
LDFLAGS = -L$(HB_LIB_DIR)
endif
LINKLIBS = $(foreach lib, $(LIBS), -l$(lib))
# LINKLIBS += -lm
@@ -26,4 +26,4 @@ AR = ar
ARFLAGS =
AR_RULE = $(AR) $(ARFLAGS) r $@ $^ || $(RM) $@
include $(TOP)$(ROOT)config/$(ARCHITECTURE)/rules.cf
include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/rules.cf

2
harbour/config/win32/global.cf
View File

@@ -5,4 +5,4 @@
RM = rm -f
CP = cp -f
MV = mv -f
MD = mkdir -p
MD = mkdir

10
harbour/config/win32/msvc.cf
View File

@@ -2,7 +2,7 @@
# $Id$
#
include $(TOP)$(ROOT)config/$(ARCHITECTURE)/global.cf
include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
OBJ_EXT = .obj
EXE_EXT = .exe
@@ -11,13 +11,13 @@ LIB_EXT = .lib
CC = cl.exe
CC_OUT = -Fo
CPPFLAGS = -DDEBUG -I. -I$(INC_DIR)
CPPFLAGS = -DDEBUG -I. -I$(HB_INC_DIR)
CFLAGS = -W0 -Zi # -W4 for max warnings
LD = cl.exe
LD_OUT = -Fe
ifdef LIB_DIR
LDFLAGS += -link -LIBPATH:$(LIB_DIR)
ifdef HB_LIB_DIR
LDFLAGS += -link -LIBPATH:$(HB_LIB_DIR)
endif
LINKLIBS = $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
@@ -25,4 +25,4 @@ AR = lib.exe
ARFLAGS =
AR_RULE = $(AR) $(ARFLAGS) /out:$@ $^ || $(RM) $@
include $(TOP)$(ROOT)config/$(ARCHITECTURE)/rules.cf
include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/rules.cf

2
harbour/config/win32/rules.cf
View File

@@ -12,7 +12,7 @@ LEX_FLAGS = -i
# How to run Harbour.
HB = harbour$(EXE_EXT)
HB_FLAGS = -n -q -I$(TOP) -I$(INC_DIR)
HB_FLAGS = -n -q -I$(TOP) -I$(HB_INC_DIR)
# The rule to link an executable.
LD_RULE = $(LD) $(CFLAGS) $(LD_OUT)$@ $^ $(LDFLAGS) $(LINKLIBS)