From 8ef12af6d4fcb6419f0b94f6ffe9481fbd59d9b7 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 23 Oct 2008 10:18:03 +0000 Subject: [PATCH] 2008-10-23 12:17 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * make_vc.mak ! Changed '!' (non-working) echo supression char to '@'. * contrib/mtpl_b32.mak * contrib/mtpl_vc.mak % Changed to create the obj dir as a separate build rule (just like for core) rather than for each file. --- harbour/ChangeLog | 9 +++++++++ harbour/contrib/mtpl_b32.mak | 8 +++++--- harbour/contrib/mtpl_vc.mak | 8 +++++--- harbour/make_vc.mak | 2 +- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 026915f937..7b55f5e8e2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,15 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-10-23 12:17 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * make_vc.mak + ! Changed '!' (non-working) echo supression char to '@'. + + * contrib/mtpl_b32.mak + * contrib/mtpl_vc.mak + % Changed to create the obj dir as a separate build rule + (just like for core) rather than for each file. + 2008-10-23 12:00 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * make_b32.mak * make_vc.mak diff --git a/harbour/contrib/mtpl_b32.mak b/harbour/contrib/mtpl_b32.mak index 6978669eac..bd52d13482 100644 --- a/harbour/contrib/mtpl_b32.mak +++ b/harbour/contrib/mtpl_b32.mak @@ -140,20 +140,22 @@ ALL_LIB_SRC_DIRS_TMP=\ .;\ $(OBJ_DIR);\ +all: $(OBJ_DIR) $(LIB_PATH) + +$(OBJ_DIR): + @if not exist $@\nul mkdir $@ + #********************************************************** # General *.c --> *.obj COMPILE rule for STATIC Libraries {$(ALL_LIB_SRC_DIRS)}.c{$(OBJ_DIR)}$(OBJEXT): - @if not exist "$(OBJ_DIR)" md "$(OBJ_DIR)" > nul $(CC) $(CLIBFLAGS) -o$@ $< #********************************************************** # General *.cpp --> *.obj COMPILE rule for STATIC Libraries {$(ALL_LIB_SRC_DIRS)}.cpp{$(OBJ_DIR)}$(OBJEXT): - @if not exist "$(OBJ_DIR)" md "$(OBJ_DIR)" > nul $(CC) $(CLIBFLAGS: -P= ) -P -o$@ $< #********************************************************** # General *.prg --> *.obj COMPILE rule for STATIC Libraries {$(ALL_LIB_SRC_DIRS)}.prg{$(OBJ_DIR)}$(OBJEXT): - @if not exist "$(OBJ_DIR)" md "$(OBJ_DIR)" > nul $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $** $(CC) $(CLIBFLAGS) -o$@ $(OBJ_DIR)\$&.c #********************************************************** diff --git a/harbour/contrib/mtpl_vc.mak b/harbour/contrib/mtpl_vc.mak index 26bee8ce9a..f33c6b8fac 100644 --- a/harbour/contrib/mtpl_vc.mak +++ b/harbour/contrib/mtpl_vc.mak @@ -137,20 +137,22 @@ LDFLAGS = $(LDFLAGS) $(L_USR) # COMPILE Rules #********************************************************** +all: $(OBJ_DIR) $(LIB_PATH) + +$(OBJ_DIR): + @if not exist $@\nul mkdir $@ + #********************************************************** # General *.c --> *.obj COMPILE rule for STATIC Libraries {.}.c{$(OBJ_DIR)}$(OBJEXT):: - @if not exist "$(OBJ_DIR)" md "$(OBJ_DIR)" > nul $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< #********************************************************** # General *.cpp --> *.obj COMPILE rule for STATIC Libraries {.}.cpp{$(OBJ_DIR)}$(OBJEXT):: - @if not exist "$(OBJ_DIR)" md "$(OBJ_DIR)" > nul $(CC) $(CLIBFLAGS: -TC= -TP) -Fo$(OBJ_DIR)\ $< #********************************************************** # General *.prg --> *.obj COMPILE rule for STATIC Libraries {.}.prg{$(OBJ_DIR)}$(OBJEXT): - @if not exist "$(OBJ_DIR)" md "$(OBJ_DIR)" > nul $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c #********************************************************** diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak index ddd070212a..457d77a7e9 100644 --- a/harbour/make_vc.mak +++ b/harbour/make_vc.mak @@ -693,7 +693,7 @@ all : $(HB_DEST_DIRS) $(HB_BUILD_TARGETS) #********************************************************** $(HB_DEST_DIRS) $(HB_BIN_INSTALL) $(HB_LIB_INSTALL) $(HB_INC_INSTALL): - !if not exist $@\nul mkdir $@ + @if not exist $@\nul mkdir $@ #********************************************************** # LIBRARY Targets BUILD rules