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

2006-07-25 11:45 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)

Browse Source 
* harbour/makefile.bc
   * harbour/makefile.vc
     ! Fixed INSTALL rule.
     ! Disabled generic library build rule which might
       wrongly interact with normal build process.
This commit is contained in:
Marek Paliwoda
2006-07-25 09:46:22 +00:00
parent 460b06eda5
commit 46359c10a2
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
harbour/makefile.bc
View File

@@ -202,13 +202,12 @@ DLL_OBJS = $(TMP_DLL_OBJS:$(OBJ_DIR)=$(DLL_OBJ_DIR))
#**********************************************************
# General Library BUILD rule
{$(OBJ_DIR)}.obj{$(LIB_DIR)}.lib:
IF EXIST "$@" $(DEL) "$@" > NUL
$(MKLIB) "$@" $(ARFLAGS) @&&!
+$(**: = &^
+)
!
#{$(OBJ_DIR)}.obj{$(LIB_DIR)}.lib:
# IF EXIST "$@" $(DEL) "$@" > NUL
# $(MKLIB) "$@" $(ARFLAGS) @&&!
#+$(**: = &^
#+)
#!
#**********************************************************
#**********************************************************
@@ -231,6 +230,7 @@ StdLibs : $(STANDARD_STATIC_HBLIBS)
#**********************************************************
clean: doClean
Clean: doClean
CLEAN: doClean
doClean:
@@ -254,9 +254,11 @@ doClean:
#**********************************************************
install : doInstall
Install : doInstall
INSTALL : doInstall
doInstall:
doInstall: $(HB_BIN_INSTALL) $(HB_LIB_INSTALL) $(HB_INC_INSTALL)
-if exist $(HB_BIN_INSTALL)\nul if exist $(BIN_DIR)\*.exe copy /B /Y $(BIN_DIR)\*.exe $(HB_BIN_INSTALL) > nul
-if exist $(HB_BIN_INSTALL)\nul if exist $(BIN_DIR)\*.dll copy /B /Y $(BIN_DIR)\*.dll $(HB_BIN_INSTALL) > nul
-if exist $(HB_LIB_INSTALL)\nul if exist $(BIN_DIR)\*.lib copy /B /Y $(BIN_DIR)\*.lib $(HB_LIB_INSTALL) > nul
-if exist $(HB_LIB_INSTALL)\nul if exist $(LIB_DIR)\*.lib copy /B /Y $(LIB_DIR)\*.lib $(HB_LIB_INSTALL) > nul
@@ -268,7 +270,7 @@ doInstall:
#**********************************************************
$(HB_DEST_DIRS):
$(HB_DEST_DIRS) $(HB_BIN_INSTALL) $(HB_LIB_INSTALL) $(HB_INC_INSTALL):
!if not exist $@\nul mkdir $@
#**********************************************************

17
harbour/makefile.vc
View File

@@ -612,11 +612,11 @@ DLL_OBJS = $(TMP_DLL_OBJS:obj\vc=obj\dll\vc)
#
#**********************************************************
# General Library BUILD rule
{$(OBJ_DIR)}.obj{$(COMMON_DIR)}.lib:
IF EXIST "$@" $(DEL) "$@" > NUL
$(MKLIB) /out:$@ <<
$**
<<
#{$(OBJ_DIR)}.obj{$(COMMON_DIR)}.lib:
# IF EXIST "$@" $(DEL) "$@" > NUL
# $(MKLIB) /out:$@ <<
#$**
#<<
#**********************************************************
#**********************************************************
#**********************************************************
@@ -638,6 +638,7 @@ all : $(HB_DEST_DIRS) $(HB_BUILD_TARGETS)
#**********************************************************
clean: doClean
Clean: doClean
CLEAN: doClean
doClean:
@@ -665,9 +666,11 @@ doClean:
#**********************************************************
install : doInstall
Install : doInstall
INSTALL : doInstall
doInstall:
doInstall: $(HB_BIN_INSTALL) $(HB_LIB_INSTALL) $(HB_INC_INSTALL)
-if exist $(HB_BIN_INSTALL)\nul if exist $(BIN_DIR)\*.exe copy /B /Y $(BIN_DIR)\*.exe $(HB_BIN_INSTALL) > nul
-if exist $(HB_BIN_INSTALL)\nul if exist $(BIN_DIR)\*.dll copy /B /Y $(BIN_DIR)\*.dll $(HB_BIN_INSTALL) > nul
-if exist $(HB_LIB_INSTALL)\nul if exist $(BIN_DIR)\*.lib copy /B /Y $(BIN_DIR)\*.lib $(HB_LIB_INSTALL) > nul
-if exist $(HB_LIB_INSTALL)\nul if exist $(LIB_DIR)\*.lib copy /B /Y $(LIB_DIR)\*.lib $(HB_LIB_INSTALL) > nul
@@ -679,7 +682,7 @@ doInstall:
#**********************************************************
$(HB_DEST_DIRS):
$(HB_DEST_DIRS) $(HB_BIN_INSTALL) $(HB_LIB_INSTALL) $(HB_INC_INSTALL):
!if not exist $@\nul mkdir $@
#**********************************************************