From 22de797f9cd58c4515b320ca4e28c1d8db6270ed Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 18 Feb 2009 21:35:33 +0000 Subject: [PATCH] 2009-02-18 22:34 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * config/global.cf + Added link to GNU make docs. + Added .SUFFIXES: to delete all built-in rules. This does the same as the -r switch which we were using so far, so this one is no more necessary. Now GNU make can be started by simply running 'make' without parameters. * make_gcc.sh * make_gnu_os2.cmd * make_gnu.bat % Removed make -r switches. ; TODO: Do the same in the rest of the scripts. --- harbour/ChangeLog | 14 ++++++++++++++ harbour/config/global.cf | 5 +++++ harbour/make_gcc.sh | 2 +- harbour/make_gnu.bat | 2 +- harbour/make_gnu_os2.cmd | 2 +- 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2db59de265..b338f072c3 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,20 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-18 22:34 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * config/global.cf + + Added link to GNU make docs. + + Added .SUFFIXES: to delete all built-in rules. This does + the same as the -r switch which we were using so far, + so this one is no more necessary. Now GNU make can be + started by simply running 'make' without parameters. + + * make_gcc.sh + * make_gnu_os2.cmd + * make_gnu.bat + % Removed make -r switches. + ; TODO: Do the same in the rest of the scripts. + 2009-02-18 22:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * ChangeLog * utils/hbmk/hbmk2.prg diff --git a/harbour/config/global.cf b/harbour/config/global.cf index 271fa8f937..4fa411a1f5 100644 --- a/harbour/config/global.cf +++ b/harbour/config/global.cf @@ -2,6 +2,11 @@ # $Id$ # +# See GNU make docs here: +# http://www.gnu.org/software/automake/manual/make/ + +.SUFFIXES: + GRANDP = ../../ HB_ARCH := $(HB_ARCHITECTURE)/$(HB_COMPILER) diff --git a/harbour/make_gcc.sh b/harbour/make_gcc.sh index 5f86b0beb6..3d38f71e20 100755 --- a/harbour/make_gcc.sh +++ b/harbour/make_gcc.sh @@ -187,5 +187,5 @@ sed -e 's/;/ /g' \ -e 's/^!include/include/g' \ common.mak > common.cf -$MAKE -r -f make_gcc.mak $HB_USER_MAKEFLAGS $* +$MAKE -f make_gcc.mak $HB_USER_MAKEFLAGS $* rm -f common.cf diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat index 573a2f65a3..ad0e4828cc 100644 --- a/harbour/make_gnu.bat +++ b/harbour/make_gnu.bat @@ -107,7 +107,7 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%/include rem --------------------------------------------------------------- rem Start the GNU make system - make -r %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9 > make_gnu.log + make %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9 > make_gnu.log goto END :END diff --git a/harbour/make_gnu_os2.cmd b/harbour/make_gnu_os2.cmd index fb1e3363f9..0c6cf288e6 100644 --- a/harbour/make_gnu_os2.cmd +++ b/harbour/make_gnu_os2.cmd @@ -35,4 +35,4 @@ if "%HB_OS2_TCP32%" == "YES" goto tcp32 set HB_USER_CFLAGS=-DTCPV40HDRS %HB_USER_CFLAGS% :tcp32 -make -r %1 %2 %3 %4 %5 %6 %7 %8 %9 > make_gnu.log +make %1 %2 %3 %4 %5 %6 %7 %8 %9 > make_gnu.log