summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrmanfredi <rmanfredi@190e5f8e-a817-0410-acf6-e9863daed9af>2006-08-25 22:24:13 +0000
committerrmanfredi <rmanfredi@190e5f8e-a817-0410-acf6-e9863daed9af>2006-08-25 22:24:13 +0000
commit9ab27126b3aa38a1f550c460ea4a07850c649b12 (patch)
tree691a4d4106de924104f3ebd365ae4e8cec5ed364
parent50a68169ac2c3ef620dcba352f4ab7174b688c03 (diff)
InstallTarget() now uses :: targets.
Default empty rule for all makefiles is now called "all" instead of "emptyrule" because if there is nothing to be done, GNU make prints the target name and "emptyrule" is not pretty. git-svn-id: https://dist.svn.sourceforge.net/svnroot/dist/trunk/dist@7 190e5f8e-a817-0410-acf6-e9863daed9af
-rw-r--r--jmake/files/Jmake.rules16
-rw-r--r--jmake/files/Jmake.tmpl2
2 files changed, 9 insertions, 9 deletions
diff --git a/jmake/files/Jmake.rules b/jmake/files/Jmake.rules
index e8be807..636c561 100644
--- a/jmake/files/Jmake.rules
+++ b/jmake/files/Jmake.rules
@@ -592,14 +592,14 @@ local_clobber:: local_realclean @!\
* Generate rules to recursively install files
*/
#define InstallTarget() @!\
-?SUBDIRS:install: local_install sub_install @!\
-%SUBDIRS:install: local_install @!\
-?SUBDIRS:install.man: maybe_install.man sub_install.man @!\
-%SUBDIRS:install.man: maybe_install.man @!\
-?SUBDIRS:deinstall: sub_deinstall local_deinstall @!\
-%SUBDIRS:deinstall: local_deinstall @!\
-?SUBDIRS:deinstall.man: sub_deinstall.man maybe_deinstall.man @!\
-%SUBDIRS:deinstall.man: maybe_deinstall.man @!\
+?SUBDIRS:install:: local_install sub_install @!\
+%SUBDIRS:install:: local_install @!\
+?SUBDIRS:install.man:: maybe_install.man sub_install.man @!\
+%SUBDIRS:install.man:: maybe_install.man @!\
+?SUBDIRS:deinstall:: sub_deinstall local_deinstall @!\
+%SUBDIRS:deinstall:: local_deinstall @!\
+?SUBDIRS:deinstall.man:: sub_deinstall.man maybe_deinstall.man @!\
+%SUBDIRS:deinstall.man:: maybe_deinstall.man @!\
@!\
?MANSRC:install.man-yes: local_install.man @!\
install.man-no: @!\
diff --git a/jmake/files/Jmake.tmpl b/jmake/files/Jmake.tmpl
index 052ad5e..61f848f 100644
--- a/jmake/files/Jmake.tmpl
+++ b/jmake/files/Jmake.tmpl
@@ -151,7 +151,7 @@ all:: .FORCE_DEPEND
* These need to be here so that rules in Jmakefile occur first; the blank
* all is to make sure that an empty Jmakefile doesn't default to make clean.
*/
-emptyrule::
+all::
CleanTarget()
InstallTarget()