janware/jw-pkg
Watch
1
Code Pull requests Activity Actions

make: Replace some executables by absolute paths to improve performance

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-09-02 19:26:52 +00:00
commit f5c43f706a
54 changed files with 134 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/autoconf.mk
View file

@ -23,7 +23,7 @@ make_rpm_release: config $(AC_FILES)
make_install:
if [ -z "$(CONFIG_ACDONE)" ]; then make $@; fi
confclean:
rm -rf $(DISTCLEAN) $(CLEAN) $(AC_FILES) autom4te.cache
$(RM) -rf $(DISTCLEAN) $(CLEAN) $(AC_FILES) autom4te.cache
configure.ac: configure.ac.tmpl VERSION
$(CAT) $< | $(SED) -e "s/_VERSION_/`$(CAT) VERSION | $(SED) 's/-dev//'`/" > $@
@ -48,4 +48,4 @@ $(TOPDIR)/include/%.h: $(TOPDIR)/include/%.h.in config.status
touch $@
acclean:
rm -f *.acdone
$(RM) -f *.acdone

2
make/backup.mk
View file

@ -8,5 +8,5 @@ backup: distclean
tar -C .. $(_BACKUP_SOURCE) -cjf $(BACKUP_TARGET)/$(_BACKUP_SOURCE)-$(BACKUP_DATE).tar.bz2
purge-last-backup:
rm -f $(shell ls $(BACKUP_TARGET)/$(_BACKUP_SOURCE)-*.tar.bz2 | tail -1)
$(RM) -f $(shell ls $(BACKUP_TARGET)/$(_BACKUP_SOURCE)-*.tar.bz2 | tail -1)

2
make/bin.mk
View file

@ -5,5 +5,5 @@
all install:
clean distclean:
rm -f $(filter-out Makefile CVS debug release,$(wildcard *))
$(RM) -f $(filter-out Makefile CVS debug release,$(wildcard *))
test:

2
make/cleandirs.mk
View file

@ -19,5 +19,5 @@ do.install:
do.%:
set -e; for d in $(SUBDIRS); do make -wC $$d $*; done
rm -rf $(TEXTCLEAN) $(CLEAN) *.done *~ .*.swp *.tmp core *.rep dirs-*.done
$(RM) -rf $(TEXTCLEAN) $(CLEAN) *.done *~ .*.swp *.tmp core *.rep dirs-*.done

2
make/conf.mk
View file

@ -7,7 +7,7 @@ install: install_CFG install_files_SYSCFG install_files_LOGROT install_files_CRO
install_files_APACHE_CONF install_files_SYSTEMD install_INIT $(CONF_D)
clean.conf:
rm -rf *.h *~ .*.swp *.done
$(RM) -rf *.h *~ .*.swp *.done
ifneq ($(CONFIG_SUBDIR),)
$(INSTALLED_CFG): $(INSTALL_CFGDIR)

2
make/contrib.mk
View file

@ -41,7 +41,7 @@ apply-patches.done: unpack.done $(LOCAL_PATCH_DONE)
install:
distclean:
rm -rf *.done *.patch $(CFG_WORKING_DIR)
$(RM) -rf *.done *.patch $(CFG_WORKING_DIR)
unpack: unpack.done
apply-patches: apply-patches.done

2
make/crontab.mk
View file

@ -6,7 +6,7 @@ clean: clean.conf
install: install_CFG install_files_SYSCFG install_files_LOGROT $(CONF_D)
clean.conf:
rm -rf *.h *~ .*.swp *.done
$(RM) -rf *.h *~ .*.swp *.done
ifneq ($(CONFIG_SUBDIR),)
$(INSTALLED_CFG): $(INSTALL_CFGDIR)

2
make/dav.mk
View file

@ -41,5 +41,5 @@ dload.done:
touch $@
dav.clean:
rm -f upload.done dload.done
$(RM) -f upload.done dload.done

2
make/debugger.mk
View file

@ -73,6 +73,6 @@ centralcore:
coreclean: centralcore-clean
centralcore-clean:
rm -f /var/cores/core* /var/cores/vgcore* || exit 0
$(RM) -f /var/cores/core* /var/cores/vgcore* || exit 0
echo-pid:
@echo PID = $(PID)

33
make/defs.mk
View file

@ -29,19 +29,23 @@ ifneq ($(wildcard pre-local.mk),)
endif
# ----- executables
SED = sed
CAT = /bin/cat
SED := /usr/bin/sed
CAT := /bin/cat
SHELL ?= /bin/bash
BROWSER ?= firefox
RM := /usr/bin/rm
AR = /usr/bin/ar
PWD := /usr/bin/pwd
BIN_INSTALL := /usr/bin/install
# ----- standard variables
CVSTOPDIR ?= $(CVS_PROJ_DIR)/..
ifeq ($(PROJECT),)
PROJECT := $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); pwd | $(SED) 's/.*\///; s/-[0-9].*//')))
PROJECT := $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); $(PWD) | $(SED) 's/.*\///; s/-[0-9].*//')))
endif
OS ?= $(shell sh $(MOD_SCRIPT_DIR)/get-os.sh)
OS ?= $(shell /bin/bash $(MOD_SCRIPT_DIR)/get-os.sh)
CREATE_DEVEL ?= true
#COMPILER_SUITE ?= clang
@ -112,7 +116,7 @@ CVS_RSH ?= /usr/bin/ssh
# ----- input dirs
JW_BUILD_DIR = $(MODDIR)
PROJECT_STEM = $(PROJECT)-$(DIST_VERSION)
CVS_ROOT_DIR = $(shell test -d CVS && pwd | $(SED) -e "s%`$(CAT) CVS/Repository`%%; s%/$$%%")
CVS_ROOT_DIR = $(shell test -d CVS && $(PWD) | $(SED) -e "s%`$(CAT) CVS/Repository`%%; s%/$$%%")
REV_SUBDIRS = $(shell echo $(SUBDIRS) | awk '{for (i=NF; i>=1; i--) printf ("%s ",$$i)}')
FRESH_CVSDIR = $(HOME)/local/src/cvs.fresh
IMAGE_DIR ?= $(CVS_ROOT_DIR)/images
@ -161,7 +165,7 @@ endif
JANWARE_USER ?= $(shell id -un)
JANWARE_CLIENT ?= jw
JANWARE_WIKI ?= $(JANWARE_CLIENT)
JANWARE_URL_DOC_MODULE ?= https///janware.com/wiki/$(JANWARE_WIKI)/assets/types/data/sw/$(PROJECT)/$(notdir $(shell pwd))
JANWARE_URL_DOC_MODULE ?= https///janware.com/wiki/$(JANWARE_WIKI)/assets/types/data/sw/$(PROJECT)/$(notdir $(shell $(PWD)))
JANWARE_URL_DOC_PROJECT ?= https///janware.com/wiki/$(JANWARE_WIKI)/assets/types/data/sw/$(PROJECT)/$(PROJECT)
PKG_VENDOR ?= janware GmbH
@ -476,7 +480,7 @@ INSTALLED_CGI += $(addprefix $(INSTALL_CGIDIR)/,$(EXE_CGI))
INSTALLATION_FILE_TYPES += HTML
BUILD_HTMLDIR = $(TOPDIR)/htdocs
LOCAL_HTML += $(filter-out $(DONT_INSTALL),$(wildcard *.html *.css *.php *.js) $(IMAGES))
HTML_SUBDIR ?= $(shell pwd | $(SED) '/.*\/htdocs\(\/\|$$\)/!d; s%.*/htdocs\(/\|$$\)%%')
HTML_SUBDIR ?= $(shell $(PWD) | $(SED) '/.*\/htdocs\(\/\|$$\)/!d; s%.*/htdocs\(/\|$$\)%%')
ifeq ($(HTML_SUBDIR),)
INSTALL_HTMLDIR = $(PROJECT_HTMLDIR)
else
@ -488,7 +492,7 @@ INSTALLED_HTML += $(addprefix $(INSTALL_HTMLDIR)/,$(LOCAL_HTML))
INSTALLATION_FILE_TYPES += TMPL
BUILD_TMPLDIR = $(TOPDIR)/tmpl
LOCAL_TMPL += $(filter-out $(DONT_INSTALL) Makefile,$(wildcard *.tmpl))
TMPL_SUBDIR ?= $(shell pwd | $(SED) '/.*\/tmpl\(\/\|$$\)/!d; s%.*/tmpl\(/\|$$\)%%')
TMPL_SUBDIR ?= $(shell $(PWD) | $(SED) '/.*\/tmpl\(\/\|$$\)/!d; s%.*/tmpl\(/\|$$\)%%')
ifeq ($(TMPL_SUBDIR),)
INSTALL_TMPLDIR = $(PROJECT_TMPLDIR)
else
@ -680,8 +684,6 @@ endif
# do a conditional include of timer headers, yet
GENERATE_FUNC_TIMERS = $(MODDIR)/YStopWatchThreadList/generate_func_timers.sh
RM = rm
AR = ar
PKG_SH_EXE = /bin/bash $(MOD_SCRIPT_DIR)/pkg.sh
LOG_INSTALL_SH = $(PKG_SH_EXE) log-install
@ -741,7 +743,7 @@ else
endif
define install_links
cwd=`pwd`; \
cwd=`$(PWD)`; \
echo "o in $(INSTALL_$(1)DIR):" ;\
for f in $(notdir $(INSTALLED_$(1))); do \
cd $(INSTALL_$(1)DIR); \
@ -974,14 +976,7 @@ ifeq ($(STRIP_SYMBOLS),true)
STRIP_DONE ?= strip.done
endif
INCLUDE += $(LOCAL_INCLUDE)
# force use of double quotes, allow header namespaces
ifeq ($(HDRDIR_SCOPE_SUFFIX),)
INCLUDE += -I.
else
INCLUDE += -iquote .
endif
INCLUDE += $(LOCAL_INCLUDE) -I.
ifeq ($(USE_PROJECT_LIB),true)
INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include

2
make/depend.mk
View file

@ -20,7 +20,7 @@ clean: depclean my_depclean
# convenience targets
dep: $(DEPEND_MK)
my_depclean:
rm -f .*.dep.mk
$(RM) -f .*.dep.mk
# rules
$(DEPEND_MK): $(PREREQ_DONE)

4
make/dirs.mk
View file

@ -96,10 +96,10 @@ endif
dirs.clean:
set -e; for d in $(call reverse,$(SUBDIRS)) ; do make -wC $$d clean; done
rm -rf $(TEXTCLEAN) $(CLEAN) *.done *~ .*.swp *.tmp core *.rep dirs-*.done
$(RM) -rf $(TEXTCLEAN) $(CLEAN) *.done *~ .*.swp *.tmp core *.rep dirs-*.done
dirs.distclean:
set -e; for d in $(call reverse,$(SUBDIRS)) ; do make -wC $$d distclean; done
rm -rf $(DISTCLEAN)
$(RM) -rf $(DISTCLEAN)
endif # SUBDIRS_TO_ITERATE

6
make/dist.mk
View file

@ -25,7 +25,7 @@ SSI_PREFIX = $(TMPHTML)/ssi_download_
$(TMPHTML):
mkdir -p $(TMPHTML)
test -d $(TMPHTML) && rm -rf $(TMPHTML)/*
test -d $(TMPHTML) && $(RM) -rf $(TMPHTML)/*
$(SSI_PREFIX)%.html: $(TMPHTML) $(SSI_DOWNLOAD_TMPL)
@ -47,13 +47,13 @@ $(SSI_PREFIX)%.html: $(TMPHTML) $(SSI_DOWNLOAD_TMPL)
" > $@
remove_dist:
rm -rf $(DISTDIR)
$(RM) -rf $(DISTDIR)
distclean: remove_dist
$(DIST_FILE): distclean
mkdir -p $(DISTDIR)/src/$(PROJECT)
mkdir -p $(DISTDIR)/pckg
rm -rf $(DISTDIR)/src/$(PROJECT)/*
$(RM) -rf $(DISTDIR)/src/$(PROJECT)/*
mkdir -p $(DISTDIR)/src/$(PROJECT)/mod
cd $(TOPDIR); find . -type f | \
grep -ve 'CVS\|contrib/nomake\|tar.gz\|/dist/\|experimental' | \

2
make/doc-rules.mk
View file

@ -9,6 +9,6 @@ clean: doc.clean
distclean:
doc.clean:
rm -rf *~ .*.swp
$(RM) -rf *~ .*.swp

2
make/doxygen.mk
View file

@ -65,7 +65,7 @@ upload.done: doxygen.done cpfiles.done
upload.sh $(DX_OUTPUT_DIR)/ $(UPLOAD_URL)
clean.doxygen:
rm -rf $(DX_OUTPUT_DIR) *.done $(DX_UNTEMPLATED) $(DX_INCLUDE) *.bak default-* doxygen.conf
$(RM) -rf $(DX_OUTPUT_DIR) *.done $(DX_UNTEMPLATED) $(DX_INCLUDE) *.bak default-* doxygen.conf
inst-dir.done:
$(INSTALL) -d -o $(DOCDIROWNER) -g $(DOCDIRGROUP) -m $(DOCDIRMODE) $(DX_INSTALL_DIR)

2
make/dummy.mk
View file

@ -7,7 +7,7 @@ include $(MODDIR)/make/defs.mk
all:
clean:
rm -rf *~ .*.swp
$(RM) -rf *~ .*.swp
install: # nothing to be done
all: # nothing to be done
distclean: clean

4
make/fc-mod-cpp.mk
View file

@ -50,10 +50,10 @@ $(FC_MODULE): $(FC_OBJ)
$(LD) -shared $(BUILD_LDFLAGS) $^ -o $@
clean.generated:
rm -f $(FC_GENERATED)
$(RM) -f $(FC_GENERATED)
clean.local:
rm -f $(FC_MODULE) *.o *.done
$(RM) -f $(FC_MODULE) *.o *.done
create-dirs.done:
$(INSTALL) -d -m $(LIBDIRMODE) -o $(LIBDIROWNER) -g $(LIBDIRGROUP) $(FC_INSTALL_DIRS)

4
make/flex-bison.mk
View file

@ -65,5 +65,5 @@ lex.%.$(FB_FLEX_OUT_EXT): %.l $(FB_BISON_OUT_C)
# g++ -g -o $(FB_EXE) $^ -lfl
clean.local:
rm -f $(FB_GENERATED_C) $(FB_HDRDIR)/*.tab.h $(FB_HDRDIR)/lex.*.h *.output $(FB_EXE) *.tmp $(FB_OBJ) *.rep $(FB_HDRDIR)/*.rep
rm -f graph-*.txt report-*.xml report-*.txt
$(RM) -f $(FB_GENERATED_C) $(FB_HDRDIR)/*.tab.h $(FB_HDRDIR)/lex.*.h *.output $(FB_EXE) *.tmp $(FB_OBJ) *.rep $(FB_HDRDIR)/*.rep
$(RM) -f graph-*.txt report-*.xml report-*.txt

6
make/gettext.mk
View file

@ -13,13 +13,13 @@ GETTEXT_KEYWORDS ?= htr ehtr
all: $(GETTEXT_MO)
clean: clean-mo
rm -rf *~ .*.swp
$(RM) -rf *~ .*.swp
install: install_MO
distclean: clean
extract: $(GETTEXT_POT)
clean-mo:
rm -f *.mo *.tmp
$(RM) -f *.mo *.tmp
$(GETTEXT_POT): $(GETTEXT_INPUT_FILES)
xgettext --from-code=utf-8 --package-name $(PROJECT) --package-version $(DIST_VERSION) \
@ -59,7 +59,7 @@ clean: htr-tmp-clean
htr: $(GETTEXT_TMP)
htr-tmp-clean:
rm -f *.htr
$(RM) -f *.htr
define copy_rule
./%.htr.tmp: $(1)/%.php

2
make/htdocs.mk
View file

@ -15,4 +15,4 @@ test:
mv $@.tmp $@
clean.lesscpy:
rm -f $(LESS_GENERATED_CSS) *.tmp
$(RM) -f $(LESS_GENERATED_CSS) *.tmp

Some files were not shown because too many files have changed in this diff Show more