From 2c434c30465c82129266276b07c288f4e29f358a Mon Sep 17 00:00:00 2001 From: Marek Paliwoda Date: Wed, 21 Nov 2007 20:07:50 +0000 Subject: [PATCH] --- harbour/ChangeLog | 25 +++++- harbour/contrib/make_all.mak | 132 ------------------------------- harbour/contrib/make_b32.bat | 21 +++++ harbour/contrib/make_b32_all.bat | 29 +++++-- harbour/contrib/make_vc.bat | 21 +++++ harbour/contrib/make_vc_all.bat | 29 +++++-- harbour/contrib/mtpl_b32.mak | 91 ++++++++++++++++----- harbour/contrib/mtpl_defs.mak | 6 -- harbour/contrib/mtpl_ruls.mak | 79 ------------------ harbour/contrib/mtpl_vc.mak | 91 ++++++++++++++++----- 10 files changed, 257 insertions(+), 267 deletions(-) delete mode 100644 harbour/contrib/make_all.mak create mode 100644 harbour/contrib/make_b32.bat create mode 100644 harbour/contrib/make_vc.bat delete mode 100644 harbour/contrib/mtpl_ruls.mak diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6d8d901083..38c08af575 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,10 +8,33 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-11-21 21:10 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl) + - harbour/contrib/make_all.mak + - harbour/contrib/mtpl_ruls.mak + - Removed due to explict request from Viktor to revert new make system + + * harbour/contrib/make_b32_all.bat + * harbour/contrib/make_vc_all.bat + * Restored to my original version + * After restoration modified to allow proper compilation under Win98 + * Blocked compilation for contribs required additional setting + (Sorry Viktor I do not share your opinion in regard to this issue) + + + harbour/contrib/make_b32.bat + + harbour/contrib/make_vc.bat + + Restored to my original version + * Modified to show which dir is compiled + + * harbour/contrib/mtpl_b32.mak + * harbour/contrib/mtpl_vc.mak + * Removed makefile integration between Bcc and Msvc. + You now HAVE TO do duplicative work to modify CLEAN and INSTALL rule. + IMO this is wrong behavior, but requested by Viktor. + 2007-11-21 19:59 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/hbgtcore.c + added emulation for clipboard in core GT code. - Now: + Now: hb_gtInfo( GTI_CLIPBOARDDATA ) -> and: hb_gtInfo( GTI_CLIPBOARDDATA, ) diff --git a/harbour/contrib/make_all.mak b/harbour/contrib/make_all.mak deleted file mode 100644 index 2def2ebea3..0000000000 --- a/harbour/contrib/make_all.mak +++ /dev/null @@ -1,132 +0,0 @@ -# -# $Id$ -# - -# --------------------------------------------------------------- -# Copyright 2007 Marek Paliwoda (mpaliwoda "at" interia "dot" pl) -# See doc/license.txt for licensing terms. -# --------------------------------------------------------------- - -# Makefile for buildning all buildable contribs. -# It is common for Bcc and Msvc - -#********************************************************** - -!ifndef HB_CC_NAME -!error HB_CC_NAME environment variable not defined -!endif - -#********************************************************** - -!ifndef ECHO -ECHO = echo -!endif -!ifndef DEL -DEL = del -!endif - -#********************************************************** - -SHEET=\ -hbclip\ - -DIRS=\ -adordd\ -bmdbfcdx\ -btree\ -examples\ -hbzlib\ -hgf\ -htmllib\ -libct\ -libgt\ -libmisc\ -libnf\ -msql\ -odbc\ -ole\ -rdd_ads\ -samples\ -telepath\ -tip\ -win32\ -xhb\ - -!if "$(APOLLO_DIR)" != "" -DIRS=$(DIRS) apollo -!endif - -!if "$(DIRECTX_DIR)" != "" -DIRS=$(DIRS) directx -!endif - -!if "$(FIREBIRD_DIR)" != "" -DIRS=$(DIRS) firebird -!endif - -!if "$(GD_DIR)" != "" -DIRS=$(DIRS) gd -!endif - -!if "$(FREEIMAGE_DIR)" != "" -DIRS=$(DIRS) freeimage -!endif - -!if "$(MYSQL_DIR)" != "" -DIRS=$(DIRS) mysql -!endif - -!if "$(PDFLIB_DIR)" != "" -DIRS=$(DIRS) pdflib -!endif - -!if "$(PGSQL_DIR)" != "" -DIRS=$(DIRS) pgsql -!endif - -#********************************************************** - -all : prebuild exec - -prebuild : - @echo @set HB_BUILD_TARGET=all > mk_trg.bat - -#********************************************************** - -clean : preclean exec -Clean : preclean exec -CLEAN : preclean exec - -preclean : - @echo @set HB_BUILD_TARGET=clean > mk_trg.bat - -#********************************************************** - -install : preinstall exec -Install : preinstall exec -INSTALL : preinstall exec - -preinstall : - @echo @set HB_BUILD_TARGET=install > mk_trg.bat - -#********************************************************** - -exec : - @$(ECHO) @echo off > mk_one.bat - @$(ECHO) if """%%1""" == """""" goto skip >> mk_one.bat - @$(ECHO) echo Entering %%1 directory >> mk_one.bat - @$(ECHO) rem set HB_SHOW_ERRORS=no >> mk_one.bat - @$(ECHO) cd %%1 >> mk_one.bat - @$(ECHO) call ..\mk_trg.bat >> mk_one.bat - @$(ECHO) if exist make_$(HB_CC_NAME).bat call make_$(HB_CC_NAME).bat %%%HB_BUILD_TARGET%%% >> mk_one.bat - @$(ECHO) cd .. >> mk_one.bat - @$(ECHO) :skip >> mk_one.bat - @< nul - @if exist mk_one.bat $(DEL) mk_one.bat > nul - @if exist mk_trg.bat $(DEL) mk_trg.bat > nul - -#********************************************************** diff --git a/harbour/contrib/make_b32.bat b/harbour/contrib/make_b32.bat new file mode 100644 index 0000000000..62713e2621 --- /dev/null +++ b/harbour/contrib/make_b32.bat @@ -0,0 +1,21 @@ +@echo off +rem +rem $Id: make_b32.bat 7991 2007-11-17 11:42:49Z vszakats $ +rem + +if "%1" == "" goto ERROR + +echo Entering %1 ... + +cd %1 +call make_b32.bat %2 %3 %4 %5 %6 %7 %8 %9 +cd .. + +goto EXIT + +:ERROR +echo ---------------------------------------- +echo RUN : make_b32.bat DIRNAME !!! +echo ---------------------------------------- + +:EXIT diff --git a/harbour/contrib/make_b32_all.bat b/harbour/contrib/make_b32_all.bat index 008224dff2..99d8aa41af 100644 --- a/harbour/contrib/make_b32_all.bat +++ b/harbour/contrib/make_b32_all.bat @@ -3,12 +3,29 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- +rem The compilation is done in three steps. PLEASE DO NOT MODIFY +rem IT or you will break Win98 command.com line length limit !!! -if "%HB_CC_NAME%" == "" set HB_CC_NAME=b32 -if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=make.exe -if "%HB_SHOW_ERRORS%" == "" set HB_SHOW_ERRORS=no +set HB_SHOW_ERRORS=no -rem --------------------------------------------------------------- +set DO_NOT_COMPILE=examples hbclip hgf msql + +set DIRS=adordd bmdbfcdx btree libct libgt libmisc libnf ole + +FOR %%n IN ( %DIRS% ) DO %COMSPEC% /c make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 + +set DIRS=hbzlib htmllib odbc rdd_ads telepath tip win32 xhb + +FOR %%n IN ( %DIRS% ) DO %COMSPEC% /c make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 + +set DIRS=samples directx +if not "%APOLLO_DIR%" == "" set DIRS=%DIRS% apollo +if not "%FIREBIRD_DIR%" == "" set DIRS=%DIRS% firebird +if not "%FREEIMAGE_DIR%" == "" set DIRS=%DIRS% freeimage +if not "%GD_DIR%" == "" set DIRS=%DIRS% gd +if not "%MYSQL_DIR%" == "" set DIRS=%DIRS% mysql +if not "%PDFLIB_DIR%" == "" set DIRS=%DIRS% pdflib +if not "%PGSQL_DIR%" == "" set DIRS=%DIRS% pgsql + +FOR %%n IN ( %DIRS% ) DO %COMSPEC% /c make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 -%HB_MAKE_PROGRAM% -N -r -f make_all.mak %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/make_vc.bat b/harbour/contrib/make_vc.bat new file mode 100644 index 0000000000..bc691b32b2 --- /dev/null +++ b/harbour/contrib/make_vc.bat @@ -0,0 +1,21 @@ +@echo off +rem +rem $Id: make_vc.bat 7991 2007-11-17 11:42:49Z vszakats $ +rem + +if "%1" == "" goto ERROR + +echo Entering %1 ... + +cd %1 +call make_vc.bat %2 %3 %4 %5 %6 %7 %8 %9 +cd .. + +goto EXIT + +:ERROR +echo ---------------------------------------- +echo RUN : make_vc.bat DIRNAME !!! +echo ---------------------------------------- + +:EXIT diff --git a/harbour/contrib/make_vc_all.bat b/harbour/contrib/make_vc_all.bat index cde5a0b4c4..388baedabd 100644 --- a/harbour/contrib/make_vc_all.bat +++ b/harbour/contrib/make_vc_all.bat @@ -3,14 +3,29 @@ rem rem $Id$ rem -rem --------------------------------------------------------------- +rem The compilation is done in three steps. PLEASE DO NOT MODIFY +rem IT or you will break Win98 command.com line length limit !!! -if "%HB_CC_NAME%" == "" set HB_CC_NAME=vc -if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe -if "%HB_SHOW_ERRORS%" == "" set HB_SHOW_ERRORS=no +set HB_SHOW_ERRORS=no -set HB_MAKE_FLAGS=/NOLOGO /S /C %HB_MAKE_FLAGS% +set DO_NOT_COMPILE=examples hbclip hgf msql -rem --------------------------------------------------------------- +set DIRS=adordd bmdbfcdx btree libct libgt libmisc libnf ole + +FOR %%n IN ( %DIRS% ) DO %COMSPEC% /c make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 + +set DIRS=hbzlib htmllib odbc rdd_ads telepath tip win32 xhb + +FOR %%n IN ( %DIRS% ) DO %COMSPEC% /c make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 + +set DIRS=samples directx +if not "%APOLLO_DIR%" == "" set DIRS=%DIRS% apollo +if not "%FIREBIRD_DIR%" == "" set DIRS=%DIRS% firebird +if not "%FREEIMAGE_DIR%" == "" set DIRS=%DIRS% freeimage +if not "%GD_DIR%" == "" set DIRS=%DIRS% gd +if not "%MYSQL_DIR%" == "" set DIRS=%DIRS% mysql +if not "%PDFLIB_DIR%" == "" set DIRS=%DIRS% pdflib +if not "%PGSQL_DIR%" == "" set DIRS=%DIRS% pgsql + +FOR %%n IN ( %DIRS% ) DO %COMSPEC% /c make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 -%HB_MAKE_PROGRAM% /f make_all.mak %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/harbour/contrib/mtpl_b32.mak b/harbour/contrib/mtpl_b32.mak index 6bc38aad39..2eb80cf1da 100644 --- a/harbour/contrib/mtpl_b32.mak +++ b/harbour/contrib/mtpl_b32.mak @@ -2,28 +2,22 @@ # $Id$ # -# ------------------------------------------------------------------- -# Copyright 2007 Marek Paliwoda (mpaliwoda "at" interia "dot" pl) -# Copyright 2007 Viktor Szakats (viktor.szakats "at" syenar "dot" hu) -# See doc/license.txt for licensing terms. -# ------------------------------------------------------------------- - # -------------------------------------------------------- # Makefile common section for Harbour Project Contrib libs # for Borland C/C++ # -------------------------------------------------------- # NOTE: You can use these envvars to configure the make process: -# (note that these are all optional) +# (note that these are all optional) # -# CFLAGS - Extra C compiler options for libraries and for -# executables -# C_USR - Extra C compiler options for libraries and for -# executables (GNU make compatible envvar) -# CLIBFLAGS - Extra C compiler options for the libraries -# HARBOURFLAGS - Extra Harbour compiler options -# PRG_USR - Extra Harbour compiler options -# (GNU make compatible envvar) +# CFLAGS - Extra C compiler options for libraries and for +# executables +# C_USR - Extra C compiler options for libraries and for +# executables (GNU make compatible envvar) +# CLIBFLAGS - Extra C compiler options for the libraries +# HARBOURFLAGS - Extra Harbour compiler options +# PRG_USR - Extra Harbour compiler options +# (GNU make compatible envvar) #.KEEP .AUTODEPEND @@ -51,11 +45,11 @@ MKLIB = tlib.exe CFLAGS = -O2 $(CFLAGS) !endif -CFLAGS = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS) +CFLAGS = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS) CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) CLIBFLAGSDEBUG = -v $(CLIBFLAGS) HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) -LDFLAGS = $(LDFLAGS) +LDFLAGS = $(LDFLAGS) # This is needed, otherwise the libs may overflow when # debug info is requested with -v -y @@ -96,6 +90,8 @@ $(OBJ_DIR);\ !include common.mak +ALL_HEADERS = $(PRG_HEADERS) $(C_HEADERS) + #********************************************************** $(LIB_PATH) : $(LIB_OBJS) IF EXIST "$(LIB_PATH)" $(DEL) "$(LIB_PATH)" > NUL @@ -104,5 +100,64 @@ $(LIB_PATH) : $(LIB_OBJS) +) ! #********************************************************** +# CLEAN rule(s) +#********************************************************** -!include $(HB_ROOT)\contrib\mtpl_ruls.mak +clean: doClean +Clean: doClean +CLEAN: doClean + +doClean: + @if exist $(LIB_PATH) $(DEL) $(LIB_PATH) > nul + @$(ECHO) @echo off > delone.bat + @$(ECHO) set >>setenv >> delone.bat + @$(ECHO) if """%%1""" == """""" goto skip >> delone.bat + @$(ECHO) if exist %%1.c $(DEL) %%1.c >> delone.bat + @$(ECHO) if exist %%1.obj $(DEL) %%1.obj >> delone.bat + @$(ECHO) :skip >> delone.bat + @type &&! +@%%COMSPEC%% /c delone.bat $(LIB_OBJS:.obj=^ +@%%COMSPEC%% /c delone.bat ) +! > delall.bat + @if exist delall.bat $(DEL) delall.bat > nul + @if exist delone.bat $(DEL) delone.bat > nul + @if exist delall.bat $(DEL) delall.bat > nul + +!if "$(HB_INSTALL_PREFIX)" == "$(HB_ROOT)" + @if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul + @$(ECHO) @echo off > delone.bat + @$(ECHO) if """%%1""" == """""" goto skip >> delone.bat + @$(ECHO) if exist $(HB_INC_INSTALL)\%%1 $(DEL) $(HB_INC_INSTALL)\%%1 >> delone.bat + @$(ECHO) :skip >> delone.bat + @type &&! +@%%COMSPEC%% /c delone.bat $(ALL_HEADERS: =^ +@%%COMSPEC%% /c delone.bat ) +! > delall.bat + @if exist delall.bat $(DEL) delall.bat > nul + @if exist delone.bat $(DEL) delone.bat > nul + @if exist delall.bat $(DEL) delall.bat > nul +!endif + +#********************************************************** +# INSTALL rule(s) +#********************************************************** + +install: doInstall +Install: doInstall +INSTALL: doInstall + +doInstall: + @if exist $(LIB_PATH) copy $(LIB_PATH) $(HB_LIB_INSTALL) > nul + @$(ECHO) @echo off > cpyone.bat + @$(ECHO) if """%%1""" == """""" goto skip >> cpyone.bat + @$(ECHO) if exist %%1 copy %%1 $(HB_INC_INSTALL) >> cpyone.bat + @$(ECHO) :skip >> cpyone.bat + @< nul + @if exist cpyone.bat $(DEL) cpyone.bat > nul + @if exist cpyall.bat $(DEL) cpyall.bat > nul + +#********************************************************** diff --git a/harbour/contrib/mtpl_defs.mak b/harbour/contrib/mtpl_defs.mak index e4049746fd..233de454a5 100644 --- a/harbour/contrib/mtpl_defs.mak +++ b/harbour/contrib/mtpl_defs.mak @@ -2,12 +2,6 @@ # $Id$ # -# ------------------------------------------------------------------- -# Copyright 2007 Marek Paliwoda (mpaliwoda "at" interia "dot" pl) -# Copyright 2007 Viktor Szakats (viktor.szakats "at" syenar "dot" hu) -# See doc/license.txt for licensing terms. -# ------------------------------------------------------------------- - # -------------------------------------------------------- # Makefile common section for Harbour Project Contrib libs # for Microsoft Visual C/Borland C/C++ - definitions diff --git a/harbour/contrib/mtpl_ruls.mak b/harbour/contrib/mtpl_ruls.mak deleted file mode 100644 index 4069f9d816..0000000000 --- a/harbour/contrib/mtpl_ruls.mak +++ /dev/null @@ -1,79 +0,0 @@ -# -# $Id$ -# - -# --------------------------------------------------------------- -# Copyright 2007 Marek Paliwoda (mpaliwoda "at" interia "dot" pl) -# See doc/license.txt for licensing terms. -# --------------------------------------------------------------- - -# -------------------------------------------------------- -# Makefile common section for Harbour Project Contrib libs -# for Microsoft Visual C/Borland C/C++ - common rules -# ----------------------------------------------------------------- - -ALL_HEADERS = $(PRG_HEADERS) $(C_HEADERS) - -#********************************************************** -# CLEAN rule(s) -#********************************************************** - -clean: doClean -Clean: doClean -CLEAN: doClean - -doClean: - @if exist $(LIB_PATH) $(DEL) $(LIB_PATH) > nul - @$(ECHO) @echo off > delone.bat - @$(ECHO) if """%%1""" == """""" goto skip >> delone.bat - @$(ECHO) if exist %%1.c $(DEL) %%1.c >> delone.bat - @$(ECHO) if exist %%1.obj $(DEL) %%1.obj >> delone.bat - @$(ECHO) :skip >> delone.bat - @< nul - @if exist delone.bat $(DEL) delone.bat > nul - @if exist delall.bat $(DEL) delall.bat > nul - -!if "$(HB_INSTALL_PREFIX)" == "$(HB_ROOT)" - @if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul - @$(ECHO) @echo off > delone.bat - @$(ECHO) if """%%1""" == """""" goto skip >> delone.bat - @$(ECHO) if exist $(HB_INC_INSTALL)\%%1 $(DEL) $(HB_INC_INSTALL)\%%1 >> delone.bat - @$(ECHO) :skip >> delone.bat - @< nul - @if exist delone.bat $(DEL) delone.bat > nul - @if exist delall.bat $(DEL) delall.bat > nul -!endif - -#********************************************************** - -#********************************************************** -# INSTALL rule(s) -#********************************************************** - -install: doInstall -Install: doInstall -INSTALL: doInstall - -doInstall: - @if exist $(LIB_PATH) copy $(LIB_PATH) $(HB_LIB_INSTALL) > nul - @$(ECHO) @echo off > cpyone.bat - @$(ECHO) if """%%1""" == """""" goto skip >> cpyone.bat - @$(ECHO) if exist %%1 copy %%1 $(HB_INC_INSTALL) >> cpyone.bat - @$(ECHO) :skip >> cpyone.bat - @< nul - @if exist cpyone.bat $(DEL) cpyone.bat > nul - @if exist cpyall.bat $(DEL) cpyall.bat > nul - -#********************************************************** diff --git a/harbour/contrib/mtpl_vc.mak b/harbour/contrib/mtpl_vc.mak index 05c456aaef..3bfc233b5c 100644 --- a/harbour/contrib/mtpl_vc.mak +++ b/harbour/contrib/mtpl_vc.mak @@ -2,28 +2,22 @@ # $Id$ # -# ------------------------------------------------------------------- -# Copyright 2007 Marek Paliwoda (mpaliwoda "at" interia "dot" pl) -# Copyright 2007 Viktor Szakats (viktor.szakats "at" syenar "dot" hu) -# See doc/license.txt for licensing terms. -# ------------------------------------------------------------------- - # -------------------------------------------------------- # Makefile common section for Harbour Project Contrib libs # for Microsoft Visual C # -------------------------------------------------------- # NOTE: You can use these envvars to configure the make process: -# (note that these are all optional) +# (note that these are all optional) # -# CFLAGS - Extra C compiler options for libraries and for -# executables -# C_USR - Extra C compiler options for libraries and for -# executables (GNU make compatible envvar) -# CLIBFLAGS - Extra C compiler options for the libraries -# HARBOURFLAGS - Extra Harbour compiler options -# PRG_USR - Extra Harbour compiler options -# (GNU make compatible envvar) +# CFLAGS - Extra C compiler options for libraries and for +# executables +# C_USR - Extra C compiler options for libraries and for +# executables (GNU make compatible envvar) +# CLIBFLAGS - Extra C compiler options for the libraries +# HARBOURFLAGS - Extra Harbour compiler options +# PRG_USR - Extra Harbour compiler options +# (GNU make compatible envvar) # Visual C++ version !ifndef HB_VISUALC_VER @@ -48,11 +42,11 @@ MKLIB = lib.exe #********************************************************** -CFLAGS = -I$(INCLUDE_DIR) -W3 -nologo $(C_USR) $(CFLAGS) +CFLAGS = -I$(INCLUDE_DIR) -W3 -nologo $(C_USR) $(CFLAGS) CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) CLIBFLAGSDEBUG = -Zi $(CLIBFLAGS) HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) -LDFLAGS = $(LDFLAGS) +LDFLAGS = $(LDFLAGS) #********************************************************** # COMPILE Rules @@ -82,6 +76,8 @@ LDFLAGS = $(LDFLAGS) !include common.mak +ALL_HEADERS = $(PRG_HEADERS) $(C_HEADERS) + #********************************************************** $(LIB_PATH) : $(LIB_OBJS) IF EXIST "$@" $(DEL) "$@" > nul @@ -89,5 +85,64 @@ $(LIB_PATH) : $(LIB_OBJS) $** <<$(KEEPSTATE) #********************************************************** +# CLEAN rule(s) +#********************************************************** -!include $(HB_ROOT)\contrib\mtpl_ruls.mak +clean: doClean +Clean: doClean +CLEAN: doClean + +doClean: + @if exist $(LIB_PATH) $(DEL) $(LIB_PATH) > nul + @$(ECHO) @echo off > delone.bat + @$(ECHO) set >>setenv >> delone.bat + @$(ECHO) if """%%1""" == """""" goto skip >> delone.bat + @$(ECHO) if exist %%1.c $(DEL) %%1.c >> delone.bat + @$(ECHO) if exist %%1.obj $(DEL) %%1.obj >> delone.bat + @$(ECHO) :skip >> delone.bat + @< nul + @if exist delone.bat $(DEL) delone.bat > nul + @if exist delall.bat $(DEL) delall.bat > nul + +!if "$(HB_INSTALL_PREFIX)" == "$(HB_ROOT)" + @if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul + @$(ECHO) @echo off > delone.bat + @$(ECHO) if """%%1""" == """""" goto skip >> delone.bat + @$(ECHO) if exist $(HB_INC_INSTALL)\%%1 $(DEL) $(HB_INC_INSTALL)\%%1 >> delone.bat + @$(ECHO) :skip >> delone.bat + @< nul + @if exist delone.bat $(DEL) delone.bat > nul + @if exist delall.bat $(DEL) delall.bat > nul +!endif + +#********************************************************** +# INSTALL rule(s) +#********************************************************** + +install: doInstall +Install: doInstall +INSTALL: doInstall + +doInstall: + @if exist $(LIB_PATH) copy $(LIB_PATH) $(HB_LIB_INSTALL) > nul + @$(ECHO) @echo off > cpyone.bat + @$(ECHO) if """%%1""" == """""" goto skip >> cpyone.bat + @$(ECHO) if exist %%1 copy %%1 $(HB_INC_INSTALL) >> cpyone.bat + @$(ECHO) :skip >> cpyone.bat + @< nul + @if exist cpyone.bat $(DEL) cpyone.bat > nul + @if exist cpyall.bat $(DEL) cpyall.bat > nul + +#**********************************************************