summaryrefslogtreecommitdiff
path: root/jmake
diff options
context:
space:
mode:
Diffstat (limited to 'jmake')
-rw-r--r--jmake/files/Jmake.rules41
-rw-r--r--jmake/files/Jmake.tmpl8
2 files changed, 33 insertions, 16 deletions
diff --git a/jmake/files/Jmake.rules b/jmake/files/Jmake.rules
index 0b0c02d..f02bd9b 100644
--- a/jmake/files/Jmake.rules
+++ b/jmake/files/Jmake.rules
@@ -1,12 +1,12 @@
;########################################################################
;# Jmake rules for building libraries, programs, scripts, and data files
-;# $Id: Jmake.rules 174 2014-04-05 08:19:48Z rmanfredi $
+;# $Id: Jmake.rules 195 2015-04-27 21:30:17Z rmanfredi $
/*
* MACHINE-INDEPENDENT RULES -- DO NOT MODIFY
*/
-/* $Id: Jmake.rules 174 2014-04-05 08:19:48Z rmanfredi $
+/* $Id: Jmake.rules 195 2015-04-27 21:30:17Z rmanfredi $
*
* Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
*
@@ -282,7 +282,7 @@ local_deinstall.man:: @@\
* Generate rules to install the indicated library.
*/
#define InstallLibrary(libname,dest) @!\
-local_install:: lib^^libname.a @@\
+local_install local_install-strip:: lib^^libname.a @@\
_MakeInstallDirIgnore(dest) \ @@\
$(INSTALL) -c -m 644 lib^^libname.a $(INSTALL_PREFIX)^^^dest @@\
$(RANLIB) dest/lib^^libname.a @@\
@@ -297,7 +297,7 @@ local_deinstall:: @@\
* Generate rules to install the shared library.
*/
#define InstallSharedLibrary(libname,rev,dest) @!\
-local_install:: lib^^libname.so.rev @@\
+local_install local_install-strip:: lib^^libname.so.rev @@\
_MakeInstallDirIgnore(dest) \ @@\
$(INSTALL) -c -m 444 lib^^libname.so.rev $(INSTALL_PREFIX)^^^dest @!\
@!\
@@ -310,7 +310,7 @@ local_deinstall:: @@\
* Generate rules to install the shared library data
*/
#define InstallSharedLibraryData(libname,rev,dest) @!\
-local_install:: lib^^libname.sa.rev @@\
+local_install local_install-strip:: lib^^libname.sa.rev @@\
_MakeInstallDirIgnore(dest) \ @@\
$(INSTALL) -c -m 444 lib^^libname.sa.rev $(INSTALL_PREFIX)^^^dest @!\
@!\
@@ -324,7 +324,7 @@ local_deinstall:: @@\
* for the purposes of aliasing.
*/
#define InstallLibraryAlias(libname,alias,dest) @!\
-local_install:: lib^^libname.a @@\
+local_install local_install-strip:: lib^^libname.a @@\
$(RM) lib^^alias.a @@\
-(cd dest; $(LN) lib^^libname.a lib^^alias.a) @!\
@!\
@@ -376,7 +376,7 @@ InstallManPageLong(file,dest,file)
* install flags.
*/
#define InstallNonExec(file,dest) @!\
-local_install:: file @@\
+local_install local_install-strip:: file @@\
_MakeInstallDirIgnore(dest) \ @@\
$(INSTALL) -c -m 444 file $(INSTALL_PREFIX)^^^dest @!\
@!\
@@ -388,10 +388,16 @@ local_deinstall:: @@\
* InstallProgramWithFlags:
* Generate rules to install an executable program using given
* install flags.
+ * By default, program is not stripped, but the install-strip target
+ * will force stripping.
*/
#define InstallProgramWithFlags(program,dest,flags) @!\
local_install:: program @@\
_MakeInstallDirIgnore(dest) \ @@\
+ $(INSTALL) -c -m 555 flags program^^^$(_EXE) $(INSTALL_PREFIX)^^^dest @!\
+ @!\
+local_install-strip:: program @@\
+ _MakeInstallDirIgnore(dest) \ @@\
$(INSTALL) -c -s -m 555 flags program^^^$(_EXE) $(INSTALL_PREFIX)^^^dest @!\
@!\
local_deinstall:: @@\
@@ -401,10 +407,10 @@ local_deinstall:: @@\
/*
* InstallProgramNoStripWithFlags:
* Generate rules to install an executable program using given
- * install flags.
+ * install flags. The program is never stripped.
*/
#define InstallProgramNoStripWithFlags(program,dest,flags) @!\
-local_install:: program @@\
+local_install local_install-strip:: program @@\
_MakeInstallDirIgnore(dest) \ @@\
$(INSTALL) -c -m 555 flags program^^^$(_EXE) $(INSTALL_PREFIX)^^^dest @!\
@!\
@@ -416,6 +422,8 @@ local_deinstall:: @@\
* InstallProgram:
* Generate rules to install an executable program using any special
* install flags set in $(INSTALLFLAGS).
+ * By default, program is not stripped, but the install-strip target
+ * will force stripping.
*/
#define InstallProgram(program,dest) @!\
InstallProgramWithFlags(program,dest,^^)
@@ -437,7 +445,7 @@ InstallProgramNoStripWithFlags(program,dest,^^)
* install flags.
*/
#define InstallScriptWithFlags(script,dest,flags) @!\
-local_install:: script @@\
+local_install local_install-strip:: script @@\
_MakeInstallDirIgnore(dest) \ @@\
$(INSTALL) -c -m 555 flags script $(INSTALL_PREFIX)^^^dest @!\
@!\
@@ -461,7 +469,7 @@ InstallScriptWithFlags(script,dest,^^)
*/
#define InstallScripts() @!\
|once _InstallScripts_ @!\
-local_install:: $(SCRIPTS) $(LSCRIPTS) @@\
+local_install local_install-strip:: $(SCRIPTS) $(LSCRIPTS) @@\
_MakeInstallDirIgnore($(SCRIPTDIR)) \ @@\
for file in $(SCRIPTS) $(LSCRIPTS); do \ @@\
(set -x; \ @@\
@@ -644,6 +652,10 @@ local_clobber:: local_realclean @!\
%SUBDIRS:install:: local_install @@\
@exit 0 @!\
@!\
+?SUBDIRS:install-strip:: local_install-strip sub_install-strip @!\
+%SUBDIRS:install-strip:: local_install-strip @@\
+ @exit 0 @!\
+ @!\
?SUBDIRS:install.man:: maybe_install.man sub_install.man @!\
%SUBDIRS:install.man:: maybe_install.man @!\
?SUBDIRS:deinstall:: sub_deinstall local_deinstall @!\
@@ -1194,7 +1206,7 @@ subdirs: @@\
@case '${MFLAGS}' in *[ik]*) set +e;; *) set -e;; esac; \ @@\
for i in dirs ;\ @@\
do \ @@\
- (cd $$i ; echo $(VERB) "in $(DIR)$$i..."; \ @@\
+ (cd $$i ; echo "$(VERB) in $(DIR)$$i..."; \ @@\
$(MAKE) $(MFLAGS) $(FLAGS) $(TARGET)) || exit 1; \ @@\
done
@@ -1292,7 +1304,8 @@ DependDirs($(SUBDIRS))
* files.
*/
#define InstallSubdirs() \
-NamedSubTargetSubdirs(install,"Installing",^^) @!\
+NamedSubTargetSubdirs(install,"Installing",^^) @!\
+NamedSubTargetSubdirs(install-strip,"Installing (strip)",^^) @!\
NamedDepthTargetSubdirs(deinstall,"Deinstalling",^^)
@@ -1425,7 +1438,7 @@ step:: @@\
* time (removed by deinstall).
*/
#define MakeInstallDirectories(dirs) @!\
-local_install:: @@\
+local_install local_install-strip:: @@\
_MakeInstallDirs(dirs) @!\
@!\
local_deinstall:: @@\
diff --git a/jmake/files/Jmake.tmpl b/jmake/files/Jmake.tmpl
index a06d405..7765fba 100644
--- a/jmake/files/Jmake.tmpl
+++ b/jmake/files/Jmake.tmpl
@@ -1,7 +1,7 @@
/*
* Generic jmake template
*
- * $Id: Jmake.tmpl 156 2012-12-19 16:44:39Z rmanfredi $
+ * $Id: Jmake.tmpl 183 2015-04-12 09:48:11Z rmanfredi $
*
* Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
*
@@ -27,7 +27,7 @@
*/
: Makefile.SH generated from Jmake.tmpl and Jmakefile <TAG>
-: $Id: Jmake.tmpl 156 2012-12-19 16:44:39Z rmanfredi $
+: $Id: Jmake.tmpl 183 2015-04-12 09:48:11Z rmanfredi $
/*************************************************************************
* *
@@ -217,6 +217,7 @@ MakeSubdirs()
* in this directory.
*/
local_install::
+local_install-strip::
local_deinstall::
local_install.man::
local_deinstall.man::
@@ -229,6 +230,9 @@ local_deinstall.man::
local_install::
@echo "install in $(CURRENT) done."
+local_install-strip::
+ @echo "install (strip) in $(CURRENT) done."
+
local_deinstall::
@echo "deinstall in $(CURRENT) done."