Skip to content

Commit

Permalink
Added an "install-strip" target to all Makefiles to install with stri…
Browse files Browse the repository at this point in the history
…pping.

The InstallProgramNoStrip() jmake target is no longer used, we now prefer
the standard InstallProgram() because the default Makefile targets changed:
a plain "install" now always installs without stripping, whilst the new
"install-strip" target can be used to install with executable stripping if
required.

In order to have the new "install-strip" target propagated recursively through
all the directories, all the Makefile.SH files were regenerated with jmake.
  • Loading branch information
rmanfredi committed Apr 12, 2015
1 parent 780b62a commit 2220679
Show file tree
Hide file tree
Showing 20 changed files with 185 additions and 59 deletions.
13 changes: 10 additions & 3 deletions Makefile.SH
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-148]
: $X-Id: Jmake.tmpl 69 2011-01-09 13:57:07Z rmanfredi $
: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-183]
: $X-Id: Jmake.tmpl 183 2015-04-12 09:48:11Z rmanfredi $

case $CONFIG in
'')
Expand Down Expand Up @@ -50,7 +50,7 @@ SUBDIRS = src pixmaps po extra_files
$spitshell >>Makefile <<'!NO!SUBS!'
########################################################################
# Jmake rules for building libraries, programs, scripts, and data files
# $X-Id: Jmake.rules 106 2011-11-25 20:36:12Z rmanfredi $
# $X-Id: Jmake.rules 183 2015-04-12 09:48:11Z rmanfredi $
########################################################################
# Start of Jmakefile
Expand Down Expand Up @@ -94,6 +94,9 @@ local_clobber:: local_realclean
install:: local_install sub_install
@exit 0
install-strip:: local_install-strip sub_install-strip
@exit 0
install.man:: maybe_install.man sub_install.man
deinstall:: sub_deinstall local_deinstall
deinstall.man:: sub_deinstall.man maybe_deinstall.man
Expand Down Expand Up @@ -140,6 +143,9 @@ subdirs:
sub_install::
@$(MAKE) subdirs TARGET=install VERB="Installing" FLAGS=
sub_install-strip::
@$(MAKE) subdirs TARGET=install-strip VERB="Installing (strip)" FLAGS=
sub_deinstall::
@$(MAKE) subdirs TARGET=deinstall VERB="Deinstalling" FLAGS=
@echo "Back to $(CURRENT) for "deinstall...
Expand Down Expand Up @@ -208,6 +214,7 @@ all::
@$(MAKE) subdirs TARGET=all VERB="Making all" FLAGS=
local_install::
local_install-strip::
local_deinstall::
local_install.man::
local_deinstall.man::
Expand Down
12 changes: 9 additions & 3 deletions pixmaps/Makefile.SH
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-181]
: $X-Id: Jmake.tmpl 156 2012-12-19 16:44:39Z rmanfredi $
: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-183]
: $X-Id: Jmake.tmpl 183 2015-04-12 09:48:11Z rmanfredi $

case $CONFIG in
'')
Expand Down Expand Up @@ -50,7 +50,7 @@ RM = $rm -f
$spitshell >>Makefile <<'!NO!SUBS!'
########################################################################
# Jmake rules for building libraries, programs, scripts, and data files
# $X-Id: Jmake.rules 174 2014-04-05 08:19:48Z rmanfredi $
# $X-Id: Jmake.rules 183 2015-04-12 09:48:11Z rmanfredi $
########################################################################
# Start of Jmakefile
Expand Down Expand Up @@ -150,6 +150,9 @@ local_clobber:: local_realclean
install:: local_install
@exit 0
install-strip:: local_install-strip
@exit 0
install.man:: maybe_install.man
deinstall:: local_deinstall
deinstall.man:: maybe_deinstall.man
Expand Down Expand Up @@ -188,6 +191,9 @@ depend::
local_install::
@echo "install in $(CURRENT) done."
local_install-strip::
@echo "install (strip) in $(CURRENT) done."
local_deinstall::
@echo "deinstall in $(CURRENT) done."
Expand Down
2 changes: 1 addition & 1 deletion src/Jmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ RemoteTargetDependency(main.o, lib, htable.h)

DependTarget()
NormalProgramTarget(gtk-gnutella, $(SRC), $(OBJ) $(EXTRA))
InstallProgramNoStrip(gtk-gnutella, $(BINDIR))
InstallProgram(gtk-gnutella, $(BINDIR))
InstallManPage(gtk-gnutella, $(MANSRC))

/*
Expand Down
21 changes: 17 additions & 4 deletions src/Makefile.SH
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-181]
: $X-Id: Jmake.tmpl 156 2012-12-19 16:44:39Z rmanfredi $
: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-183]
: $X-Id: Jmake.tmpl 183 2015-04-12 09:48:11Z rmanfredi $

case $CONFIG in
'')
Expand Down Expand Up @@ -83,7 +83,7 @@ SOCKER_LDFLAGS = $sockerldflags
$spitshell >>Makefile <<'!NO!SUBS!'
########################################################################
# Jmake rules for building libraries, programs, scripts, and data files
# $X-Id: Jmake.rules 174 2014-04-05 08:19:48Z rmanfredi $
# $X-Id: Jmake.rules 183 2015-04-12 09:48:11Z rmanfredi $
########################################################################
# Force 'make depend' to be performed first -- do not edit
Expand Down Expand Up @@ -309,6 +309,12 @@ local_install:: gtk-gnutella
$(INSTALLDIR) $(INSTALL_PREFIX)$(BINDIR)); \
$(INSTALL) -c -m 555 gtk-gnutella$(_EXE) $(INSTALL_PREFIX)$(BINDIR)
local_install-strip:: gtk-gnutella
@case '${MFLAGS}' in *[i]*) set +e;; esac; \
(set -x; test -d $(INSTALL_PREFIX)$(BINDIR) || \
$(INSTALLDIR) $(INSTALL_PREFIX)$(BINDIR)); \
$(INSTALL) -c -s -m 555 gtk-gnutella$(_EXE) $(INSTALL_PREFIX)$(BINDIR)
local_deinstall::
$(RM) $(INSTALL_PREFIX)$(BINDIR)/gtk-gnutella$(_EXE)
Expand Down Expand Up @@ -341,7 +347,7 @@ gtk-gnutella.nm: bin/sha1sum
gtk-gnutella.nm: gtk-gnutella
$(TOP)/scripts/nm-list gtk-gnutella$(_EXE) $(NM) > $@
local_install:: gtk-gnutella.nm
local_install local_install-strip:: gtk-gnutella.nm
@case '${MFLAGS}' in *[i]*) set +e;; esac; \
(set -x; test -d $(INSTALL_PREFIX)$(ARCHLIB) || \
$(INSTALLDIR) $(INSTALL_PREFIX)$(ARCHLIB)); \
Expand Down Expand Up @@ -388,6 +394,9 @@ local_clobber:: local_realclean
install:: local_install sub_install
@exit 0
install-strip:: local_install-strip sub_install-strip
@exit 0
install.man:: maybe_install.man sub_install.man
deinstall:: sub_deinstall local_deinstall
deinstall.man:: sub_deinstall.man maybe_deinstall.man
Expand Down Expand Up @@ -444,6 +453,9 @@ subdirs:
sub_install::
@$(MAKE) subdirs TARGET=install VERB="Installing" FLAGS=
sub_install-strip::
@$(MAKE) subdirs TARGET=install-strip VERB="Installing (strip)" FLAGS=
sub_deinstall::
@$(MAKE) subdirs TARGET=deinstall VERB="Deinstalling" FLAGS=
@echo "Back to $(CURRENT) for "deinstall...
Expand Down Expand Up @@ -512,6 +524,7 @@ all::
@$(MAKE) subdirs TARGET=all VERB="Making all" FLAGS=
local_install::
local_install-strip::
local_deinstall::
local_install.man::
local_deinstall.man::
Expand Down
12 changes: 9 additions & 3 deletions src/bin/Makefile.SH
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-172]
: $X-Id: Jmake.tmpl 156 2012-12-19 16:44:39Z rmanfredi $
: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-183]
: $X-Id: Jmake.tmpl 183 2015-04-12 09:48:11Z rmanfredi $

case $CONFIG in
'')
Expand Down Expand Up @@ -68,7 +68,7 @@ COMMON_LIBS = $libs
$spitshell >>Makefile <<'!NO!SUBS!'
########################################################################
# Jmake rules for building libraries, programs, scripts, and data files
# $X-Id: Jmake.rules 106 2011-11-25 20:36:12Z rmanfredi $
# $X-Id: Jmake.rules 183 2015-04-12 09:48:11Z rmanfredi $
########################################################################
# Force 'make depend' to be performed first -- do not edit
Expand Down Expand Up @@ -145,6 +145,9 @@ local_clobber:: local_realclean
install:: local_install
@exit 0
install-strip:: local_install-strip
@exit 0
install.man:: maybe_install.man
deinstall:: local_deinstall
deinstall.man:: maybe_deinstall.man
Expand Down Expand Up @@ -183,6 +186,9 @@ depend::
local_install::
@echo "install in $(CURRENT) done."
local_install-strip::
@echo "install (strip) in $(CURRENT) done."
local_deinstall::
@echo "deinstall in $(CURRENT) done."
Expand Down
13 changes: 10 additions & 3 deletions src/core/Makefile.SH
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-180]
: $X-Id: Jmake.tmpl 156 2012-12-19 16:44:39Z rmanfredi $
: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-183]
: $X-Id: Jmake.tmpl 183 2015-04-12 09:48:11Z rmanfredi $

case $CONFIG in
'')
Expand Down Expand Up @@ -70,7 +70,7 @@ GNUTLS_CFLAGS = $gnutlscflags
$spitshell >>Makefile <<'!NO!SUBS!'
########################################################################
# Jmake rules for building libraries, programs, scripts, and data files
# $X-Id: Jmake.rules 174 2014-04-05 08:19:48Z rmanfredi $
# $X-Id: Jmake.rules 183 2015-04-12 09:48:11Z rmanfredi $
########################################################################
# Force 'make depend' to be performed first -- do not edit
Expand Down Expand Up @@ -428,6 +428,9 @@ local_clobber:: local_realclean
install:: local_install sub_install
@exit 0
install-strip:: local_install-strip sub_install-strip
@exit 0
install.man:: maybe_install.man sub_install.man
deinstall:: sub_deinstall local_deinstall
deinstall.man:: sub_deinstall.man maybe_deinstall.man
Expand Down Expand Up @@ -474,6 +477,9 @@ subdirs:
sub_install::
@$(MAKE) subdirs TARGET=install VERB="Installing" FLAGS=
sub_install-strip::
@$(MAKE) subdirs TARGET=install-strip VERB="Installing (strip)" FLAGS=
sub_deinstall::
@$(MAKE) subdirs TARGET=deinstall VERB="Deinstalling" FLAGS=
@echo "Back to $(CURRENT) for "deinstall...
Expand Down Expand Up @@ -542,6 +548,7 @@ all::
@$(MAKE) subdirs TARGET=all VERB="Making all" FLAGS=
local_install::
local_install-strip::
local_deinstall::
local_install.man::
local_deinstall.man::
Expand Down
12 changes: 9 additions & 3 deletions src/core/g2/Makefile.SH
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-172]
: $X-Id: Jmake.tmpl 156 2012-12-19 16:44:39Z rmanfredi $
: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-183]
: $X-Id: Jmake.tmpl 183 2015-04-12 09:48:11Z rmanfredi $

case $CONFIG in
'')
Expand Down Expand Up @@ -66,7 +66,7 @@ GLIB_CFLAGS = $glibcflags
$spitshell >>Makefile <<'!NO!SUBS!'
########################################################################
# Jmake rules for building libraries, programs, scripts, and data files
# $X-Id: Jmake.rules 106 2011-11-25 20:36:12Z rmanfredi $
# $X-Id: Jmake.rules 183 2015-04-12 09:48:11Z rmanfredi $
########################################################################
# Force 'make depend' to be performed first -- do not edit
Expand Down Expand Up @@ -150,6 +150,9 @@ local_clobber:: local_realclean
install:: local_install
@exit 0
install-strip:: local_install-strip
@exit 0
install.man:: maybe_install.man
deinstall:: local_deinstall
deinstall.man:: maybe_deinstall.man
Expand Down Expand Up @@ -188,6 +191,9 @@ depend::
local_install::
@echo "install in $(CURRENT) done."
local_install-strip::
@echo "install (strip) in $(CURRENT) done."
local_deinstall::
@echo "deinstall in $(CURRENT) done."
Expand Down
12 changes: 9 additions & 3 deletions src/dht/Makefile.SH
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-171]
: $X-Id: Jmake.tmpl 156 2012-12-19 16:44:39Z rmanfredi $
: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-183]
: $X-Id: Jmake.tmpl 183 2015-04-12 09:48:11Z rmanfredi $

case $CONFIG in
'')
Expand Down Expand Up @@ -66,7 +66,7 @@ GLIB_CFLAGS = $glibcflags
$spitshell >>Makefile <<'!NO!SUBS!'
########################################################################
# Jmake rules for building libraries, programs, scripts, and data files
# $X-Id: Jmake.rules 106 2011-11-25 20:36:12Z rmanfredi $
# $X-Id: Jmake.rules 183 2015-04-12 09:48:11Z rmanfredi $
########################################################################
# Force 'make depend' to be performed first -- do not edit
Expand Down Expand Up @@ -180,6 +180,9 @@ local_clobber:: local_realclean
install:: local_install
@exit 0
install-strip:: local_install-strip
@exit 0
install.man:: maybe_install.man
deinstall:: local_deinstall
deinstall.man:: maybe_deinstall.man
Expand Down Expand Up @@ -218,6 +221,9 @@ depend::
local_install::
@echo "install in $(CURRENT) done."
local_install-strip::
@echo "install (strip) in $(CURRENT) done."
local_deinstall::
@echo "deinstall in $(CURRENT) done."
Expand Down
13 changes: 10 additions & 3 deletions src/if/Makefile.SH
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-180]
: $X-Id: Jmake.tmpl 156 2012-12-19 16:44:39Z rmanfredi $
: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-183]
: $X-Id: Jmake.tmpl 183 2015-04-12 09:48:11Z rmanfredi $

case $CONFIG in
'')
Expand Down Expand Up @@ -63,7 +63,7 @@ GLIB_CFLAGS = $glibcflags
$spitshell >>Makefile <<'!NO!SUBS!'
########################################################################
# Jmake rules for building libraries, programs, scripts, and data files
# $X-Id: Jmake.rules 174 2014-04-05 08:19:48Z rmanfredi $
# $X-Id: Jmake.rules 183 2015-04-12 09:48:11Z rmanfredi $
########################################################################
# Force 'make depend' to be performed first -- do not edit
Expand Down Expand Up @@ -156,6 +156,9 @@ local_clobber:: local_realclean
install:: local_install sub_install
@exit 0
install-strip:: local_install-strip sub_install-strip
@exit 0
install.man:: maybe_install.man sub_install.man
deinstall:: sub_deinstall local_deinstall
deinstall.man:: sub_deinstall.man maybe_deinstall.man
Expand Down Expand Up @@ -202,6 +205,9 @@ subdirs:
sub_install::
@$(MAKE) subdirs TARGET=install VERB="Installing" FLAGS=
sub_install-strip::
@$(MAKE) subdirs TARGET=install-strip VERB="Installing (strip)" FLAGS=
sub_deinstall::
@$(MAKE) subdirs TARGET=deinstall VERB="Deinstalling" FLAGS=
@echo "Back to $(CURRENT) for "deinstall...
Expand Down Expand Up @@ -270,6 +276,7 @@ all::
@$(MAKE) subdirs TARGET=all VERB="Making all" FLAGS=
local_install::
local_install-strip::
local_deinstall::
local_install.man::
local_deinstall.man::
Expand Down
12 changes: 9 additions & 3 deletions src/if/bridge/Makefile.SH
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-171]
: $X-Id: Jmake.tmpl 156 2012-12-19 16:44:39Z rmanfredi $
: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5-183]
: $X-Id: Jmake.tmpl 183 2015-04-12 09:48:11Z rmanfredi $

case $CONFIG in
'')
Expand Down Expand Up @@ -62,7 +62,7 @@ GLIB_CFLAGS = $glibcflags
$spitshell >>Makefile <<'!NO!SUBS!'
########################################################################
# Jmake rules for building libraries, programs, scripts, and data files
# $X-Id: Jmake.rules 106 2011-11-25 20:36:12Z rmanfredi $
# $X-Id: Jmake.rules 183 2015-04-12 09:48:11Z rmanfredi $
########################################################################
# Force 'make depend' to be performed first -- do not edit
Expand Down Expand Up @@ -142,6 +142,9 @@ local_clobber:: local_realclean
install:: local_install
@exit 0
install-strip:: local_install-strip
@exit 0
install.man:: maybe_install.man
deinstall:: local_deinstall
deinstall.man:: maybe_deinstall.man
Expand Down Expand Up @@ -180,6 +183,9 @@ depend::
local_install::
@echo "install in $(CURRENT) done."
local_install-strip::
@echo "install (strip) in $(CURRENT) done."
local_deinstall::
@echo "deinstall in $(CURRENT) done."
Expand Down
Loading

1 comment on commit 2220679

@woodsb02
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for adding this Raphael - it will make life easier for me! :)

Please sign in to comment.