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

2001-09-05 11:30 UTC-0800 Brian Hays <bhays@abacuslaw.com>

Browse Source
This commit is contained in:
Brian Hays
2001-09-05 18:19:21 +00:00
parent bd3a65ad87
commit d2f6da18fe
7 changed files with 354 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
harbour/ChangeLog
View File

@@ -1,3 +1,21 @@
2001-09-05 11:25 UTC-0800 Brian Hays <bhays@abacuslaw.com>
* b32_slex.bat
* make_b32.bat
+ Added default setting for $(DEL) and $(ECHO).
* makefile.bc
+ Added macros $(DEL) and $(ECHO) to allow needed redefinition under
Win2K/Xp
* hb_slex.bc
* Synched with makefile.bc
* source/compiler/harbour.slx
* Removed unused piece of code in
* source/compiler/simplex.c
* changed two HB_SYMBOL_UNUSED() to (void) (to not use
external macros in core simplex).
2001-09-05 12:24 GMT+1 Antonio Linares <alinares@fivetech.com>
* harbour/source/rtl/persist.prg

14
harbour/b32_slex.bat
View File

@@ -3,6 +3,19 @@ rem
rem $Id$
rem
rem "echo." intentionally used instead of "echo", to avoid conflicts
rem with external commands named echo.
rem using macros for ECHO and DEL to allow overiding such as:
rem
rem SET ECHO=cmd /c echo
rem SET DEL=cmd /c del
rem
rem The above might be needed on Windows 2000 and XP.
rem The macros are referenced in hb_slex.bc
if "%ECHO%"=="" SET ECHO=echo.
if "%DEL%"=="" SET DEL=del
if "%1" == "clean" goto CLEAN
if "%1" == "CLEAN" goto CLEAN
@@ -41,3 +54,4 @@ if "%1" == "CLEAN" goto CLEAN
:EXIT

296
harbour/hb_slex.bc
View File

@@ -22,11 +22,6 @@
# (search for HB_GT_LIBS for a list of values)
#
#
# NOTE: "echo." intentionally used instead of "echo", to avoid conflicts
# with external commands named echo.
#
#
# NOTE: BCC_NOSTARTUP must be defined for Borland C++ 5.3 to make it work.
#
@@ -228,6 +223,8 @@ RTL_LIB_OBJS = \
$(OBJ_DIR)\minmax.obj \
$(OBJ_DIR)\mlcount.obj \
$(OBJ_DIR)\mlpos.obj \
$(OBJ_DIR)\mlctopos.obj \
$(OBJ_DIR)\mpostolc.obj \
$(OBJ_DIR)\mod.obj \
$(OBJ_DIR)\mouseapi.obj \
$(OBJ_DIR)\mousex.obj \
@@ -306,6 +303,8 @@ RTL_LIB_OBJS = \
$(OBJ_DIR)\memvarbl.obj \
$(OBJ_DIR)\menuto.obj \
$(OBJ_DIR)\objfunc.obj \
$(OBJ_DIR)\persist.obj \
$(OBJ_DIR)\profiler.obj \
$(OBJ_DIR)\pushbtn.obj \
$(OBJ_DIR)\radiobtn.obj \
$(OBJ_DIR)\radiogrp.obj \
@@ -391,8 +390,8 @@ RDD_LIB_OBJS = \
$(OBJ_DIR)\sdf1.obj \
\
$(OBJ_DIR)\dbf0.obj \
$(OBJ_DIR)\dblist.obj \
$(OBJ_DIR)\dbfuncs.obj \
$(OBJ_DIR)\dblist.obj \
$(OBJ_DIR)\dbsort.obj \
$(OBJ_DIR)\hbdbsort.obj \
$(OBJ_DIR)\dbstrux.obj \
@@ -736,29 +735,29 @@ $(OBJ_DIR)\pragma.obj : $(PP_DIR)\pragma.c
#
$(HARBOUR_EXE) : $(HARBOUR_EXE_OBJS)
echo. $(CFLAGS) > make.tmp
echo. -e$(HARBOUR_EXE) >> make.tmp
echo. $(OBJ_DIR)\harbour.obj >> make.tmp
echo. $(OBJ_DIR)\harboury.obj >> make.tmp
echo. $(OBJ_DIR)\hbslex.obj >> make.tmp
echo. $(OBJ_DIR)\cmdcheck.obj >> make.tmp
echo. $(OBJ_DIR)\hbusage.obj >> make.tmp
echo. $(OBJ_DIR)\hbident.obj >> make.tmp
echo. $(OBJ_DIR)\hbgenerr.obj >> make.tmp
echo. $(OBJ_DIR)\hbpcode.obj >> make.tmp
echo. $(OBJ_DIR)\hbfix.obj >> make.tmp
echo. $(OBJ_DIR)\genc.obj >> make.tmp
echo. $(OBJ_DIR)\gencobj.obj >> make.tmp
echo. $(OBJ_DIR)\genobj32.obj >> make.tmp
echo. $(OBJ_DIR)\genjava.obj >> make.tmp
echo. $(OBJ_DIR)\genhrb.obj >> make.tmp
echo. $(OBJ_DIR)\expropta.obj >> make.tmp
echo. $(OBJ_DIR)\exproptb.obj >> make.tmp
echo. $(OBJ_DIR)\exproptc.obj >> make.tmp
echo. $(OBJ_DIR)\hbfunchk.obj >> make.tmp
echo. $(COMMON_LIB) $(PP_LIB) >> make.tmp
$(ECHO) $(CFLAGS) > make.tmp
$(ECHO) -e$(HARBOUR_EXE) >> make.tmp
$(ECHO) $(OBJ_DIR)\harbour.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\harboury.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\hbslex.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\cmdcheck.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\hbusage.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\hbident.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\hbgenerr.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\hbpcode.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\hbfix.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genc.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\gencobj.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genobj32.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genjava.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genhrb.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\expropta.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\exproptb.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\exproptc.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\hbfunchk.obj >> make.tmp
$(ECHO) $(COMMON_LIB) $(PP_LIB) >> make.tmp
$(CC) @make.tmp
del make.tmp
$(DEL) make.tmp
$(OBJ_DIR)\harbour.obj : $(COMPILER_DIR)\harbour.c
$(CC) $(CLIBFLAGS) -o$@ $**
@@ -773,9 +772,9 @@ $(OBJ_DIR)\harboury.obj : $(OBJ_DIR)\harboury.c
$(CC) $(CLIBFLAGS) -o$@ $**
#$(OBJ_DIR)\harbourl.obj : $(COMPILER_DIR)\harbourl.c
# -echo. > $(OBJ_DIR)\unistd.h
# -$(ECHO) > $(OBJ_DIR)\unistd.h
# $(CC) $(CLIBFLAGS) -I$(OBJ_DIR) -o$@ $**
# -del $(OBJ_DIR)\unistd.h
# -$(DEL) $(OBJ_DIR)\unistd.h
$(OBJ_DIR)\hbslex.obj : $(COMPILER_DIR)\hbslex.c
$(CC) $(CLIBFLAGS) -I$(OBJ_DIR) -o$@ $**
@@ -862,7 +861,6 @@ $(OBJ_DIR)\dbfuncs.obj : $(OBJ_DIR)\dbfuncs.c
$(CC) $(CLIBFLAGS) -o$@ $**
tlib $(RDD_LIB) $(ARFLAGS) -+$@,,
$(OBJ_DIR)\dbsort.c : $(RDD_DIR)\dbsort.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
@@ -1148,6 +1146,7 @@ $(OBJ_DIR)\checkbox.obj : $(OBJ_DIR)\checkbox.c
$(CC) $(CLIBFLAGS) -o$@ $**
tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
$(OBJ_DIR)\chrasc.obj : $(RTL_DIR)\chrasc.c
$(CC) $(CLIBFLAGS) -o$@ $**
tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
@@ -1422,6 +1421,14 @@ $(OBJ_DIR)\mlpos.obj : $(RTL_DIR)\mlpos.c
$(CC) $(CLIBFLAGS) -o$@ $**
tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
$(OBJ_DIR)\mpostolc.obj : $(RTL_DIR)\mpostolc.c
$(CC) $(CLIBFLAGS) -o$@ $**
tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
$(OBJ_DIR)\mlctopos.obj : $(RTL_DIR)\mlctopos.c
$(CC) $(CLIBFLAGS) -o$@ $**
tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
$(OBJ_DIR)\mod.obj : $(RTL_DIR)\mod.c
$(CC) $(CLIBFLAGS) -o$@ $**
tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
@@ -1493,10 +1500,17 @@ $(OBJ_DIR)\philesx.obj : $(RTL_DIR)\philesx.c
$(CC) $(CLIBFLAGS) -o$@ $**
tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
$(OBJ_DIR)\radiobtn.c : $(RTL_DIR)\radiobtn.prg
$(OBJ_DIR)\persist.c : $(RTL_DIR)\persist.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
$(OBJ_DIR)\radiobtn.obj : $(OBJ_DIR)\radiobtn.c
$(OBJ_DIR)\persist.obj : $(OBJ_DIR)\persist.c
$(CC) $(CLIBFLAGS) -o$@ $**
tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
$(OBJ_DIR)\profiler.c : $(RTL_DIR)\profiler.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
$(OBJ_DIR)\profiler.obj : $(OBJ_DIR)\profiler.c
$(CC) $(CLIBFLAGS) -o$@ $**
tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
@@ -1507,6 +1521,14 @@ $(OBJ_DIR)\pushbtn.obj : $(OBJ_DIR)\pushbtn.c
$(CC) $(CLIBFLAGS) -o$@ $**
tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
$(OBJ_DIR)\radiobtn.c : $(RTL_DIR)\radiobtn.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
$(OBJ_DIR)\radiobtn.obj : $(OBJ_DIR)\radiobtn.c
$(CC) $(CLIBFLAGS) -o$@ $**
tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
$(OBJ_DIR)\radiogrp.c : $(RTL_DIR)\radiogrp.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
@@ -1514,6 +1536,7 @@ $(OBJ_DIR)\radiogrp.obj : $(OBJ_DIR)\radiogrp.c
$(CC) $(CLIBFLAGS) -o$@ $**
tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
$(OBJ_DIR)\rat.obj : $(RTL_DIR)\rat.c
$(CC) $(CLIBFLAGS) -o$@ $**
tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
@@ -1959,15 +1982,15 @@ $(OBJ_DIR)\macroy.obj : $(OBJ_DIR)\macroy.c
tlib $(MACRO_LIB) $(ARFLAGS) -+$@,,
#$(OBJ_DIR)\macrol.obj : $(OBJ_DIR)\macrol.c
# -echo. > $(OBJ_DIR)\unistd.h
# -$(ECHO) > $(OBJ_DIR)\unistd.h
# $(CC) $(CLIBFLAGS) -I$(OBJ_DIR) -o$@ $**
# -del $(OBJ_DIR)\unistd.h
# -$(DEL) $(OBJ_DIR)\unistd.h
# tlib $(MACRO_LIB) $(ARFLAGS) -+$@,,
$(OBJ_DIR)\macroslx.obj : $(MACRO_DIR)\macroslx.c
-echo. > $(OBJ_DIR)\unistd.h
-$(ECHO) > $(OBJ_DIR)\unistd.h
$(CC) $(CLIBFLAGS) -I$(OBJ_DIR) -o$@ $**
-del $(OBJ_DIR)\unistd.h
-$(DEL) $(OBJ_DIR)\unistd.h
tlib $(MACRO_LIB) $(ARFLAGS) -+$@,,
$(OBJ_DIR)\macroa.obj : $(MACRO_DIR)\macroa.c
@@ -2159,34 +2182,34 @@ $(HBPP_EXE) : \
$(COMMON_LIB_OBJS)
$(CC) $(CLIBFLAGS) -o$(OBJ_DIR)\hbpp.obj $(HBPP_DIR)\hbpp.c
echo. $(CFLAGS) > make.tmp
echo. -e$(HBPP_EXE) >> make.tmp
echo. $(OBJ_DIR)\hbpp.obj >> make.tmp
echo. $(COMMON_LIB) $(PP_LIB) >> make.tmp
$(ECHO) $(CFLAGS) > make.tmp
$(ECHO) -e$(HBPP_EXE) >> make.tmp
$(ECHO) $(OBJ_DIR)\hbpp.obj >> make.tmp
$(ECHO) $(COMMON_LIB) $(PP_LIB) >> make.tmp
$(CC) @make.tmp
del make.tmp
$(DEL) make.tmp
#
# HBRUN.EXE dependencies
#
$(HBRUN_EXE) : $(HBRUN_EXE_OBJS)
echo. $(CFLAGS) > make.tmp
echo. -e$(HBRUN_EXE) >> make.tmp
echo. $(OBJ_DIR)\hbrun.obj >> make.tmp
echo. $(OBJ_DIR)\external.obj >> make.tmp
echo. $(PP_LIB) >> make.tmp
echo. $(COMMON_LIB) >> make.tmp
echo. $(VM_LIB) >> make.tmp
echo. $(RTL_LIB) >> make.tmp
echo. $(HB_GT_LIB) >> make.tmp
echo. $(LANG_LIB) >> make.tmp
echo. $(RDD_LIB) >> make.tmp
echo. $(MACRO_LIB) >> make.tmp
echo. $(DBFNTX_LIB) >> make.tmp
echo. $(DBFCDX_LIB) >> make.tmp
$(ECHO) $(CFLAGS) > make.tmp
$(ECHO) -e$(HBRUN_EXE) >> make.tmp
$(ECHO) $(OBJ_DIR)\hbrun.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\external.obj >> make.tmp
$(ECHO) $(PP_LIB) >> make.tmp
$(ECHO) $(COMMON_LIB) >> make.tmp
$(ECHO) $(VM_LIB) >> make.tmp
$(ECHO) $(RTL_LIB) >> make.tmp
$(ECHO) $(HB_GT_LIB) >> make.tmp
$(ECHO) $(LANG_LIB) >> make.tmp
$(ECHO) $(RDD_LIB) >> make.tmp
$(ECHO) $(MACRO_LIB) >> make.tmp
$(ECHO) $(DBFNTX_LIB) >> make.tmp
$(ECHO) $(DBFCDX_LIB) >> make.tmp
$(CC) @make.tmp
del make.tmp
$(DEL) make.tmp
$(OBJ_DIR)\hbrun.c : $(HBRUN_DIR)\hbrun.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
@@ -2205,31 +2228,31 @@ $(OBJ_DIR)\external.obj : $(OBJ_DIR)\external.c
#
$(HBTEST_EXE) : $(HBTEST_EXE_OBJS)
echo. $(CFLAGS) > make.tmp
echo. -e$(HBTEST_EXE) >> make.tmp
echo. $(OBJ_DIR)\hbtest.obj >> make.tmp
echo. $(OBJ_DIR)\rt_hvm.obj >> make.tmp
echo. $(OBJ_DIR)\rt_hvma.obj >> make.tmp
echo. $(OBJ_DIR)\rt_math.obj >> make.tmp
echo. $(OBJ_DIR)\rt_date.obj >> make.tmp
echo. $(OBJ_DIR)\rt_str.obj >> make.tmp
echo. $(OBJ_DIR)\rt_stra.obj >> make.tmp
echo. $(OBJ_DIR)\rt_trans.obj >> make.tmp
echo. $(OBJ_DIR)\rt_array.obj >> make.tmp
echo. $(OBJ_DIR)\rt_file.obj >> make.tmp
echo. $(OBJ_DIR)\rt_misc.obj >> make.tmp
echo. $(PP_LIB) >> make.tmp
echo. $(COMMON_LIB) >> make.tmp
echo. $(VM_LIB) >> make.tmp
echo. $(RTL_LIB) >> make.tmp
echo. $(HB_GT_LIB) >> make.tmp
echo. $(LANG_LIB) >> make.tmp
echo. $(RDD_LIB) >> make.tmp
echo. $(MACRO_LIB) >> make.tmp
echo. $(DBFNTX_LIB) >> make.tmp
echo. $(DBFCDX_LIB) >> make.tmp
$(ECHO) $(CFLAGS) > make.tmp
$(ECHO) -e$(HBTEST_EXE) >> make.tmp
$(ECHO) $(OBJ_DIR)\hbtest.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rt_hvm.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rt_hvma.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rt_math.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rt_date.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rt_str.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rt_stra.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rt_trans.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rt_array.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rt_file.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rt_misc.obj >> make.tmp
$(ECHO) $(PP_LIB) >> make.tmp
$(ECHO) $(COMMON_LIB) >> make.tmp
$(ECHO) $(VM_LIB) >> make.tmp
$(ECHO) $(RTL_LIB) >> make.tmp
$(ECHO) $(HB_GT_LIB) >> make.tmp
$(ECHO) $(LANG_LIB) >> make.tmp
$(ECHO) $(RDD_LIB) >> make.tmp
$(ECHO) $(MACRO_LIB) >> make.tmp
$(ECHO) $(DBFNTX_LIB) >> make.tmp
$(ECHO) $(DBFCDX_LIB) >> make.tmp
$(CC) @make.tmp
del make.tmp
$(DEL) make.tmp
$(OBJ_DIR)\hbtest.c : $(HBTEST_DIR)\hbtest.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
@@ -2302,43 +2325,43 @@ $(OBJ_DIR)\rt_misc.obj : $(OBJ_DIR)\rt_misc.c
#
$(HBDOC_EXE) : $(HBDOC_EXE_OBJS)
echo. $(CFLAGS) > make.tmp
echo. -e$(HBDOC_EXE) >> make.tmp
echo. $(OBJ_DIR)\hbdoc.obj >> make.tmp
echo. $(OBJ_DIR)\genasc.obj >> make.tmp
echo. $(OBJ_DIR)\genhpc.obj >> make.tmp
echo. $(OBJ_DIR)\genhtm.obj >> make.tmp
echo. $(OBJ_DIR)\genchm.obj >> make.tmp
echo. $(OBJ_DIR)\genng.obj >> make.tmp
echo. $(OBJ_DIR)\genos2.obj >> make.tmp
echo. $(OBJ_DIR)\genrtf.obj >> make.tmp
echo. $(OBJ_DIR)\gentrf.obj >> make.tmp
echo. $(OBJ_DIR)\html.obj >> make.tmp
echo. $(OBJ_DIR)\ng.obj >> make.tmp
echo. $(OBJ_DIR)\os2.obj >> make.tmp
echo. $(OBJ_DIR)\rtf.obj >> make.tmp
echo. $(OBJ_DIR)\troff.obj >> make.tmp
echo. $(OBJ_DIR)\fclass1.obj >> make.tmp
echo. $(OBJ_DIR)\ffile1.obj >> make.tmp
echo. $(OBJ_DIR)\ft_funcs.obj >> make.tmp
echo. $(PP_LIB) >> make.tmp
echo. $(COMMON_LIB) >> make.tmp
echo. $(VM_LIB) >> make.tmp
echo. $(RTL_LIB) >> make.tmp
echo. $(HB_GT_LIB) >> make.tmp
echo. $(LANG_LIB) >> make.tmp
echo. $(RDD_LIB) >> make.tmp
echo. $(MACRO_LIB) >> make.tmp
echo. $(DBFNTX_LIB) >> make.tmp
echo. $(DBFCDX_LIB) >> make.tmp
$(ECHO) $(CFLAGS) > make.tmp
$(ECHO) -e$(HBDOC_EXE) >> make.tmp
$(ECHO) $(OBJ_DIR)\hbdoc.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genasc.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genhpc.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genhtm.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genchm.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genng.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genos2.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genrtf.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\gentrf.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\html.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\ng.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\os2.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rtf.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\troff.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\fclass1.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\ffile1.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\ft_funcs.obj >> make.tmp
$(ECHO) $(PP_LIB) >> make.tmp
$(ECHO) $(COMMON_LIB) >> make.tmp
$(ECHO) $(VM_LIB) >> make.tmp
$(ECHO) $(RTL_LIB) >> make.tmp
$(ECHO) $(HB_GT_LIB) >> make.tmp
$(ECHO) $(LANG_LIB) >> make.tmp
$(ECHO) $(RDD_LIB) >> make.tmp
$(ECHO) $(MACRO_LIB) >> make.tmp
$(ECHO) $(DBFNTX_LIB) >> make.tmp
$(ECHO) $(DBFCDX_LIB) >> make.tmp
!if $d(PDF)
echo. $(OBJ_DIR)\genpdf1.obj >> make.tmp
echo. $(OBJ_DIR)\pdfhbdoc.obj >> make.tmp
echo. $(LIB_DIR)\pdflib.lib >> make.tmp
$(ECHO) $(OBJ_DIR)\genpdf1.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\pdfhbdoc.obj >> make.tmp
$(ECHO) $(LIB_DIR)\pdflib.lib >> make.tmp
!endif
$(CC) @make.tmp
del make.tmp
$(DEL) make.tmp
$(OBJ_DIR)\hbdoc.c : $(HBDOC_DIR)\hbdoc.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
@@ -2455,30 +2478,30 @@ $(OBJ_DIR)\pdfhbdoc.obj : $(HBPDF_DIR)\pdfhbdoc.c
$(HBMAKE_EXE) : $(HBMAKE_EXE_OBJS)
echo. $(CFLAGS) > make.tmp
echo. -M -e$(HBMAKE_EXE) >> make.tmp
echo. $(OBJ_DIR)\hbmake.obj >> make.tmp
echo. $(OBJ_DIR)\radios.obj >> make.tmp
echo. $(OBJ_DIR)\checks.obj >> make.tmp
echo. $(OBJ_DIR)\fclass1.obj >> make.tmp
echo. $(OBJ_DIR)\ffile1.obj >> make.tmp
echo. $(OBJ_DIR)\ft_funcs.obj >> make.tmp
echo. $(OBJ_DIR)\pickarry.obj >> make.tmp
echo. $(OBJ_DIR)\pickfile.obj >> make.tmp
echo. $(OBJ_DIR)\prb_stak.obj >> make.tmp
echo. $(PP_LIB) >> make.tmp
echo. $(COMMON_LIB) >> make.tmp
echo. $(VM_LIB) >> make.tmp
echo. $(RTL_LIB) >> make.tmp
echo. $(HB_GT_LIB) >> make.tmp
echo. $(LANG_LIB) >> make.tmp
echo. $(RDD_LIB) >> make.tmp
echo. $(MACRO_LIB) >> make.tmp
echo. $(DBFNTX_LIB) >> make.tmp
echo. $(DBFCDX_LIB) >> make.tmp
$(ECHO) $(CFLAGS) > make.tmp
$(ECHO) -M -e$(HBMAKE_EXE) >> make.tmp
$(ECHO) $(OBJ_DIR)\hbmake.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\radios.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\checks.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\fclass1.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\ffile1.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\ft_funcs.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\pickarry.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\pickfile.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\prb_stak.obj >> make.tmp
$(ECHO) $(PP_LIB) >> make.tmp
$(ECHO) $(COMMON_LIB) >> make.tmp
$(ECHO) $(VM_LIB) >> make.tmp
$(ECHO) $(RTL_LIB) >> make.tmp
$(ECHO) $(HB_GT_LIB) >> make.tmp
$(ECHO) $(LANG_LIB) >> make.tmp
$(ECHO) $(RDD_LIB) >> make.tmp
$(ECHO) $(MACRO_LIB) >> make.tmp
$(ECHO) $(DBFNTX_LIB) >> make.tmp
$(ECHO) $(DBFCDX_LIB) >> make.tmp
$(CC) @make.tmp
del make.tmp
$(DEL) make.tmp
$(OBJ_DIR)\hbmake.c : $(HBMAKE_DIR)\hbmake.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
@@ -2516,3 +2539,4 @@ $(OBJ_DIR)\prb_stak.c : $(HBMAKE_DIR)\prb_stak.prg
$(OBJ_DIR)\prb_stak.obj : $(OBJ_DIR)\prb_stak.c
$(CC) $(CLIBFLAGS) -o$@ $**

14
harbour/make_b32.bat
View File

@@ -3,6 +3,19 @@ rem
rem $Id$
rem
rem "echo." intentionally used instead of "echo", to avoid conflicts
rem with external commands named echo.
rem using macros for ECHO and DEL to allow overiding such as:
rem
rem SET ECHO=cmd /c echo
rem SET DEL=cmd /c del
rem
rem The above might be needed on Windows 2000 and XP.
rem The macros are referenced in makefile.bc
if "%ECHO%"=="" SET ECHO=echo.
if "%DEL%"=="" SET DEL=del
if "%1" == "clean" goto CLEAN
if "%1" == "CLEAN" goto CLEAN
@@ -41,3 +54,4 @@ if "%1" == "CLEAN" goto CLEAN
:EXIT

256
harbour/makefile.bc
View File

@@ -22,11 +22,6 @@
# (search for HB_GT_LIBS for a list of values)
#
#
# NOTE: "echo." intentionally used instead of "echo", to avoid conflicts
# with external commands named echo.
#
#
# NOTE: BCC_NOSTARTUP must be defined for Borland C++ 5.3 to make it work.
#
@@ -741,29 +736,29 @@ $(OBJ_DIR)\pragma.obj : $(PP_DIR)\pragma.c
#
$(HARBOUR_EXE) : $(HARBOUR_EXE_OBJS)
echo. $(CFLAGS) > make.tmp
echo. -e$(HARBOUR_EXE) >> make.tmp
echo. $(OBJ_DIR)\harbour.obj >> make.tmp
echo. $(OBJ_DIR)\harboury.obj >> make.tmp
echo. $(OBJ_DIR)\harbourl.obj >> make.tmp
echo. $(OBJ_DIR)\cmdcheck.obj >> make.tmp
echo. $(OBJ_DIR)\hbusage.obj >> make.tmp
echo. $(OBJ_DIR)\hbident.obj >> make.tmp
echo. $(OBJ_DIR)\hbgenerr.obj >> make.tmp
echo. $(OBJ_DIR)\hbpcode.obj >> make.tmp
echo. $(OBJ_DIR)\hbfix.obj >> make.tmp
echo. $(OBJ_DIR)\genc.obj >> make.tmp
echo. $(OBJ_DIR)\gencobj.obj >> make.tmp
echo. $(OBJ_DIR)\genobj32.obj >> make.tmp
echo. $(OBJ_DIR)\genjava.obj >> make.tmp
echo. $(OBJ_DIR)\genhrb.obj >> make.tmp
echo. $(OBJ_DIR)\expropta.obj >> make.tmp
echo. $(OBJ_DIR)\exproptb.obj >> make.tmp
echo. $(OBJ_DIR)\exproptc.obj >> make.tmp
echo. $(OBJ_DIR)\hbfunchk.obj >> make.tmp
echo. $(COMMON_LIB) $(PP_LIB) >> make.tmp
$(ECHO) $(CFLAGS) > make.tmp
$(ECHO) -e$(HARBOUR_EXE) >> make.tmp
$(ECHO) $(OBJ_DIR)\harbour.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\harboury.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\harbourl.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\cmdcheck.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\hbusage.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\hbident.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\hbgenerr.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\hbpcode.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\hbfix.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genc.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\gencobj.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genobj32.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genjava.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genhrb.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\expropta.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\exproptb.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\exproptc.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\hbfunchk.obj >> make.tmp
$(ECHO) $(COMMON_LIB) $(PP_LIB) >> make.tmp
$(CC) @make.tmp
del make.tmp
$(DEL) make.tmp
$(OBJ_DIR)\harbour.obj : $(COMPILER_DIR)\harbour.c
$(CC) $(CLIBFLAGS) -o$@ $**
@@ -778,9 +773,9 @@ $(OBJ_DIR)\harboury.obj : $(OBJ_DIR)\harboury.c
$(CC) $(CLIBFLAGS) -o$@ $**
$(OBJ_DIR)\harbourl.obj : $(OBJ_DIR)\harbourl.c
-echo. > $(OBJ_DIR)\unistd.h
-$(ECHO) > $(OBJ_DIR)\unistd.h
$(CC) $(CLIBFLAGS) -I$(OBJ_DIR) -o$@ $**
-del $(OBJ_DIR)\unistd.h
-$(DEL) $(OBJ_DIR)\unistd.h
$(OBJ_DIR)\cmdcheck.obj : $(COMPILER_DIR)\cmdcheck.c
$(CC) $(CLIBFLAGS) -o$@ $**
@@ -1992,9 +1987,9 @@ $(OBJ_DIR)\macroy.obj : $(OBJ_DIR)\macroy.c
tlib $(MACRO_LIB) $(ARFLAGS) -+$@,,
$(OBJ_DIR)\macrol.obj : $(OBJ_DIR)\macrol.c
-echo. > $(OBJ_DIR)\unistd.h
-$(ECHO) > $(OBJ_DIR)\unistd.h
$(CC) $(CLIBFLAGS) -I$(OBJ_DIR) -o$@ $**
-del $(OBJ_DIR)\unistd.h
-$(DEL) $(OBJ_DIR)\unistd.h
tlib $(MACRO_LIB) $(ARFLAGS) -+$@,,
$(OBJ_DIR)\macroa.obj : $(MACRO_DIR)\macroa.c
@@ -2186,34 +2181,34 @@ $(HBPP_EXE) : \
$(COMMON_LIB_OBJS)
$(CC) $(CLIBFLAGS) -o$(OBJ_DIR)\hbpp.obj $(HBPP_DIR)\hbpp.c
echo. $(CFLAGS) > make.tmp
echo. -e$(HBPP_EXE) >> make.tmp
echo. $(OBJ_DIR)\hbpp.obj >> make.tmp
echo. $(COMMON_LIB) $(PP_LIB) >> make.tmp
$(ECHO) $(CFLAGS) > make.tmp
$(ECHO) -e$(HBPP_EXE) >> make.tmp
$(ECHO) $(OBJ_DIR)\hbpp.obj >> make.tmp
$(ECHO) $(COMMON_LIB) $(PP_LIB) >> make.tmp
$(CC) @make.tmp
del make.tmp
$(DEL) make.tmp
#
# HBRUN.EXE dependencies
#
$(HBRUN_EXE) : $(HBRUN_EXE_OBJS)
echo. $(CFLAGS) > make.tmp
echo. -e$(HBRUN_EXE) >> make.tmp
echo. $(OBJ_DIR)\hbrun.obj >> make.tmp
echo. $(OBJ_DIR)\external.obj >> make.tmp
echo. $(PP_LIB) >> make.tmp
echo. $(COMMON_LIB) >> make.tmp
echo. $(VM_LIB) >> make.tmp
echo. $(RTL_LIB) >> make.tmp
echo. $(HB_GT_LIB) >> make.tmp
echo. $(LANG_LIB) >> make.tmp
echo. $(RDD_LIB) >> make.tmp
echo. $(MACRO_LIB) >> make.tmp
echo. $(DBFNTX_LIB) >> make.tmp
echo. $(DBFCDX_LIB) >> make.tmp
$(ECHO) $(CFLAGS) > make.tmp
$(ECHO) -e$(HBRUN_EXE) >> make.tmp
$(ECHO) $(OBJ_DIR)\hbrun.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\external.obj >> make.tmp
$(ECHO) $(PP_LIB) >> make.tmp
$(ECHO) $(COMMON_LIB) >> make.tmp
$(ECHO) $(VM_LIB) >> make.tmp
$(ECHO) $(RTL_LIB) >> make.tmp
$(ECHO) $(HB_GT_LIB) >> make.tmp
$(ECHO) $(LANG_LIB) >> make.tmp
$(ECHO) $(RDD_LIB) >> make.tmp
$(ECHO) $(MACRO_LIB) >> make.tmp
$(ECHO) $(DBFNTX_LIB) >> make.tmp
$(ECHO) $(DBFCDX_LIB) >> make.tmp
$(CC) @make.tmp
del make.tmp
$(DEL) make.tmp
$(OBJ_DIR)\hbrun.c : $(HBRUN_DIR)\hbrun.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
@@ -2232,31 +2227,31 @@ $(OBJ_DIR)\external.obj : $(OBJ_DIR)\external.c
#
$(HBTEST_EXE) : $(HBTEST_EXE_OBJS)
echo. $(CFLAGS) > make.tmp
echo. -e$(HBTEST_EXE) >> make.tmp
echo. $(OBJ_DIR)\hbtest.obj >> make.tmp
echo. $(OBJ_DIR)\rt_hvm.obj >> make.tmp
echo. $(OBJ_DIR)\rt_hvma.obj >> make.tmp
echo. $(OBJ_DIR)\rt_math.obj >> make.tmp
echo. $(OBJ_DIR)\rt_date.obj >> make.tmp
echo. $(OBJ_DIR)\rt_str.obj >> make.tmp
echo. $(OBJ_DIR)\rt_stra.obj >> make.tmp
echo. $(OBJ_DIR)\rt_trans.obj >> make.tmp
echo. $(OBJ_DIR)\rt_array.obj >> make.tmp
echo. $(OBJ_DIR)\rt_file.obj >> make.tmp
echo. $(OBJ_DIR)\rt_misc.obj >> make.tmp
echo. $(PP_LIB) >> make.tmp
echo. $(COMMON_LIB) >> make.tmp
echo. $(VM_LIB) >> make.tmp
echo. $(RTL_LIB) >> make.tmp
echo. $(HB_GT_LIB) >> make.tmp
echo. $(LANG_LIB) >> make.tmp
echo. $(RDD_LIB) >> make.tmp
echo. $(MACRO_LIB) >> make.tmp
echo. $(DBFNTX_LIB) >> make.tmp
echo. $(DBFCDX_LIB) >> make.tmp
$(ECHO) $(CFLAGS) > make.tmp
$(ECHO) -e$(HBTEST_EXE) >> make.tmp
$(ECHO) $(OBJ_DIR)\hbtest.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rt_hvm.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rt_hvma.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rt_math.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rt_date.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rt_str.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rt_stra.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rt_trans.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rt_array.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rt_file.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rt_misc.obj >> make.tmp
$(ECHO) $(PP_LIB) >> make.tmp
$(ECHO) $(COMMON_LIB) >> make.tmp
$(ECHO) $(VM_LIB) >> make.tmp
$(ECHO) $(RTL_LIB) >> make.tmp
$(ECHO) $(HB_GT_LIB) >> make.tmp
$(ECHO) $(LANG_LIB) >> make.tmp
$(ECHO) $(RDD_LIB) >> make.tmp
$(ECHO) $(MACRO_LIB) >> make.tmp
$(ECHO) $(DBFNTX_LIB) >> make.tmp
$(ECHO) $(DBFCDX_LIB) >> make.tmp
$(CC) @make.tmp
del make.tmp
$(DEL) make.tmp
$(OBJ_DIR)\hbtest.c : $(HBTEST_DIR)\hbtest.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
@@ -2329,43 +2324,43 @@ $(OBJ_DIR)\rt_misc.obj : $(OBJ_DIR)\rt_misc.c
#
$(HBDOC_EXE) : $(HBDOC_EXE_OBJS)
echo. $(CFLAGS) > make.tmp
echo. -e$(HBDOC_EXE) >> make.tmp
echo. $(OBJ_DIR)\hbdoc.obj >> make.tmp
echo. $(OBJ_DIR)\genasc.obj >> make.tmp
echo. $(OBJ_DIR)\genhpc.obj >> make.tmp
echo. $(OBJ_DIR)\genhtm.obj >> make.tmp
echo. $(OBJ_DIR)\genchm.obj >> make.tmp
echo. $(OBJ_DIR)\genng.obj >> make.tmp
echo. $(OBJ_DIR)\genos2.obj >> make.tmp
echo. $(OBJ_DIR)\genrtf.obj >> make.tmp
echo. $(OBJ_DIR)\gentrf.obj >> make.tmp
echo. $(OBJ_DIR)\html.obj >> make.tmp
echo. $(OBJ_DIR)\ng.obj >> make.tmp
echo. $(OBJ_DIR)\os2.obj >> make.tmp
echo. $(OBJ_DIR)\rtf.obj >> make.tmp
echo. $(OBJ_DIR)\troff.obj >> make.tmp
echo. $(OBJ_DIR)\fclass1.obj >> make.tmp
echo. $(OBJ_DIR)\ffile1.obj >> make.tmp
echo. $(OBJ_DIR)\ft_funcs.obj >> make.tmp
echo. $(PP_LIB) >> make.tmp
echo. $(COMMON_LIB) >> make.tmp
echo. $(VM_LIB) >> make.tmp
echo. $(RTL_LIB) >> make.tmp
echo. $(HB_GT_LIB) >> make.tmp
echo. $(LANG_LIB) >> make.tmp
echo. $(RDD_LIB) >> make.tmp
echo. $(MACRO_LIB) >> make.tmp
echo. $(DBFNTX_LIB) >> make.tmp
echo. $(DBFCDX_LIB) >> make.tmp
$(ECHO) $(CFLAGS) > make.tmp
$(ECHO) -e$(HBDOC_EXE) >> make.tmp
$(ECHO) $(OBJ_DIR)\hbdoc.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genasc.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genhpc.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genhtm.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genchm.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genng.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genos2.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\genrtf.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\gentrf.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\html.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\ng.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\os2.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\rtf.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\troff.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\fclass1.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\ffile1.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\ft_funcs.obj >> make.tmp
$(ECHO) $(PP_LIB) >> make.tmp
$(ECHO) $(COMMON_LIB) >> make.tmp
$(ECHO) $(VM_LIB) >> make.tmp
$(ECHO) $(RTL_LIB) >> make.tmp
$(ECHO) $(HB_GT_LIB) >> make.tmp
$(ECHO) $(LANG_LIB) >> make.tmp
$(ECHO) $(RDD_LIB) >> make.tmp
$(ECHO) $(MACRO_LIB) >> make.tmp
$(ECHO) $(DBFNTX_LIB) >> make.tmp
$(ECHO) $(DBFCDX_LIB) >> make.tmp
!if $d(PDF)
echo. $(OBJ_DIR)\genpdf1.obj >> make.tmp
echo. $(OBJ_DIR)\pdfhbdoc.obj >> make.tmp
echo. $(LIB_DIR)\pdflib.lib >> make.tmp
$(ECHO) $(OBJ_DIR)\genpdf1.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\pdfhbdoc.obj >> make.tmp
$(ECHO) $(LIB_DIR)\pdflib.lib >> make.tmp
!endif
$(CC) @make.tmp
del make.tmp
$(DEL) make.tmp
$(OBJ_DIR)\hbdoc.c : $(HBDOC_DIR)\hbdoc.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
@@ -2482,30 +2477,30 @@ $(OBJ_DIR)\pdfhbdoc.obj : $(HBPDF_DIR)\pdfhbdoc.c
$(HBMAKE_EXE) : $(HBMAKE_EXE_OBJS)
echo. $(CFLAGS) > make.tmp
echo. -M -e$(HBMAKE_EXE) >> make.tmp
echo. $(OBJ_DIR)\hbmake.obj >> make.tmp
echo. $(OBJ_DIR)\radios.obj >> make.tmp
echo. $(OBJ_DIR)\checks.obj >> make.tmp
echo. $(OBJ_DIR)\fclass1.obj >> make.tmp
echo. $(OBJ_DIR)\ffile1.obj >> make.tmp
echo. $(OBJ_DIR)\ft_funcs.obj >> make.tmp
echo. $(OBJ_DIR)\pickarry.obj >> make.tmp
echo. $(OBJ_DIR)\pickfile.obj >> make.tmp
echo. $(OBJ_DIR)\prb_stak.obj >> make.tmp
echo. $(PP_LIB) >> make.tmp
echo. $(COMMON_LIB) >> make.tmp
echo. $(VM_LIB) >> make.tmp
echo. $(RTL_LIB) >> make.tmp
echo. $(HB_GT_LIB) >> make.tmp
echo. $(LANG_LIB) >> make.tmp
echo. $(RDD_LIB) >> make.tmp
echo. $(MACRO_LIB) >> make.tmp
echo. $(DBFNTX_LIB) >> make.tmp
echo. $(DBFCDX_LIB) >> make.tmp
$(ECHO) $(CFLAGS) > make.tmp
$(ECHO) -M -e$(HBMAKE_EXE) >> make.tmp
$(ECHO) $(OBJ_DIR)\hbmake.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\radios.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\checks.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\fclass1.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\ffile1.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\ft_funcs.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\pickarry.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\pickfile.obj >> make.tmp
$(ECHO) $(OBJ_DIR)\prb_stak.obj >> make.tmp
$(ECHO) $(PP_LIB) >> make.tmp
$(ECHO) $(COMMON_LIB) >> make.tmp
$(ECHO) $(VM_LIB) >> make.tmp
$(ECHO) $(RTL_LIB) >> make.tmp
$(ECHO) $(HB_GT_LIB) >> make.tmp
$(ECHO) $(LANG_LIB) >> make.tmp
$(ECHO) $(RDD_LIB) >> make.tmp
$(ECHO) $(MACRO_LIB) >> make.tmp
$(ECHO) $(DBFNTX_LIB) >> make.tmp
$(ECHO) $(DBFCDX_LIB) >> make.tmp
$(CC) @make.tmp
del make.tmp
$(DEL) make.tmp
$(OBJ_DIR)\hbmake.c : $(HBMAKE_DIR)\hbmake.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
@@ -2542,3 +2537,4 @@ $(OBJ_DIR)\prb_stak.c : $(HBMAKE_DIR)\prb_stak.prg
$(OBJ_DIR)\prb_stak.obj : $(OBJ_DIR)\prb_stak.c
$(CC) $(CLIBFLAGS) -o$@ $**

28
harbour/source/compiler/harbour.slx
View File

@@ -68,8 +68,13 @@
#undef YY_BUF_SIZE
#define YY_BUF_SIZE HB_PP_STR_SIZE
static int iTexts = 0, iCloseSquare = 0, iWantsEOL, iWantsEXP, iWantsID, iWantsVAR;
static int iCloseSquare = 0, iWantsEOL, iWantsEXP, iWantsID, iWantsVAR;
/* Commented 2001-08-29 - Not really needed!
static char *aTexts[ NUMERALS_PER_LINE ];
int iTexts = 0;
*/
static unsigned char iIdentifier = 0;
static char *sIdOnHold, *s_sLastBlock = NULL;
@@ -385,10 +390,10 @@ LANGUAGE_RULES_ARE {
/* Any other DECLARE IDENTIFIER, must be Strong Type DECLARE. */
IF_SEQUENCE_IS( DECLARE , IDENTIFIER , 0 , 0 ) PASS_THROUGH(),
IF_SEQUENCE_IS( _ID_ON_HOLD , 0 , 0 , 0 ) REDUCE_TO( HB_ID_ON_HOLD , ),
IF_SEQUENCE_IS( _ID_ON_HOLD , 0 , 0 , 0 ) REDUCE_TO( HB_ID_ON_HOLD , 0 ),
/* Any other DECLARE must be Identifier. */
IF_SEQUENCE_IS( DECLARE , 0 , 0 , 0 ) REDUCE_TO( HB_IDENTIFIER , ),
IF_SEQUENCE_IS( DECLARE , 0 , 0 , 0 ) REDUCE_TO( HB_IDENTIFIER , 0 ),
/* Expnasions from DECLARE ...*/
IF_SEQUENCE_IS( _ID_ARRAY , 0 , 0 , 0 ) REDUCE_TO( IDENTIFIER + DONT_REDUCE , '[' + DONT_REDUCE ),
@@ -439,6 +444,7 @@ LANGUAGE_RULES_ARE {
#undef LEX_CASE
#define LEX_CASE(x) ( ( ( iRet = (x) ) > 96 && iRet < 123 ) ? iRet - 32 : iRet )
/* Commented 2001-08-29 - Not really needed!
#undef NEW_LINE_ACTION
#define NEW_LINE_ACTION() \
while( iTexts ) \
@@ -446,13 +452,8 @@ LANGUAGE_RULES_ARE {
DEBUG_INFO( printf( "Releasing short term Text: %i = %s At: %i\n", iTexts, aTexts[iTexts - 1], aTexts[iTexts - 1] ) ); \
iTexts--; \
hb_xfree( aTexts[iTexts] ); \
}\
\
if( ( hb_comp_iLine % 100 ) == 0 && hb_comp_bQuiet == FALSE ) \
{ \
printf( "\r%i", hb_comp_iLine ); \
fflush( stdout ); \
}
*/
#undef INTERCEPT_ACTION
#define INTERCEPT_ACTION(x) x = hb_comp_SLX_InterceptAction( x, (char*) sToken )
@@ -677,6 +678,7 @@ static int hb_comp_SLX_ElementToken( char* szToken, unsigned int iTokenLen )
yylval.string = (char*) hb_xgrab( TOKEN_SIZE );
yylval.string[0] = 0;
/* Commented 2001-08-29 - Not really needed!
if( iTexts < NUMERALS_PER_LINE )
{
aTexts[iTexts++] = yylval.string;
@@ -687,6 +689,7 @@ static int hb_comp_SLX_ElementToken( char* szToken, unsigned int iTokenLen )
hb_comp_iErrorCount++;
iTexts = 0;
}
*/
/* Hex Number */
if( yytext[0] == '0' && yytext[1] == 'X' )
@@ -1208,9 +1211,14 @@ int hb_comp_SLX_CustomAction( int x, int aiHold[], int *ptr_iHold, BOOL *ptr_bIg
int yy_lex_input( char *buffer, int iBufferSize )
{
HB_SYMBOL_UNUSED( buffer );
HB_SYMBOL_UNUSED( iBufferSize );
if( ( hb_comp_iLine % 100 ) == 0 && hb_comp_bQuiet == FALSE )
{
printf( "\r%i", hb_comp_iLine );
fflush( stdout );
}
return hb_pp_Internal( hb_comp_bPPO ? hb_comp_yyppo : NULL, buffer );
}

6
harbour/source/compiler/simplex.c
View File

@@ -1403,7 +1403,8 @@ void SimpLex_CheckWords( void )
void yy_switch_to_buffer( void * pBuffer )
#endif
{
HB_SYMBOL_UNUSED( pBuffer );
/* Avoid warning of unused symbols. */
(void) pBuffer;
FORCE_REDUCE();
iSize = 0;
}
@@ -1414,7 +1415,8 @@ void SimpLex_CheckWords( void )
void yy_delete_buffer( void * pBuffer )
#endif
{
HB_SYMBOL_UNUSED( pBuffer );
/* Avoid warning of unused symbols. */
(void) pBuffer;
FORCE_REDUCE();
iSize = 0;
}