From b2d6e6f554de38af52ea4e880317843bd71d2a0c Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 29 Jun 2019 21:34:18 +0000 Subject: [PATCH] Everywhere: Rename MODDIR -> JWBDIR Rename the omnipresent MODDIR variable to JWBDIR, since that's more to the point. Signed-off-by: Jan Lindemann --- Makefile | 6 +++--- bin/Makefile | 2 +- conf/Makefile | 2 +- conf/jcs/Makefile | 2 +- conf/profile/Makefile | 2 +- doc/Makefile | 2 +- doc/packaging/Makefile | 2 +- doc/packaging/add-pkg-conflicts-support.patch | 2 +- htdocs/Makefile | 4 ++-- htdocs/images/Makefile | 4 ++-- htdocs/images/logo-janware/Makefile | 4 ++-- make/Makefile | 8 ++++---- make/bin.mk | 4 ++-- make/cache.mk | 2 +- make/cleandirs.mk | 2 +- make/conf.mk | 6 +++--- make/cpp.mk | 2 +- make/crontab.mk | 4 ++-- make/dav.mk | 2 +- make/defs-cpp.mk | 16 +++++++-------- make/defs-dev.mk | 10 +++++----- make/defs-dist.mk | 8 ++++---- make/defs.mk | 16 +++++++-------- make/dev-utils.mk | 2 +- make/dirs.mk | 4 ++-- make/dist.mk | 8 ++++---- make/doc.mk | 6 +++--- make/doxygen.mk | 10 +++++----- make/dummy.mk | 2 +- make/exe.mk | 6 +++--- make/generic.mk | 4 ++-- make/gettext.mk | 6 +++--- make/git-submod.mk | 2 +- make/header.mk | 6 +++--- make/htdocs.mk | 8 ++++---- make/images.mk | 4 ++-- make/include.mk | 8 ++++---- make/install-files.mk | 4 ++-- make/java.mk | 2 +- make/lib.mk | 8 ++++---- make/libsrc.mk | 2 +- make/linux-rpm-build.mk | 4 ++-- make/linux-rpm.mk | 6 +++--- make/lo.mk | 12 +++++------ make/main.mk | 2 +- make/make.mk | 16 +++++++-------- make/mcu-defs.mk | 2 +- make/mcu-exe.mk | 10 +++++----- make/mcu-topdir.mk | 6 +++--- make/platform.mk | 6 +++--- make/plugin-version.mk | 6 +++--- make/plugin.mk | 18 ++++++++--------- make/profile.mk | 4 ++-- make/profiler.mk | 4 ++-- make/proj.mk | 2 +- make/projdefs.mk | 2 +- make/projects-dir.mk | 2 ++ make/projects.mk | 2 +- make/py-defs.mk | 2 +- make/py-mod.mk | 10 +++++----- make/py-rules.mk | 2 +- make/py-run.mk | 8 ++++---- make/python-cli.mk | 2 +- make/qt.mk | 4 ++-- make/qtexe.mk | 10 +++++----- make/qtplugin.mk | 4 ++-- make/qtso.mk | 6 +++--- make/qttools.mk | 12 +++++------ make/rpmdist.mk | 8 ++++---- make/rules.mk | 2 +- make/run.mk | 20 +++++++++---------- make/scripts.mk | 8 ++++---- make/smart-selection.mk | 6 +++--- make/so.mk | 10 +++++----- make/srcdist.mk | 2 +- make/standalone-exe.mk | 4 ++-- make/std-tools.mk | 2 +- make/subdirs.mk | 2 +- make/subtree.mk | 2 +- make/suse-selection.mk | 4 ++-- make/swig.mk | 12 +++++------ make/tagged-tmpl-repo.mk | 2 +- make/tagged-tmpl.mk | 2 +- make/targets-tools.mk | 2 +- make/test-exe.mk | 2 +- make/test-java.mk | 2 +- make/tex.mk | 8 ++++---- make/text.mk | 4 ++-- make/theme-images.mk | 4 ++-- make/tmpl.mk | 4 ++-- make/tools-matlab.mk | 2 +- make/tools.mk | 16 +++++++-------- make/topdir-autoconf.mk | 4 ++-- make/topdir.mk | 12 +++++------ make/upload.mk | 2 +- make/yapp.mk | 2 +- make/zip-windows-files.mk | 8 ++++---- scripts/Makefile | 2 +- scripts/jw-build-create-project.sh | 6 +++--- tmpl/Makefile | 2 +- tmpl/doxygen/Makefile | 4 ++-- tmpl/tagged/Makefile | 2 +- tmpl/tagged/cortex-m/Makefile | 2 +- tmpl/tagged/cortex-m/ld/Makefile | 2 +- tmpl/tex/Makefile | 2 +- tmpl/tex/de_contract/Makefile | 2 +- tmpl/tex/de_presentation/Makefile | 2 +- tmpl/tex/de_technical/Makefile | 2 +- tmpl/tex/en_technical/Makefile | 2 +- 109 files changed, 279 insertions(+), 277 deletions(-) diff --git a/Makefile b/Makefile index e96864a8..095ae93e 100644 --- a/Makefile +++ b/Makefile @@ -3,9 +3,9 @@ SUBDIRS = make scripts bin htdocs tmpl conf RPM_UPLOAD_URLPREFIX ?= rsync_ssh://$(JANWARE_USER)@pkg.janware.com:/srv/dav/pub/packages/jw-foss/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION) include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/topdir.mk -include $(MODDIR)/make/srcdist.mk -include $(MODDIR)/make/git-cvs-bridge.mk +include $(JWBDIR)/make/topdir.mk +include $(JWBDIR)/make/srcdist.mk +include $(JWBDIR)/make/git-cvs-bridge.mk all: clean: clean.pkgconfig diff --git a/bin/Makefile b/bin/Makefile index 0507904b..7a30976e 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -32,4 +32,4 @@ TOPDIR = .. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/bin.mk +include $(JWBDIR)/make/bin.mk diff --git a/conf/Makefile b/conf/Makefile index 2f00ade7..a9018b59 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -1,4 +1,4 @@ TOPDIR = .. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/dirs.mk +include $(JWBDIR)/make/dirs.mk diff --git a/conf/jcs/Makefile b/conf/jcs/Makefile index 08bdad94..b52c1e1c 100644 --- a/conf/jcs/Makefile +++ b/conf/jcs/Makefile @@ -5,4 +5,4 @@ SUBTREE_FILES += ./templates/dir/module/Makefile ./templates/dir/src/Ma SUBTREE_DIRS += $(dir $(SUBTREE_FILES)) include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/subtree.mk +include $(JWBDIR)/make/subtree.mk diff --git a/conf/profile/Makefile b/conf/profile/Makefile index 6a9f7847..638dfc90 100644 --- a/conf/profile/Makefile +++ b/conf/profile/Makefile @@ -1,4 +1,4 @@ TOPDIR = ../.. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/profile.mk +include $(JWBDIR)/make/profile.mk diff --git a/doc/Makefile b/doc/Makefile index 6e9f4ed6..e9b46017 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,4 +1,4 @@ TOPDIR = .. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/cleandirs.mk +include $(JWBDIR)/make/cleandirs.mk diff --git a/doc/packaging/Makefile b/doc/packaging/Makefile index da257905..ef50fd93 100644 --- a/doc/packaging/Makefile +++ b/doc/packaging/Makefile @@ -1,4 +1,4 @@ TOPDIR = ../.. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/dummy.mk +include $(JWBDIR)/make/dummy.mk diff --git a/doc/packaging/add-pkg-conflicts-support.patch b/doc/packaging/add-pkg-conflicts-support.patch index a997e8f4..753b5fd2 100644 --- a/doc/packaging/add-pkg-conflicts-support.patch +++ b/doc/packaging/add-pkg-conflicts-support.patch @@ -16,7 +16,7 @@ diff -u -r1.137 rpmdist.mk RPM_UPLOAD_OS_NAME = $(shell echo $(OS_NAME_VERSION) | sed 's/-.*//') RPM_UPLOAD_OS_VERSION = $(shell echo $(OS_NAME_VERSION) | sed 's/[^-]\+-//') @@ -88,8 +89,9 @@ - include $(MODDIR)/make/upload-rules.mk + include $(JWBDIR)/make/upload-rules.mk PKG_SH = $(PKG_SH_EXE) \ - -N $(RPM_PROJECT) \ diff --git a/htdocs/Makefile b/htdocs/Makefile index a1660691..d4e51ad2 100644 --- a/htdocs/Makefile +++ b/htdocs/Makefile @@ -1,5 +1,5 @@ TOPDIR = .. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/dirs.mk -include $(MODDIR)/make/htdocs.mk +include $(JWBDIR)/make/dirs.mk +include $(JWBDIR)/make/htdocs.mk diff --git a/htdocs/images/Makefile b/htdocs/images/Makefile index 42d26d00..e693a7da 100644 --- a/htdocs/images/Makefile +++ b/htdocs/images/Makefile @@ -1,5 +1,5 @@ TOPDIR = ../.. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/dirs.mk -include $(MODDIR)/make/htdocs.mk +include $(JWBDIR)/make/dirs.mk +include $(JWBDIR)/make/htdocs.mk diff --git a/htdocs/images/logo-janware/Makefile b/htdocs/images/logo-janware/Makefile index 18af8fa5..b83f7315 100644 --- a/htdocs/images/logo-janware/Makefile +++ b/htdocs/images/logo-janware/Makefile @@ -3,5 +3,5 @@ TOPDIR = ../../.. SVG_GENERATE_FORMATS ?= svg include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/svg.mk -include $(MODDIR)/make/htdocs.mk +include $(JWBDIR)/make/svg.mk +include $(JWBDIR)/make/htdocs.mk diff --git a/make/Makefile b/make/Makefile index 0f9fc43a..8cae29ee 100644 --- a/make/Makefile +++ b/make/Makefile @@ -15,15 +15,15 @@ CACHED_VARS := WHICH PYTHON ECHO TEST BROWSER SED RM PWD ID CUT #CACHED_VARS += DEVELOPMENT include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/make.mk +include $(JWBDIR)/make/make.mk ifneq ($(MAKECMDGOALS),install-links) ifneq ($(MAKECMDGOALS),do-install-links) - include $(MODDIR)/make/dirs.mk + include $(JWBDIR)/make/dirs.mk endif endif -include $(MODDIR)/make/dev-utils.mk -#include $(MODDIR)/make/cache.mk +include $(JWBDIR)/make/dev-utils.mk +#include $(JWBDIR)/make/cache.mk all: diff --git a/make/bin.mk b/make/bin.mk index 7b4977b4..030cda6e 100644 --- a/make/bin.mk +++ b/make/bin.mk @@ -3,8 +3,8 @@ # contact@jannet.de # $Id$ -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/defs-cpp.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/defs-cpp.mk all install: clean distclean: diff --git a/make/cache.mk b/make/cache.mk index 4f4a78e2..f8db4368 100644 --- a/make/cache.mk +++ b/make/cache.mk @@ -10,7 +10,7 @@ CACHE_FILE_MK ?= .cache.mk all: cache ifneq ($(foreach g,all cache,$(findstring $(g),$(MAKECMDGOALS))),) cache: $(CACHE_FILE_MK) -$(CACHE_FILE_MK): $(CACHED_FILES) $(MODDIR)/make/cache.mk +$(CACHE_FILE_MK): $(CACHED_FILES) $(JWBDIR)/make/cache.mk ifeq ($(wildcard $(CACHE_FILE_MK)),) @echo $(foreach v,$(CACHED_VARS),$v := $(value $(v))EOL) | $(SED) 's/EOL */\n/g;' | $(GREP) . | tee $@.tmp mv $@.tmp $@ diff --git a/make/cleandirs.mk b/make/cleandirs.mk index 56d5f1ee..0caa28c2 100644 --- a/make/cleandirs.mk +++ b/make/cleandirs.mk @@ -5,7 +5,7 @@ install: do.install clean: do.clean distclean: do.distclean -include $(MODDIR)/make/defs.mk +include $(JWBDIR)/make/defs.mk SUBDIRS ?= $(FIND_SUBDIRS) diff --git a/make/conf.mk b/make/conf.mk index 0422fb92..fe734f77 100644 --- a/make/conf.mk +++ b/make/conf.mk @@ -1,6 +1,6 @@ -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/rules.mk -include $(MODDIR)/make/dev-utils.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/rules.mk +include $(JWBDIR)/make/dev-utils.mk all: clean: clean.conf diff --git a/make/cpp.mk b/make/cpp.mk index 50257781..4a7669a8 100644 --- a/make/cpp.mk +++ b/make/cpp.mk @@ -1 +1 @@ -include $(MODDIR)/make/tools.mk +include $(JWBDIR)/make/tools.mk diff --git a/make/crontab.mk b/make/crontab.mk index 44db1053..c272bc9b 100644 --- a/make/crontab.mk +++ b/make/crontab.mk @@ -1,5 +1,5 @@ -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/rules.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/rules.mk all: clean: clean.conf diff --git a/make/dav.mk b/make/dav.mk index 6f62ee51..5ab9e490 100644 --- a/make/dav.mk +++ b/make/dav.mk @@ -13,7 +13,7 @@ DAV_RSYNC ?= rsync $(DAV_RSYNC_EXCLUDE_OPTS) DAV_RSYNC_MODE ?= 664 DAV_RSYNC_DIRMODE ?= 775 -include $(MODDIR)/make/defs.mk +include $(JWBDIR)/make/defs.mk all: install: diff --git a/make/defs-cpp.mk b/make/defs-cpp.mk index 8c5c7c32..92a20b84 100644 --- a/make/defs-cpp.mk +++ b/make/defs-cpp.mk @@ -460,7 +460,7 @@ BUILD_OBJ += $(addprefix $(FLAVOUR_PREFIX),$(patsubst %.sx,%.o #PREREQ_CPP += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.c)) \ # $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.cpp)) #PREREQ_CSRC += $(PREREQ_H) $(PREREQ_C) $(PREREQ_CPP) -REQUIRED_DIR += $(patsubst %,$(MODDIR)/%,$(REQUIRED)) +REQUIRED_DIR += $(patsubst %,$(JWBDIR)/%,$(REQUIRED)) REQUIRED_DONE += $(patsubst %,%/all.done,$(REQUIRED_DIR)) REQUIRED_H += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.h)) REQUIRED_C += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.c)) @@ -475,8 +475,8 @@ ALL_CSRC += $(LOCAL_CSRC) $(PREREQ_CSRC) CORE += $(filter-out $(wildcard *.intern-state*),$(wildcard core core.* vgcore vgcore.*)) ifeq ($(USE_QT),true) - include $(MODDIR)/make/qtversion.mk - include $(MODDIR)/make/qt-defs.mk + include $(JWBDIR)/make/qtversion.mk + include $(JWBDIR)/make/qt-defs.mk endif ifeq ($(USE_X),true) @@ -499,10 +499,10 @@ endif # ----- standard features, switched on with USE_XXX = true -#include $(MODDIR)/make/lib-deps.mk +#include $(JWBDIR)/make/lib-deps.mk ifeq ($(USE_GFILTER),true) - GFILT = sh $(firstword $(wildcard $(MODDIR)/contrib/gfilt/gfilt $(MODDIR)/bin/gfilt)) + GFILT = sh $(firstword $(wildcard $(JWBDIR)/contrib/gfilt/gfilt $(JWBDIR)/bin/gfilt)) ifneq ($(strip $(GFILT)),sh) GXX = $(GFILT) endif @@ -598,7 +598,7 @@ ifeq ($(COMPILE_DEBUG_LOG),true) endif ifeq ($(USE_MPATROL),true) - FINAL_CPPFLAGS += -include $(MODDIR)/include/mpatrol.h + FINAL_CPPFLAGS += -include $(JWBDIR)/include/mpatrol.h FINAL_LDFLAGS += -lmpatrolmt -lbfd -liberty endif @@ -779,8 +779,8 @@ ifeq ($(USE_PROJECT_LIB),true) INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a else LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a - #WINRES_RC_TMPL = $(MODDIR)/make/winres-minimal.rc.tmpl - WINRES_RC_TMPL = $(MODDIR)/make/winres.rc.tmpl + #WINRES_RC_TMPL = $(JWBDIR)/make/winres-minimal.rc.tmpl + WINRES_RC_TMPL = $(JWBDIR)/make/winres.rc.tmpl WINRES_RC = $(BUILD_LIBDIR)/$(PROJECT).rc WINRES_O = $(WINRES_RC).o SO_SUFFIX ?= dll diff --git a/make/defs-dev.mk b/make/defs-dev.mk index 4e73fd13..2f77d3e8 100644 --- a/make/defs-dev.mk +++ b/make/defs-dev.mk @@ -30,7 +30,7 @@ LOG_PREFIX ?= $(PREFIX)/log JAVA_PREFIX ?= $(PREFIX) HDR_SCOPE_PREFIX ?= -IMAGEDIR ?= $(MODDIR)/../../images +IMAGEDIR ?= $(JWBDIR)/../../images CTRLDIR ?= $(ENV_PREFIX)$(HOME)/bin$(FLAVOUR_PATH_SUFFIX) DAEMON_RUN_DIR ?= $(ENV_PREFIX)$(HOME) PROFILE_DIR ?= $(ENV_PREFIX)$(HOME)/.profile.d$(FLAVOUR_PATH_SUFFIX) @@ -95,9 +95,9 @@ SCRIPTDIRMODE ?= $(EXEDIRMODE) PYMODOWNER ?= $(BUILD_USER) PYMODGROUP ?= $(BUILD_GROUP) PYMODMODE ?= 644 -PYMODDIROWNER ?= $(BUILD_USER) -PYMODDIRGROUP ?= $(BUILD_GROUP) -PYMODDIRMODE ?= 755 +PYJWBDIROWNER ?= $(BUILD_USER) +PYJWBDIRGROUP ?= $(BUILD_GROUP) +PYJWBDIRMODE ?= 755 INITOWNER ?= $(EXEOWNER) INITGROUP ?= $(EXEGROUP) INITMODE ?= $(EXEMODE) @@ -253,7 +253,7 @@ PKG_CONFIGDIRMODE ?= $(CFGDIRMODE) # -- options # for using the dbmalloc lib, before you will need to do: -# cd $(MODDIR)/contrib/dbmalloc; tar -xzf dbmalloc-ver.sion.tar.gz +# cd $(JWBDIR)/contrib/dbmalloc; tar -xzf dbmalloc-ver.sion.tar.gz #USE_BTOOLS ?= true #USE_DSPFS ?= true diff --git a/make/defs-dist.mk b/make/defs-dist.mk index a0fbc4b6..fe10dd7d 100644 --- a/make/defs-dist.mk +++ b/make/defs-dist.mk @@ -95,9 +95,9 @@ SCRIPTDIRMODE ?= $(EXEDIRMODE) PYMODOWNER ?= root PYMODGROUP ?= root PYMODMODE ?= 644 -PYMODDIROWNER ?= root -PYMODDIRGROUP ?= root -PYMODDIRMODE ?= 755 +PYJWBDIROWNER ?= root +PYJWBDIRGROUP ?= root +PYJWBDIRMODE ?= 755 INITDIRMODE ?= $(EXEDIRMODE) INITOWNER ?= $(EXEOWNER) INITGROUP ?= $(EXEGROUP) @@ -253,7 +253,7 @@ PKG_CONFIGDIRMODE ?= $(CFGDIRMODE) # -- options # for using the dbmalloc lib, before you will need to do: -# cd $(MODDIR)/contrib/dbmalloc; tar -xzf dbmalloc-ver.sion.tar.gz +# cd $(JWBDIR)/contrib/dbmalloc; tar -xzf dbmalloc-ver.sion.tar.gz #USE_BTOOLS ?= true #USE_DSPFS ?= true diff --git a/make/defs.mk b/make/defs.mk index 0419348c..441f689b 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -13,7 +13,7 @@ comma := , # ----- executables -include $(MODDIR)/make/projects.mk +include $(JWBDIR)/make/projects.mk ifeq ($(MAKE_BENCHMARK),true) export SHELL := /bin/bash $(MOD_SCRIPT_DIR)/timed-make-shell.sh @@ -252,7 +252,7 @@ CVS_RSH ?= /usr/bin/ssh # ----- input dirs -JW_BUILD_DIR = $(MODDIR) +JW_BUILD_DIR = $(JWBDIR) PROJECT_STEM = $(PROJECT)-$(DIST_VERSION) # only works if checked out true to CVS, i.e. below proj @@ -263,19 +263,19 @@ endif REV_SUBDIRS = $(call reverse $(SUBDIRS)) FRESH_CVSDIR = $(HOME)/local/src/cvs.fresh -PCKG_DEFS_DIR = $(MODDIR)/make/defs.d +PCKG_DEFS_DIR = $(JWBDIR)/make/defs.d HDRDIR_SCOPE_SUFFIX ?= $(PROJECT) CONTRIB_MOD += $(addprefix contrib/,$(CONTRIB_LIBS)) REQUIRED := $(CONTRIB_MOD) $(REQUIRED) ifeq ($(DEVELOPMENT),true) - -include $(MODDIR)/make/defs-dev.mk + -include $(JWBDIR)/make/defs-dev.mk ifneq ($(wildcard $(TOPDIR)/make/cfg_dev.mk),) include $(TOPDIR)/make/cfg_dev.mk endif else - -include $(MODDIR)/make/defs-dist.mk + -include $(JWBDIR)/make/defs-dist.mk ifneq ($(wildcard $(TOPDIR)/make/cfg_dist.mk),) include $(TOPDIR)/make/cfg_dist.mk endif @@ -482,7 +482,7 @@ ifeq ($(CREATE_PKG_CONFIG),true) INSTALLATION_FILE_TYPES += PKG_CONFIG PKG_CONFIG += $(sort $(filter-out $(DONT_INSTALL),$(wildcard *.pc) $(LOCAL_PKG_CONFIG))) ifeq ($(DEVELOPMENT),true) - BUILD_PKG_CONFIGDIR = $(MODDIR)/pkgconfig + BUILD_PKG_CONFIGDIR = $(JWBDIR)/pkgconfig else BUILD_PKG_CONFIGDIR = $(TOPDIR)/make endif @@ -496,9 +496,9 @@ INSTALL_DIR ?= $(INSTALL) # ----- local.mk -$(eval $(call try_include,$(MODDIR)/make/local.mk)) +$(eval $(call try_include,$(JWBDIR)/make/local.mk)) -#-include $(MODDIR)/make/local.mk +#-include $(JWBDIR)/make/local.mk $(eval $(call try_include,$(TOPDIR)/make/local.mk)) $(eval $(call try_include,local.mk)) diff --git a/make/dev-utils.mk b/make/dev-utils.mk index 51ab38b3..870949b6 100644 --- a/make/dev-utils.mk +++ b/make/dev-utils.mk @@ -48,6 +48,6 @@ cleanup-spaces: --name-regex="$(CLEANUP_SPACES_NAME_REGEX)" \ --root=$(MAKEFILE_INDENT_ROOT) -include $(MODDIR)/make/list-files.mk +include $(JWBDIR)/make/list-files.mk endif # ifndef DEV_UTILS_MK_INCLUDED diff --git a/make/dirs.mk b/make/dirs.mk index 38c922af..724be8ba 100644 --- a/make/dirs.mk +++ b/make/dirs.mk @@ -10,8 +10,8 @@ ifneq ($(FORCE_REBUILD_SUBDIRS),) .PHONY: dirs-all.done endif -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/defs-dirs.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/defs-dirs.mk ifeq ($(SUBDIRS_TO_ITERATE),) diff --git a/make/dist.mk b/make/dist.mk index ee06f92c..8c0ac38e 100644 --- a/make/dist.mk +++ b/make/dist.mk @@ -10,7 +10,7 @@ TARGET_FILE_MODE = 755 TARGET_DIR_MODE = 755 DOWNLOAD_SERVER = https://www.jannet.de:443 URL_RELATIVE_PATH = $(CUSTOMER)/projects/$(LOCAL_PROJECT)/download -SSI_DOWNLOAD_TMPL = $(MODDIR)/doctmpl/html/ssi/ssi_download.html.tmpl +SSI_DOWNLOAD_TMPL = $(JWBDIR)/doctmpl/html/ssi/ssi_download.html.tmpl DOWNLOAD_REFERRER_DIRS = $(addprefix $(UPLOAD_DOCUMENT_ROOT)/, \ $(UPLOAD_VIRTUAL_SERVER_ROOT)/$(URL_RELATIVE_PATH) \ ) @@ -60,10 +60,10 @@ $(DIST_FILE): distclean xargs tar -cf - | tar -C $(DISTDIR)/src/$(PROJECT) -xf - echo $(DIST_VERSION) > $(DISTDIR)/src/$(PROJECT)/VERSION ;\ echo $(REQUIRED) | while read mod ;\ - do make -C $(MODDIR)/$$mod clean ;\ - cp -r $(MODDIR)/$$mod $(DISTDIR)/src/$(PROJECT)/mod/ ;\ + do make -C $(JWBDIR)/$$mod clean ;\ + cp -r $(JWBDIR)/$$mod $(DISTDIR)/src/$(PROJECT)/mod/ ;\ done ;\ - cp $(MODDIR)/Makefile $(DISTDIR)/src/$(PROJECT)/mod/ ;\ + cp $(JWBDIR)/Makefile $(DISTDIR)/src/$(PROJECT)/mod/ ;\ tar -czv -C $(DISTDIR)/src/ -f $(DIST_FILE) $(PROJECT) build.dist: $(DIST_FILE) diff --git a/make/doc.mk b/make/doc.mk index 9ac38141..97329931 100644 --- a/make/doc.mk +++ b/make/doc.mk @@ -3,6 +3,6 @@ # contact@jannet.de # $Id$ -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/rules.mk -include $(MODDIR)/make/doc-rules.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/rules.mk +include $(JWBDIR)/make/doc-rules.mk diff --git a/make/doxygen.mk b/make/doxygen.mk index f482726e..a508f664 100644 --- a/make/doxygen.mk +++ b/make/doxygen.mk @@ -1,4 +1,4 @@ -include $(MODDIR)/make/defs.mk +include $(JWBDIR)/make/defs.mk # broken by IMAGEDIR in rpmbuild @@ -7,13 +7,13 @@ GENERATE_DOXYGEN ?= true endif ifneq ($(GENERATE_DOXYGEN),true) -include $(MODDIR)/make/dummy.mk +include $(JWBDIR)/make/dummy.mk else UPLOAD_FILE_MODE ?= 644 UPLOAD_DIR_MODE ?= 755 -include $(MODDIR)/make/upload-defs.mk +include $(JWBDIR)/make/upload-defs.mk UPLOAD_URL ?= $(UPLOAD_URL_DEVEL_DOC)/$(PROJECT)/doxygen/:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP) @@ -23,7 +23,7 @@ DX_OUTPUT_DIR ?= html DX_INSTALL_DIR ?= $(DOC_PREFIX)/devel DX_DOC_FILES = $(DX_INCLUDE) DX_DOXYGEN_CONF ?= doxygen.conf -DX_INCLUDE_TMPL_DIR ?= $(MODDIR)/tmpl/doxygen +DX_INCLUDE_TMPL_DIR ?= $(JWBDIR)/tmpl/doxygen DX_FALLBACK_CONF_TMPL ?= $(DX_INCLUDE_TMPL_DIR)/doxygen.conf.tmpl DX_BROWSER ?= $(BROWSER) @@ -91,7 +91,7 @@ $(DX_DOXYGEN_CONF): $(firstword $(wildcard $(DX_DOXYGEN_CONF).tmpl $(DX_FALLBACK s%__PROJECT_SUMMARY__%$(PROJECT_SUMMARY)%g; \ s/__OUTPUT_DIR__/$(DX_OUTPUT_DIR)/g; \ s%__PROJECT_TOPDIR__%$(TOPDIR)%g; \ - s%__MODDIR__%$(MODDIR)%g; \ + s%__JWBDIR__%$(JWBDIR)%g; \ s%__FILE_PATTERNS__%$(DX_FILE_PATTERNS)%g; \ s%__INPUT_DIRS__%$(DX_INPUT_DIRS)%g; \ s%__SRC_IS_JAVA__%$(DX_SRC_IS_JAVA)%g; \ diff --git a/make/dummy.mk b/make/dummy.mk index c031f5f4..b5e0306a 100644 --- a/make/dummy.mk +++ b/make/dummy.mk @@ -3,7 +3,7 @@ # contact@jannet.de # $Id$ -include $(MODDIR)/make/defs.mk +include $(JWBDIR)/make/defs.mk all: clean: diff --git a/make/exe.mk b/make/exe.mk index c012ff69..1062b086 100644 --- a/make/exe.mk +++ b/make/exe.mk @@ -3,9 +3,9 @@ # contact@jannet.de # $Id$ -include $(MODDIR)/make/run.mk -include $(MODDIR)/make/depend.mk -include $(MODDIR)/make/dev-utils.mk +include $(JWBDIR)/make/run.mk +include $(JWBDIR)/make/depend.mk +include $(JWBDIR)/make/dev-utils.mk all: $(EXE) $(BUILD_EXE_BIN) $(STRIP_DONE) install: $(INSTALLED_EXE) $(INSTALLED_EXE_BIN) diff --git a/make/generic.mk b/make/generic.mk index c124f978..4ada6682 100644 --- a/make/generic.mk +++ b/make/generic.mk @@ -3,8 +3,8 @@ # contact@jannet.de # $Id$ -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/rules.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/rules.mk distclean: textclean localclean clean: textclean localclean install: # nothing to be done diff --git a/make/gettext.mk b/make/gettext.mk index e6befd59..f50f5134 100644 --- a/make/gettext.mk +++ b/make/gettext.mk @@ -1,8 +1,8 @@ GETTEXT_LOCALE ?= $(notdir $(shell $(PWD))) -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/rules.mk -include $(MODDIR)/make/dev-utils.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/rules.mk +include $(JWBDIR)/make/dev-utils.mk GETTEXT_PROJECT_PO ?= $(PROJECT).po GETTEXT_PROJECT_POT ?= $(PROJECT).pot diff --git a/make/git-submod.mk b/make/git-submod.mk index 19499676..22b4605f 100644 --- a/make/git-submod.mk +++ b/make/git-submod.mk @@ -16,7 +16,7 @@ SUB_GIT = git -C $(SUBMOD_SRC_DIR) SUBMOD_PKG_NAME := $(shell $(SUB_GIT) remote -v | sed -n 's/^[a-zA-Z_]\+\s//; s/ *.*//; s%.*/%%; s%\.git%%; 1p') SUBMOD_MAIN_BRANCH := $(firstword $(shell $(SUB_GIT) branch --format '%(refname:lstrip=2)')) -include $(MODDIR)/make/defs.mk +include $(JWBDIR)/make/defs.mk all: install: diff --git a/make/header.mk b/make/header.mk index 94494b01..7e59596f 100644 --- a/make/header.mk +++ b/make/header.mk @@ -3,10 +3,10 @@ # contact@jannet.de # $Id$ -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/defs-cpp.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/defs-cpp.mk ALL += $(BUILD_LIBDIR) $(PREREQ_DONE) $(BUILD_HDR) -include $(MODDIR)/make/rules.mk +include $(JWBDIR)/make/rules.mk all: $(ALL) clean: objclean textclean localclean install: all diff --git a/make/htdocs.mk b/make/htdocs.mk index 2793ae97..9e7a55b8 100644 --- a/make/htdocs.mk +++ b/make/htdocs.mk @@ -2,7 +2,7 @@ LESS_SRC ?= $(wildcard *.less) LESS_GENERATED_CSS ?= $(patsubst %.less,%.css,$(LESS_SRC)) LESS_CPY ?= lesscpy -include $(MODDIR)/make/defs.mk +include $(JWBDIR)/make/defs.mk # -- HTML INSTALLATION_FILE_TYPES += HTML @@ -19,9 +19,9 @@ endif INSTALLED_HTML += $(addprefix $(INSTALL_HTMLDIR)/,$(LOCAL_HTML)) -include $(MODDIR)/make/js.mk -include $(MODDIR)/make/rules.mk -include $(MODDIR)/make/dev-utils.mk +include $(JWBDIR)/make/js.mk +include $(JWBDIR)/make/rules.mk +include $(JWBDIR)/make/dev-utils.mk all: $(LESS_GENERATED_CSS) install: install_HTML diff --git a/make/images.mk b/make/images.mk index cc0f75fd..51f3af31 100644 --- a/make/images.mk +++ b/make/images.mk @@ -1,5 +1,5 @@ -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/rules.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/rules.mk all: install: install_IMG diff --git a/make/include.mk b/make/include.mk index 72e74130..ef5e244f 100644 --- a/make/include.mk +++ b/make/include.mk @@ -1,6 +1,6 @@ -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/defs-cpp.mk -include $(MODDIR)/make/dev-utils.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/defs-cpp.mk +include $(JWBDIR)/make/dev-utils.mk # variables SRC_H += $(PROJ_H) $(wildcard $(HDRDIR_SCOPE_SUFFIX)/*.h) @@ -41,4 +41,4 @@ install-links: do-install-links: @$(call install_links,HDR) -include $(MODDIR)/make/rules.mk +include $(JWBDIR)/make/rules.mk diff --git a/make/install-files.mk b/make/install-files.mk index ebf3d813..5d8f524a 100644 --- a/make/install-files.mk +++ b/make/install-files.mk @@ -6,8 +6,8 @@ SOURCE_BASE ?= . RELPATHS = $(foreach f,$(SOURCE_FILES),$(shell realpath -s --relative-to "$(SOURCE_BASE)" "$f")) INSTALLED_FILES = $(addprefix $(TARGET_DIR)/,$(RELPATHS)) -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/dev-utils.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/dev-utils.mk ifeq ($(DEVELOPMENT),true) TARGET_OWNER ?= $(shell id -un) diff --git a/make/java.mk b/make/java.mk index 9b977239..4bd2ef3e 100644 --- a/make/java.mk +++ b/make/java.mk @@ -3,7 +3,7 @@ JAVA_SRC ?= $(wildcard $(JAVA_SRC_DIR)/*.java) JAVA_CLASSFILES += $(patsubst %.java,%.class,$(JAVA_SRC)) JAVA_CLASSPATH = $(shell echo $(CLASSPATH) | sed 's/ */:/g') -include $(MODDIR)/make/defs.mk +include $(JWBDIR)/make/defs.mk all: $(JAVA_CLASSFILES) install: diff --git a/make/lib.mk b/make/lib.mk index c02e18b8..02c25961 100644 --- a/make/lib.mk +++ b/make/lib.mk @@ -3,10 +3,10 @@ # contact@jannet.de # $Id$ -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/defs-cpp.mk -include $(MODDIR)/make/rules.mk -include $(MODDIR)/make/dev-utils.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/defs-cpp.mk +include $(JWBDIR)/make/rules.mk +include $(JWBDIR)/make/dev-utils.mk all: diff --git a/make/libsrc.mk b/make/libsrc.mk index 5b1c184e..1af36ba1 100644 --- a/make/libsrc.mk +++ b/make/libsrc.mk @@ -3,4 +3,4 @@ # contact@jannet.de # $Id$ -include $(MODDIR)/make/tools.mk +include $(JWBDIR)/make/tools.mk diff --git a/make/linux-rpm-build.mk b/make/linux-rpm-build.mk index 1ccfa9e8..ea4b501f 100644 --- a/make/linux-rpm-build.mk +++ b/make/linux-rpm-build.mk @@ -76,14 +76,14 @@ F_ULDONE = $(addsuffix .uldone,$(F_RPMS) $(F_TGZ) $(F_SPM) c # note that order matters for F_ULDONE and F_RPMS (remote directory attributes) KERNEL_INSTALL_PREFIX = $(shell pwd)/$(TMP_INSTALL) -BUILD = sh $(MODDIR)/devutil/jcs/build_linux.sh \ +BUILD = sh $(JWBDIR)/devutil/jcs/build_linux.sh \ -c config-$(KERNEL_VERSION) \ -t $(HOST) \ -b $(WD) \ -a i386 \ -s $(KERNEL_SRC_DIR) \ -i $(TMP_INSTALL) -MKSPEC := $(MODDIR)/devutil/jcs/mkspec-linux.sh +MKSPEC := $(JWBDIR)/devutil/jcs/mkspec-linux.sh # exports export KERNEL_VERSION diff --git a/make/linux-rpm.mk b/make/linux-rpm.mk index 39cfc95a..3a502fda 100644 --- a/make/linux-rpm.mk +++ b/make/linux-rpm.mk @@ -34,7 +34,7 @@ ARCH = $(shell $(RPMBUILD) --showrc | $(SED) '/build arc PATCHES += $(wildcard $(LINUX_KERNEL_PATCH_DIR)/*-$(KERNEL_VERSION).patch) \ $(wildcard $(LINUX_KERNEL_PATCH_DIR)/*-$(KERNEL_VERSION).diff) LOCAL_PATCHES = $(notdir $(PATCHES)) -SUBMAKEFILE = $(MODDIR)/make/linux-rpm-build.mk +SUBMAKEFILE = $(JWBDIR)/make/linux-rpm-build.mk KERNEL_URL = ftp.kernel.org:/pub/linux/kernel/v$(KERNEL_MAJOR).$(KERNEL_MINOR)/linux-$(KERNEL_VERSION).tar.bz2 KERNEL_TGZ = $(notdir $(KERNEL_URL)) @@ -161,7 +161,7 @@ DEFERRED_TARGETS = \ shutdown reboot update-rpm erase-rpm $(DEFERRED_TARGETS): prepare - make -f $(MODDIR)/make/linux-rpm-build.mk $@ + make -f $(JWBDIR)/make/linux-rpm-build.mk $@ thisclean: touch EXTRAVERSION COMPLETE_VERSION make -f $(SUBMAKEFILE) clean @@ -170,7 +170,7 @@ install.this: make -f $(SUBMAKEFILE) install export \ - TOPDIR MODDIR KERNEL_VERSION RPM_RELEASE HOST KERNEL_PKG_SUFFIX CUSTOMER \ + TOPDIR JWBDIR KERNEL_VERSION RPM_RELEASE HOST KERNEL_PKG_SUFFIX CUSTOMER \ KERNEL_BASE_DIR KERNEL_PKG KERNEL_BASE UPLOAD_HOST UPLOAD_PATH \ UPLOAD_OWNER BOOT_LABEL BOOT_LABEL PATCHES KERNEL_MAJOR KERNEL_MINOR \ KERNEL_RELEASE WD diff --git a/make/lo.mk b/make/lo.mk index 4ee14419..4c8fbbcb 100644 --- a/make/lo.mk +++ b/make/lo.mk @@ -7,10 +7,10 @@ SO_PREFIX ?= lo_ LOADABLE_OBJ_HOOK ?= LOADABLE_OBJECT_HOOK # === change this < -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/defs-cpp.mk -include $(MODDIR)/make/profiler-defs.mk -include $(MODDIR)/make/dev-utils.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/defs-cpp.mk +include $(JWBDIR)/make/profiler-defs.mk +include $(JWBDIR)/make/dev-utils.mk .PRECIOUS: %.cpp %.o LOADABLE_OBJS_HEADER ?= $(wildcard $(TOOLS_INCLUDE_DIR)/$(CPP_PREFIX)*$(CPP_SUFFIX).h) @@ -66,5 +66,5 @@ $(BUILD_LIBDIR)/%.so: %.so $(BUILD_LIBDIR)/%.dll: %.dll install -m 755 $< $@ -include $(MODDIR)/make/rules.mk -include $(MODDIR)/make/depend.mk +include $(JWBDIR)/make/rules.mk +include $(JWBDIR)/make/depend.mk diff --git a/make/main.mk b/make/main.mk index 8a230a2d..5d76180b 100644 --- a/make/main.mk +++ b/make/main.mk @@ -4,7 +4,7 @@ ifneq ($(TARGET),mingw) FINAL_LDFLAGS += -rdynamic endif -include $(MODDIR)/make/exe.mk +include $(JWBDIR)/make/exe.mk all: clean: profclean diff --git a/make/make.mk b/make/make.mk index c4312867..54df1877 100644 --- a/make/make.mk +++ b/make/make.mk @@ -3,14 +3,14 @@ # contact@jannet.de # $Id$ -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/defs-dirs.mk -include $(MODDIR)/make/dev-utils.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/defs-dirs.mk +include $(JWBDIR)/make/dev-utils.mk CACHED_FILES ?= $(VERSION_FILE) $(wildcard $(TOPDIR)/make/project.conf) CACHED_VARS ?= PROJECT PREREQ VERSION HEX_VERSION FULL_NAME -include $(MODDIR)/make/cache.mk +include $(JWBDIR)/make/cache.mk ifneq ($(CREATE_DEVEL),false) MKFILES += $(wildcard project.conf) @@ -20,14 +20,14 @@ ifneq ($(CREATE_DEVEL),false) endif endif -include $(MODDIR)/make/rules.mk +include $(JWBDIR)/make/rules.mk -INSTALL_PCKG_DEPS_DIR = $(ENV_PREFIX)$(MODDIR)/make/deps.d +INSTALL_PCKG_DEPS_DIR = $(ENV_PREFIX)$(JWBDIR)/make/deps.d ifneq ($(wildcard pckg-deps.mk),) INSTALLED_PKG_MK += $(INSTALL_PCKG_DEPS_DIR)/$(PROJECT).mk endif -INSTALL_PCKG_DEFS_DIR = $(MODDIR)/make/defs.d +INSTALL_PCKG_DEFS_DIR = $(JWBDIR)/make/defs.d ifneq ($(wildcard pckg-defs.mk),) INSTALLED_PKG_MK += $(INSTALL_PCKG_DEFS_DIR)/$(PROJECT).mk endif @@ -60,7 +60,7 @@ ifeq ($(CREATE_PKG_CONFIG),true) CREATE_PKG_CONFIG_OPTS += -l "-L$(PROJECT_DIRPATH)/lib -l$(PROJECT)" endif -$(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_DIR)/create-pkg-config.sh +$(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(JWBDIR)/make/make.mk $(MOD_SCRIPT_DIR)/create-pkg-config.sh /bin/bash $(MOD_SCRIPT_DIR)/create-pkg-config.sh \ -F $< \ -n $(PROJECT) \ diff --git a/make/mcu-defs.mk b/make/mcu-defs.mk index 32b63495..ace5d08c 100644 --- a/make/mcu-defs.mk +++ b/make/mcu-defs.mk @@ -20,7 +20,7 @@ # endif #endif -MCU_PRODUCT_TMPL_DIR ?= $(MODDIR)/tmpl/products +MCU_PRODUCT_TMPL_DIR ?= $(JWBDIR)/tmpl/products ifneq ($(TARGET_PRODUCT),) MCU_BOARD_MODEL_LC ?= $(TARGET_PRODUCT) diff --git a/make/mcu-exe.mk b/make/mcu-exe.mk index dde54ffa..23398211 100644 --- a/make/mcu-exe.mk +++ b/make/mcu-exe.mk @@ -13,12 +13,12 @@ EXE_MAP ?= $(patsubst %.elf,%.map,$(EXE_BASENAME)) # I think these (or something equivalent) should go somewhere here. Not cleaned # up enough in modm builds to do it. -#include $(MODDIR)/make/defs.mk -#include $(MODDIR)/make/defs-cpp.mk +#include $(JWBDIR)/make/defs.mk +#include $(JWBDIR)/make/defs-cpp.mk -include $(MODDIR)/make/mcu-defs.mk -include $(MODDIR)/make/exe.mk -include $(MODDIR)/make/mcu-flash.mk +include $(JWBDIR)/make/mcu-defs.mk +include $(JWBDIR)/make/exe.mk +include $(JWBDIR)/make/mcu-flash.mk all: $(MCU_FLASH_PUSH_FILE_HEX) diff --git a/make/mcu-topdir.mk b/make/mcu-topdir.mk index e418576c..0f98197b 100644 --- a/make/mcu-topdir.mk +++ b/make/mcu-topdir.mk @@ -1,3 +1,3 @@ -include $(MODDIR)/make/mcu-defs.mk -include $(MODDIR)/make/topdir.mk -include $(MODDIR)/make/mcu-flash.mk +include $(JWBDIR)/make/mcu-defs.mk +include $(JWBDIR)/make/topdir.mk +include $(JWBDIR)/make/mcu-flash.mk diff --git a/make/platform.mk b/make/platform.mk index 8fc2bc41..72438a09 100644 --- a/make/platform.mk +++ b/make/platform.mk @@ -10,13 +10,13 @@ define try_include endif endef -$(eval $(call try_include,$(MODDIR)/make/.cache.mk)) +$(eval $(call try_include,$(JWBDIR)/make/.cache.mk)) $(eval $(call try_include,$(TOPDIR)/make/.cache.mk)) -$(eval $(call try_include,$(MODDIR)/make/pre-local.mk)) +$(eval $(call try_include,$(JWBDIR)/make/pre-local.mk)) $(eval $(call try_include,$(TOPDIR)/make/pre-local.mk)) $(eval $(call try_include,pre-local.mk)) -MOD_SCRIPT_DIR := $(firstword $(wildcard $(MODDIR)/scripts $(MODDIR)/bin)) +MOD_SCRIPT_DIR := $(firstword $(wildcard $(JWBDIR)/scripts $(JWBDIR)/bin)) ifndef GET_OS_SH GET_OS_SH := $(SHELL) $(MOD_SCRIPT_DIR)/get-os.sh endif diff --git a/make/plugin-version.mk b/make/plugin-version.mk index b8106a62..52bb5fe0 100644 --- a/make/plugin-version.mk +++ b/make/plugin-version.mk @@ -1,6 +1,6 @@ -include $(MODDIR)/make/plugin-defs.mk -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/defs-cpp.mk +include $(JWBDIR)/make/plugin-defs.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/defs-cpp.mk all: $(PLUGIN_VERSION_LIB) install: diff --git a/make/plugin.mk b/make/plugin.mk index 8332309f..5ecdb1ae 100644 --- a/make/plugin.mk +++ b/make/plugin.mk @@ -3,15 +3,15 @@ # contact@jannet.de # $Id$ -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/defs-cpp.mk -include $(MODDIR)/make/debugger.mk -include $(MODDIR)/make/ldlibpath.mk -include $(MODDIR)/make/plugin-defs.mk -include $(MODDIR)/make/rules.mk -include $(MODDIR)/make/depend.mk -include $(MODDIR)/make/backup.mk -include $(MODDIR)/make/dev-utils.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/defs-cpp.mk +include $(JWBDIR)/make/debugger.mk +include $(JWBDIR)/make/ldlibpath.mk +include $(JWBDIR)/make/plugin-defs.mk +include $(JWBDIR)/make/rules.mk +include $(JWBDIR)/make/depend.mk +include $(JWBDIR)/make/backup.mk +include $(JWBDIR)/make/dev-utils.mk FINAL_CXXFLAGS += -D_PLUGIN FINAL_CFLAGS += -D_PLUGIN diff --git a/make/profile.mk b/make/profile.mk index 7341114e..d0b9cc85 100644 --- a/make/profile.mk +++ b/make/profile.mk @@ -12,8 +12,8 @@ endif PROFILE += $(filter-out $(PATH_PROFILE),$(wildcard *.sh)) -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/rules.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/rules.mk all: $(PROFILE) install: install_files_PROFILE diff --git a/make/profiler.mk b/make/profiler.mk index 8c5d69a5..f431edca 100644 --- a/make/profiler.mk +++ b/make/profiler.mk @@ -1,2 +1,2 @@ -include $(MODDIR)/make/profiler-defs.mk -include $(MODDIR)/make/profiler-rules-run.mk +include $(JWBDIR)/make/profiler-defs.mk +include $(JWBDIR)/make/profiler-rules-run.mk diff --git a/make/proj.mk b/make/proj.mk index be32c071..cf2cdefe 100644 --- a/make/proj.mk +++ b/make/proj.mk @@ -2,7 +2,7 @@ # contact@jannet.de # $Id$ -MODDIR ?= $(TOPDIR) +JWBDIR ?= $(TOPDIR) JANWARE_WIKI = priv # rpmdist.mk variable overrides diff --git a/make/projdefs.mk b/make/projdefs.mk index a464411d..0f400b3c 100644 --- a/make/projdefs.mk +++ b/make/projdefs.mk @@ -5,7 +5,7 @@ CAP_PROJECT := $(shell echo $(PROJECT) | tr [a-z] [A-Z]) -include $(MODDIR)/make/defs.mk +include $(JWBDIR)/make/defs.mk $(CAP_PROJECT)_VERSION := $(VERSION) $(CAP_PROJECT)_INSTALL_LIBDIR := $(INSTALL_LIBDIR) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index fd032c30..f2c45f49 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -19,6 +19,8 @@ # ------------ Makefile and environment variable definitions +.NOTPARALLEL: + -include local.mk SHELL = /bin/bash -o pipefail +H diff --git a/make/projects.mk b/make/projects.mk index e6668e03..058c5021 100644 --- a/make/projects.mk +++ b/make/projects.mk @@ -1,6 +1,6 @@ # == Variables for inter-project-communication -include $(MODDIR)/make/platform.mk +include $(JWBDIR)/make/platform.mk # -- What do I know about myself? VERSION_FILE := $(firstword $(wildcard VERSION) $(TOPDIR)/VERSION) diff --git a/make/py-defs.mk b/make/py-defs.mk index ce4504c6..2f1d3d55 100644 --- a/make/py-defs.mk +++ b/make/py-defs.mk @@ -99,4 +99,4 @@ py-libpath: @echo export PYTHONPATH=$(PYTHONPATH) endif -include $(MODDIR)/make/ldlibpath.mk +include $(JWBDIR)/make/ldlibpath.mk diff --git a/make/py-mod.mk b/make/py-mod.mk index 63423ba9..d01c07e8 100644 --- a/make/py-mod.mk +++ b/make/py-mod.mk @@ -1,7 +1,7 @@ -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/py-defs.mk -include $(MODDIR)/make/dirs.mk -include $(MODDIR)/make/dev-utils.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/py-defs.mk +include $(JWBDIR)/make/dirs.mk +include $(JWBDIR)/make/dev-utils.mk PY_INIT_TMPL = $(wildcard __init__.py.tmpl) PY_SED_EXTRACT_EXPORT ?= /\(class\|def\) ..*\# *export/ !d; s/\(class\|def\) *//; s/[(:].*// @@ -14,7 +14,7 @@ install: install-dirs.done install-reg.done clean: py.clean distclean: -include $(MODDIR)/make/py-rules.mk +include $(JWBDIR)/make/py-rules.mk __init__.py: $(PY_INIT_TMPL) $(filter-out __init__.py,$(PY_SRC_PY)) if [ "$(PY_INIT_TMPL)" ]; then cat "$(PY_INIT_TMPL)" > $@.tmp; else > $@.tmp; fi diff --git a/make/py-rules.mk b/make/py-rules.mk index 3953f39b..8d49c5ae 100644 --- a/make/py-rules.mk +++ b/make/py-rules.mk @@ -6,7 +6,7 @@ py.clean: $(RM) -rf __pycache__ install-dirs.done: - $(INSTALL) -d -m $(PYMODDIRMODE) -o $(PYMODDIROWNER) -g $(PYMODDIRGROUP) $(PY_INSTALL_DIRS) + $(INSTALL) -d -m $(PYJWBDIRMODE) -o $(PYJWBDIROWNER) -g $(PYJWBDIRGROUP) $(PY_INSTALL_DIRS) touch $@ install-reg.done: install-dirs.done $(PY_INSTALLED_REG) diff --git a/make/py-run.mk b/make/py-run.mk index 6edb894c..ca22cc2b 100644 --- a/make/py-run.mk +++ b/make/py-run.mk @@ -1,7 +1,7 @@ -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/py-defs.mk -#include $(MODDIR)/make/scripts-targets.mk -#include $(MODDIR)/make/rules.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/py-defs.mk +#include $(JWBDIR)/make/scripts-targets.mk +#include $(JWBDIR)/make/rules.mk EXE ?= $(firstword $(wildcard main.py runme.py *.py)) EXE_ARGS ?= diff --git a/make/python-cli.mk b/make/python-cli.mk index ac19ed18..541057c4 100644 --- a/make/python-cli.mk +++ b/make/python-cli.mk @@ -1,4 +1,4 @@ -include $(MODDIR)/make/defs.mk +include $(JWBDIR)/make/defs.mk EXE ?= $(shell $(PWD)).py EXE_PATH ?= ./$(EXE) diff --git a/make/qt.mk b/make/qt.mk index 415bcd1c..b113e797 100644 --- a/make/qt.mk +++ b/make/qt.mk @@ -16,5 +16,5 @@ qumake: run-qt-qmake qt3to4: run-qt-qt3to4 qtconfig:run-qt-qtconfig -include $(MODDIR)/make/qtversion.mk -include $(MODDIR)/make/qt-rules.mk +include $(JWBDIR)/make/qtversion.mk +include $(JWBDIR)/make/qt-rules.mk diff --git a/make/qtexe.mk b/make/qtexe.mk index e8bc1161..9c2cf1a9 100644 --- a/make/qtexe.mk +++ b/make/qtexe.mk @@ -5,8 +5,8 @@ USE_QT = true -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/defs-cpp.mk -include $(MODDIR)/make/qt-defs.mk -include $(MODDIR)/make/exe.mk -include $(MODDIR)/make/qt.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/defs-cpp.mk +include $(JWBDIR)/make/qt-defs.mk +include $(JWBDIR)/make/exe.mk +include $(JWBDIR)/make/qt.mk diff --git a/make/qtplugin.mk b/make/qtplugin.mk index a1b65ecc..8f339773 100644 --- a/make/qtplugin.mk +++ b/make/qtplugin.mk @@ -6,5 +6,5 @@ USE_QT = true QT_MAJOR_VERSION ?= 4 -include $(MODDIR)/make/plugin.mk -include $(MODDIR)/make/qt.mk +include $(JWBDIR)/make/plugin.mk +include $(JWBDIR)/make/qt.mk diff --git a/make/qtso.mk b/make/qtso.mk index 603afefa..3ad13e0b 100644 --- a/make/qtso.mk +++ b/make/qtso.mk @@ -3,6 +3,6 @@ # contact@jannet.de # $Id$ -include $(MODDIR)/make/qtversion.mk -include $(MODDIR)/make/so.mk -include $(MODDIR)/make/qt.mk +include $(JWBDIR)/make/qtversion.mk +include $(JWBDIR)/make/so.mk +include $(JWBDIR)/make/qt.mk diff --git a/make/qttools.mk b/make/qttools.mk index b9808a72..86f5ff20 100644 --- a/make/qttools.mk +++ b/make/qttools.mk @@ -3,12 +3,12 @@ # contact@jannet.de # $Id$ -include $(MODDIR)/make/qtversion.mk -include $(MODDIR)/make/tools.mk -#include $(MODDIR)/make/defs.mk -#include $(MODDIR)/make/defs-cpp.mk +include $(JWBDIR)/make/qtversion.mk +include $(JWBDIR)/make/tools.mk +#include $(JWBDIR)/make/defs.mk +#include $(JWBDIR)/make/defs-cpp.mk #ALL += $(BUILD_LIBDIR) $(PREREQ_DONE) $(BUILD_HDR) $(LOCAL_EXE_SH) $(MEMBERS) -#include $(MODDIR)/make/rules.mk +#include $(JWBDIR)/make/rules.mk #clean: objclean textclean localclean #install: $(ALL) -include $(MODDIR)/make/qt.mk +include $(JWBDIR)/make/qt.mk diff --git a/make/rpmdist.mk b/make/rpmdist.mk index 58d79212..f2011b27 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -31,7 +31,7 @@ HASH = $(shell $(cvs_files) -z | \ xargs -0 md5sum | md5sum | $(SED) 's/ .*//') LOCAL_REPO ?= /srv/dav/pub/local/packages/suse/$(OS_NAME_VERSION) -include $(MODDIR)/make/tag-defs.mk +include $(JWBDIR)/make/tag-defs.mk DIST_DIR = dist DIST_SRC_DIR = $(DIST_DIR)/src/$(RPM_PROJECT)-$(RPM_VERSION) @@ -57,7 +57,7 @@ else PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm endif -include $(MODDIR)/make/upload-defs-rpm.mk +include $(JWBDIR)/make/upload-defs-rpm.mk DIST_FILES = $(shell echo $(REMOTE_TARGETS) | $(SED) 's/\b.*\///g; s/:.*\b//g') GENERATED = $(sort $(shell find . -name '*.in' | \ @@ -98,8 +98,8 @@ RPM_UPLOAD_FILE_ATTRIB ?= 644:755:$(RPM_UPLOAD_USER).$(RPM_UPLOAD_GROUP) unexport RPM_VERSION VERSION DIST_SRC_DIR -include $(MODDIR)/make/tag-rules.mk -include $(MODDIR)/make/upload-rules.mk +include $(JWBDIR)/make/tag-rules.mk +include $(JWBDIR)/make/upload-rules.mk PKG_SH = $(PKG_SH_EXE) \ -N $(RPM_PROJECT) -P $(PROJECT) \ diff --git a/make/rules.mk b/make/rules.mk index 1f8484ad..8cfd0be7 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -231,7 +231,7 @@ echo-prereq: echo-contrib: echo-echo: - sed '/echo-[a-z]\+:$$/ !d; s/:$$//' $(MODDIR)/make/rules.mk + sed '/echo-[a-z]\+:$$/ !d; s/:$$//' $(JWBDIR)/make/rules.mk trace-marks: for f in $(ALL_CPP); do \ diff --git a/make/run.mk b/make/run.mk index 3ce64c74..47049caa 100644 --- a/make/run.mk +++ b/make/run.mk @@ -3,8 +3,8 @@ # contact@jannet.de # $Id$ -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/defs-cpp.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/defs-cpp.mk DIR_BASENAME = $(notdir $(CWD)) @@ -38,10 +38,10 @@ FINAL_CXXFLAGS += -DEXE_NAME=\"$(EXE)\" # ----- linker scripts from tagged templates #BUILD_LD_DIR = $(wildcard $(firstword $(call $(TAGGED_TMPL_DIRS),ld))) -#BUILD_LD_DIR = $(firstword $(foreach tag,$(TAGGED_TMPL_TAGS),$(foreach repo,$(TOPDIR)/tmpl/tagged $(MODDIR)/tmpl/tagged,$(wildcard $(repo)/$(tag)/ld)))) -#BUILD_LD_DIR = $(firstword $(wildcard $(foreach tag,$(TAGGED_TMPL_TAGS),$(foreach repo,$(TOPDIR)/tmpl/tagged $(MODDIR)/tmpl/tagged,$(repo)/$(tag)/ld)))) +#BUILD_LD_DIR = $(firstword $(foreach tag,$(TAGGED_TMPL_TAGS),$(foreach repo,$(TOPDIR)/tmpl/tagged $(JWBDIR)/tmpl/tagged,$(wildcard $(repo)/$(tag)/ld)))) +#BUILD_LD_DIR = $(firstword $(wildcard $(foreach tag,$(TAGGED_TMPL_TAGS),$(foreach repo,$(TOPDIR)/tmpl/tagged $(JWBDIR)/tmpl/tagged,$(repo)/$(tag)/ld)))) -#BUILD_LD_TMPL_DIRS ?= $(foreach tag,$(TAGGED_TMPL_TAGS),$(foreach repo,$(TOPDIR)/tmpl/tagged $(MODDIR)/tmpl/tagged,$(repo)/$(tag)/ld)) +#BUILD_LD_TMPL_DIRS ?= $(foreach tag,$(TAGGED_TMPL_TAGS),$(foreach repo,$(TOPDIR)/tmpl/tagged $(JWBDIR)/tmpl/tagged,$(repo)/$(tag)/ld)) #BUILD_LD_DIRS += $(wildcard $(BUILD_LD_TMPL_DIRS)) #FINAL_LDFLAGS += $(foreach d,$(BUILD_LD_DIRS),-L$(d) $(addprefix -T ,$(sort $(notdir $(wildcard $(d)/*.ld))))) @@ -49,12 +49,12 @@ BUILD_LD_DIRS = $(call uniq,$(dir $(foreach d,$(BUILD_LD_CHECK_DI LD_SCRIPTS = $(foreach d,$(BUILD_LD_DIRS),$(wildcard $(d)/*.ld)) FINAL_LDFLAGS += $(foreach d,$(BUILD_LD_DIRS),-L$(d) $(addprefix -T ,$(sort $(notdir $(wildcard $(d)/*.ld))))) -include $(MODDIR)/make/profiler.mk +include $(JWBDIR)/make/profiler.mk BUILD_HDR = -include $(MODDIR)/make/rules.mk -include $(MODDIR)/make/ldlibpath.mk -include $(MODDIR)/make/path-rules.mk -include $(MODDIR)/make/debugger.mk +include $(JWBDIR)/make/rules.mk +include $(JWBDIR)/make/ldlibpath.mk +include $(JWBDIR)/make/path-rules.mk +include $(JWBDIR)/make/debugger.mk EXE_ARGS += $(LOCAL_EXE_ARGS) diff --git a/make/scripts.mk b/make/scripts.mk index da541083..64f2202e 100644 --- a/make/scripts.mk +++ b/make/scripts.mk @@ -3,7 +3,7 @@ # contact@jannet.de # $Id$ -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/rules.mk -include $(MODDIR)/make/scripts-targets.mk -include $(MODDIR)/make/dev-utils.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/rules.mk +include $(JWBDIR)/make/scripts-targets.mk +include $(JWBDIR)/make/dev-utils.mk diff --git a/make/smart-selection.mk b/make/smart-selection.mk index f795fb62..a9aa507f 100644 --- a/make/smart-selection.mk +++ b/make/smart-selection.mk @@ -25,16 +25,16 @@ smart-update: smart-update.done smart-config: smart-config.done write: selection.done channels.done -include $(MODDIR)/make/defs.mk +include $(JWBDIR)/make/defs.mk # === rules -selection.done: $(MODDIR)/make/smart-selection.mk +selection.done: $(JWBDIR)/make/smart-selection.mk rpm -qa --queryformat '%{NAME}\n' | sort -u | \ $(SED) '/gpg-pubkey/ d' > $(SELECTION).tmp mv $(SELECTION).tmp $(SELECTION) touch $@ -channels.done: $(MODDIR)/make/smart-selection.mk +channels.done: $(JWBDIR)/make/smart-selection.mk smart channel --show | $(SED) '/\[rpm-sys\]/,+3 d' > $(CHANNEL_LIST) touch $@ diff --git a/make/so.mk b/make/so.mk index f6117fe3..333b8dfa 100644 --- a/make/so.mk +++ b/make/so.mk @@ -3,8 +3,8 @@ # contact@jannet.de # $Id$ -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/defs-cpp.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/defs-cpp.mk LDFLAGS += -shared BUILD_SHOBJS = $(addprefix $(BUILD_LIBDIR)/, $(SHOBJS)) @@ -12,9 +12,9 @@ SHOBJS = $(patsubst %.cpp,$(SO_PREFIX)%.so,$(patsubst %.cc INSTALLED_SHOBJS += $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS)) INSTALLED_ALL_LIBS += $(INSTALLED_SHOBJS) -include $(MODDIR)/make/ldlibpath.mk -include $(MODDIR)/make/debugger.mk -include $(MODDIR)/make/rules.mk +include $(JWBDIR)/make/ldlibpath.mk +include $(JWBDIR)/make/debugger.mk +include $(JWBDIR)/make/rules.mk all: $(SHOBJS) $(BUILD_SHOBJS) clean: objclean textclean localclean profclean diff --git a/make/srcdist.mk b/make/srcdist.mk index 11b54215..36653588 100644 --- a/make/srcdist.mk +++ b/make/srcdist.mk @@ -15,7 +15,7 @@ WD_PKG_PATH = $(WD_PKG_DIR)/$(WD_PKG) UPLOAD_FILES += $(WD_PKG_PATH) UPLOAD_SRC_DIR = $(WD_PKG_DIR) -include $(MODDIR)/make/upload-defs.mk +include $(JWBDIR)/make/upload-defs.mk all: clean: wd-clean diff --git a/make/standalone-exe.mk b/make/standalone-exe.mk index 962f6f62..918013a1 100644 --- a/make/standalone-exe.mk +++ b/make/standalone-exe.mk @@ -18,8 +18,8 @@ ifeq ($(PREFIX),) PREFIX = $(HOME)/opt/$(PROJECT) endif -include $(MODDIR)/make/run.mk -include $(MODDIR)/make/depend.mk +include $(JWBDIR)/make/run.mk +include $(JWBDIR)/make/depend.mk all: $(EXE) install: $(INSTALLED_EXE) $(INSTALLED_EXE_BIN) diff --git a/make/std-tools.mk b/make/std-tools.mk index b9608fd8..14e9fe09 100644 --- a/make/std-tools.mk +++ b/make/std-tools.mk @@ -1,4 +1,4 @@ -include $(MODDIR)/make/defs.mk +include $(JWBDIR)/make/defs.mk PROFILE_SH = profile-$(PROJECT).sh diff --git a/make/subdirs.mk b/make/subdirs.mk index 7679b54d..483a5ba8 100644 --- a/make/subdirs.mk +++ b/make/subdirs.mk @@ -1,4 +1,4 @@ -include $(MODDIR)/make/defs-dirs.mk +include $(JWBDIR)/make/defs-dirs.mk all: clean: clean.var diff --git a/make/subtree.mk b/make/subtree.mk index 3f495f94..2324c414 100644 --- a/make/subtree.mk +++ b/make/subtree.mk @@ -25,7 +25,7 @@ SUBTREE_FILES += $(shell for f in `git ls-files . 2>/dev/null || f INSTALLED_SUBTREE_DIRS = $(addprefix $(ENV_PREFIX)$(SUBTREE_INSTALL_PREFIX)/,$(SUBTREE_DIRS)) INSTALLED_SUBTREE_FILES = $(addprefix $(ENV_PREFIX)$(SUBTREE_INSTALL_PREFIX)/,$(SUBTREE_FILES)) -include $(MODDIR)/make/defs.mk +include $(JWBDIR)/make/defs.mk all: install: $(INSTALLED_SUBTREE_DIRS) $(INSTALLED_SUBTREE_FILES) diff --git a/make/suse-selection.mk b/make/suse-selection.mk index 3bf86b84..92aee0f7 100644 --- a/make/suse-selection.mk +++ b/make/suse-selection.mk @@ -1,5 +1,5 @@ -MODDIR = $(HOME)/local/src/cvs.main/proj/jw-build -include $(MODDIR)/make/defs.mk +JWBDIR = $(HOME)/local/src/cvs.main/proj/jw-build +include $(JWBDIR)/make/defs.mk GENERATE_SELECTION = $(MOD_SCRIPT_DIR)/generate_selection.sh SUSE_RELEASE = 10.1 diff --git a/make/swig.mk b/make/swig.mk index 7b638115..2a436efa 100644 --- a/make/swig.mk +++ b/make/swig.mk @@ -1,6 +1,6 @@ -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/defs-cpp.mk -include $(MODDIR)/make/dev-utils.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/defs-cpp.mk +include $(JWBDIR)/make/dev-utils.mk ifeq ($(SWIG_TARGET),php) @@ -52,7 +52,7 @@ else ifeq ($(SWIG_TARGET),android) else ifeq ($(SWIG_TARGET),python) - include $(MODDIR)/make/py-defs.mk # for $(PYTHON), $(PY_SITE_PACKAGES_PATH) + include $(JWBDIR)/make/py-defs.mk # for $(PYTHON), $(PY_SITE_PACKAGES_PATH) PYTHON_FULL_VERSION ?= $(basename $(lastword $(shell $(PYTHON) --version 2>&1))) PYTHON_MAJOR_VERSION ?= $(basename $(PYTHON_FULL_VERSION)) @@ -202,5 +202,5 @@ $(SWIG_MODULE_TARGET_DIR)/%: % | $(SWIG_MODULE_TARGET_DIR) clean.generated: $(RM) -rf $(SWIG_MODULE_WRAP_C) $(SWIG_OBJ) $(SWIG_MODULE_SO) $(SWIG_MODULE_TARGET) $(SWIG_CLEAN) $(SWIG_WRAPPER_DEP_MK) -include $(MODDIR)/make/rules.mk -include $(MODDIR)/make/depend.mk +include $(JWBDIR)/make/rules.mk +include $(JWBDIR)/make/depend.mk diff --git a/make/tagged-tmpl-repo.mk b/make/tagged-tmpl-repo.mk index ddd610c7..36341bf2 100644 --- a/make/tagged-tmpl-repo.mk +++ b/make/tagged-tmpl-repo.mk @@ -2,4 +2,4 @@ TAGGED_TMPL_TAG ?= $(notdir $(CWD)) TAGGED_TMPL_EXTS ?= $(TAGGED_TMPL_TAG) LOCAL_TMPL += $(foreach e,$(TAGGED_TMPL_EXTS),$(wildcard *.$(TAGGED_TMPL_EXTS))) -include $(MODDIR)/make/tmpl.mk +include $(JWBDIR)/make/tmpl.mk diff --git a/make/tagged-tmpl.mk b/make/tagged-tmpl.mk index 0f5e652a..43b5f178 100644 --- a/make/tagged-tmpl.mk +++ b/make/tagged-tmpl.mk @@ -11,7 +11,7 @@ TAGGED_TMPL_FIRST_DIR ?= $(firstword $(call $(TAGGED_TMPL_TAG_DIRS),$(1))) #TAGGED_TMPL_UNTEMPLATE = cat -include $(MODDIR)/make/defs.mk +include $(JWBDIR)/make/defs.mk #all: $(TAGGED_TMPL_GENERATED) #clean: tmpl.clean diff --git a/make/targets-tools.mk b/make/targets-tools.mk index ed507b16..58d47183 100644 --- a/make/targets-tools.mk +++ b/make/targets-tools.mk @@ -6,7 +6,7 @@ ifndef TARGETS_TOOLS_MK_INCLUDED TARGETS_TOOLS_MK_INCLUDED = true -include $(MODDIR)/make/rules.mk +include $(JWBDIR)/make/rules.mk ifneq ($(strip $(SRC_ALL_CPP)),) diff --git a/make/test-exe.mk b/make/test-exe.mk index a8ee9788..c0394b72 100644 --- a/make/test-exe.mk +++ b/make/test-exe.mk @@ -5,7 +5,7 @@ EXE_BASENAME ?= test-$(notdir $(shell $(PWD))) -include $(MODDIR)/make/run.mk +include $(JWBDIR)/make/run.mk all: $(EXE) install: diff --git a/make/test-java.mk b/make/test-java.mk index bd7faafa..56b33cde 100644 --- a/make/test-java.mk +++ b/make/test-java.mk @@ -7,7 +7,7 @@ JAVA_TEST_MAIN_JAVA = $(JAVA_SRC_DIR)/$(JAVA_TEST_MAIN_CLASS).java #JAVA_TEST_MAIN_CLASSFILE = $(JAVA_SRC_DIR)/$(JAVA_TEST_MAIN_CLASS).class JAVA_SRC += $(JAVA_TEST_MAIN_JAVA) -#include $(MODDIR)/make/java.mk +#include $(JWBDIR)/make/java.mk run test: $(JAVA_CLASSFILES) CLASSPATH=$(shell echo $(CLASSPATH) | sed 's/ */:/g') time -p java $(JAVA_JVM_OPTS) $(JAVA_TEST_MAIN_CLASS) $(EXE_ARGS) diff --git a/make/tex.mk b/make/tex.mk index 58089d6a..d05d5485 100644 --- a/make/tex.mk +++ b/make/tex.mk @@ -34,7 +34,7 @@ DOCUMENT_CLASS ?= article else DOCUMENT_CLASS ?= article endif -TEX_TMPL_BASE_DIR ?= $(MODDIR)/tmpl/tex +TEX_TMPL_BASE_DIR ?= $(JWBDIR)/tmpl/tex TEX_TMPL_STYLE ?= de_technical TEX_TMPL_DIR ?= $(TEX_TMPL_BASE_DIR)/$(TEX_TMPL_STYLE) IMPORTED_TEMPLATES ?= $(shell ls $(TEX_TMPL_DIR)/*.tmpl) @@ -60,8 +60,8 @@ UPLOAD_MODULE ?= doc/$(TOPIC) UPLOAD_FILE_MODE ?= 644 UPLOAD_DIR_MODE ?= 755 -include $(MODDIR)/make/tag-defs.mk -include $(MODDIR)/make/tag-rules.mk +include $(JWBDIR)/make/tag-defs.mk +include $(JWBDIR)/make/tag-rules.mk ifeq ($(TEX_TMPL_DIR), "") TEX_TMPL_DIR = thisisnotadirectory @@ -430,4 +430,4 @@ unzip: UPLOAD_FILES = $(OUTPUT).pdf -include $(MODDIR)/make/upload.mk +include $(JWBDIR)/make/upload.mk diff --git a/make/text.mk b/make/text.mk index daee9a14..e4f6d9c1 100644 --- a/make/text.mk +++ b/make/text.mk @@ -3,8 +3,8 @@ # contact@jannet.de # $Id$ -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/rules.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/rules.mk all: install: diff --git a/make/theme-images.mk b/make/theme-images.mk index 18dd3564..8332683f 100644 --- a/make/theme-images.mk +++ b/make/theme-images.mk @@ -1,5 +1,5 @@ -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/rules.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/rules.mk BASEDIR = $(PROJECT_HTML_THEMES_DIR)/$(patsubst theme-%,%,$(PROJECT))/images diff --git a/make/tmpl.mk b/make/tmpl.mk index 1f048bd3..425e3da8 100644 --- a/make/tmpl.mk +++ b/make/tmpl.mk @@ -1,4 +1,4 @@ -include $(MODDIR)/make/defs.mk +include $(JWBDIR)/make/defs.mk # -- TMPL INSTALLATION_FILE_TYPES += TMPL @@ -14,7 +14,7 @@ else endif INSTALLED_TMPL += $(addprefix $(INSTALL_TMPLDIR)/,$(LOCAL_TMPL)) -include $(MODDIR)/make/rules.mk +include $(JWBDIR)/make/rules.mk all: install: install_TMPL diff --git a/make/tools-matlab.mk b/make/tools-matlab.mk index 9d7eed83..ad14c8e0 100644 --- a/make/tools-matlab.mk +++ b/make/tools-matlab.mk @@ -1 +1 @@ -include $(MODDIR)/make/dummy.mk +include $(JWBDIR)/make/dummy.mk diff --git a/make/tools.mk b/make/tools.mk index 23df11b2..15fdb465 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -3,14 +3,14 @@ # contact@jannet.de # $Id$ -include $(MODDIR)/make/defs.mk -include $(MODDIR)/make/defs-cpp.mk -include $(MODDIR)/make/profiler-defs.mk -include $(MODDIR)/make/targets-tools.mk -include $(MODDIR)/make/cpp-extra-targets.mk -include $(MODDIR)/make/depend.mk -include $(MODDIR)/make/backup.mk -include $(MODDIR)/make/dev-utils.mk +include $(JWBDIR)/make/defs.mk +include $(JWBDIR)/make/defs-cpp.mk +include $(JWBDIR)/make/profiler-defs.mk +include $(JWBDIR)/make/targets-tools.mk +include $(JWBDIR)/make/cpp-extra-targets.mk +include $(JWBDIR)/make/depend.mk +include $(JWBDIR)/make/backup.mk +include $(JWBDIR)/make/dev-utils.mk FINAL_CFLAGS += -D_USRDLL -DALL_EXPORTS FINAL_CXXFLAGS += -D_USRDLL -DALL_EXPORTS diff --git a/make/topdir-autoconf.mk b/make/topdir-autoconf.mk index 0b6fa791..326c1eac 100644 --- a/make/topdir-autoconf.mk +++ b/make/topdir-autoconf.mk @@ -4,7 +4,7 @@ AUTOCONF_GENERATED := $(patsubst %.in,%,$(AUTOCONF_IN)) ifneq ($(AUTOCONF_IN),) ifneq ($(AUTOCONF_GENERATED),$(wildcard $(AUTCONF_GENERATED))) - include $(MODDIR)/make/autoconf.mk + include $(JWBDIR)/make/autoconf.mk endif endif -include $(MODDIR)/make/topdir.mk +include $(JWBDIR)/make/topdir.mk diff --git a/make/topdir.mk b/make/topdir.mk index 460db685..0d7791c6 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -32,12 +32,12 @@ ifneq ($(wildcard $(TOPDIR)/make/defs.mk),) include $(TOPDIR)/make/defs.mk endif -include $(MODDIR)/make/defs.mk +include $(JWBDIR)/make/defs.mk REMOTE_GIT_DIR = /srv/git/$(JANWARE_USER)/$(REMOTE_GIT_FLAVOUR)/$(PROJECT) REMOTE_GIT_URL = ssh://$(JANWARE_USER_PREFIX)git.janware.com$(REMOTE_GIT_DIR) -include $(MODDIR)/make/dirs.mk +include $(JWBDIR)/make/dirs.mk ifneq ($(DONT_CHECK_PREREQ_DONE),true) ifndef PREREQ @@ -59,10 +59,10 @@ ifneq ($(SUBDIRS_TO_ITERATE),) endif -include $(MODDIR)/make/rpmdist.mk -include $(MODDIR)/make/rules.mk -include $(MODDIR)/make/doc-rules.mk -include $(MODDIR)/make/list-files.mk +include $(JWBDIR)/make/rpmdist.mk +include $(JWBDIR)/make/rules.mk +include $(JWBDIR)/make/doc-rules.mk +include $(JWBDIR)/make/list-files.mk STREAMLINE_PROJECT ?= bash $(MOD_SCRIPT_DIR)/streamline-project.sh diff --git a/make/upload.mk b/make/upload.mk index d2ee499e..37e5bc61 100644 --- a/make/upload.mk +++ b/make/upload.mk @@ -1,4 +1,4 @@ -include $(MODDIR)/make/upload-defs.mk +include $(JWBDIR)/make/upload-defs.mk UPLOAD_LAST_VERSION_FILE ?= LAST_UPLOADED_VERSION UPLOAD_LAST_VERSION ?= $(shell $(CAT) $(UPLOAD_LAST_VERSION_FILE) 2>/dev/null) diff --git a/make/yapp.mk b/make/yapp.mk index a2cba39c..42fd2fd0 100644 --- a/make/yapp.mk +++ b/make/yapp.mk @@ -10,7 +10,7 @@ ifneq ($(TARGET),mingw) FINAL_LDFLAGS += -rdynamic endif -include $(MODDIR)/make/exe.mk +include $(JWBDIR)/make/exe.mk all: build_EXE install: install_EXE diff --git a/make/zip-windows-files.mk b/make/zip-windows-files.mk index 13e5ce5f..61529e13 100644 --- a/make/zip-windows-files.mk +++ b/make/zip-windows-files.mk @@ -37,10 +37,10 @@ $(WINLIB): $(REQUIRED_H) xargs tar -cf - | tar -C $(DISTDIR)/src/$(PROJECT) -xf - echo $(DIST_VERSION) > $(DISTDIR)/src/$(PROJECT)/VERSION ;\ set -e; for mod in $(REQUIRED) ; do \ - make -C $(MODDIR)/$$mod clean ;\ + make -C $(JWBDIR)/$$mod clean ;\ mkdir -p $(DISTDIR)/src/$(PROJECT)/mod/$$mod ;\ - echo `ls $(MODDIR)/$$mod/*.h`; \ - modfiles="`find $(MODDIR)/$$mod -maxdepth 1 -name *.h -o -name *.c -o -name *.cpp`"; \ + echo `ls $(JWBDIR)/$$mod/*.h`; \ + modfiles="`find $(JWBDIR)/$$mod -maxdepth 1 -name *.h -o -name *.c -o -name *.cpp`"; \ echo "++++ $$modfiles"; \ if [ -n "$$modfiles" ]; then cp $$modfiles $(DISTDIR)/src/$(PROJECT)/mod/$$mod/; fi\ done ;\ @@ -55,6 +55,6 @@ $(WINLIB): $(REQUIRED_H) $(SED) $$dir/Makefile -e "s/^TOPDIR\ *=.*/TOPDIR = \.\.\/\.\./g" > $(DISTDIR)/src/$(PROJECT)/mod/$$mod/Makefile ;\ fi; \ done ;\ - cp $(MODDIR)/Makefile $(DISTDIR)/src/$(PROJECT)/mod/ + cp $(JWBDIR)/Makefile $(DISTDIR)/src/$(PROJECT)/mod/ cd $(DISTDIR)/src; zip -r $(notdir $@) $(PROJECT) mv $(DISTDIR)/src/$(notdir $@) $@ diff --git a/scripts/Makefile b/scripts/Makefile index 8a51da99..1ddb8082 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -4,4 +4,4 @@ include $(TOPDIR)/make/proj.mk EXE_SH += jannet jcs jw-pkg -include $(MODDIR)/make/scripts.mk +include $(JWBDIR)/make/scripts.mk diff --git a/scripts/jw-build-create-project.sh b/scripts/jw-build-create-project.sh index d37aeb6e..bed9533d 100644 --- a/scripts/jw-build-create-project.sh +++ b/scripts/jw-build-create-project.sh @@ -28,7 +28,7 @@ cat_Makefile() TOPDIR = . include \$(TOPDIR)/make/proj.mk - include \$(MODDIR)/make/topdir.mk + include \$(JWBDIR)/make/topdir.mk EOT } @@ -45,7 +45,7 @@ cat_make_Makefile() TOPDIR = .. include \$(TOPDIR)/make/proj.mk - include \$(MODDIR)/make/make.mk + include \$(JWBDIR)/make/make.mk EOT } @@ -58,7 +58,7 @@ cat_make_proj_mk() ifeq (\$(TARGET),mingw) FLAVOUR_PATH_PREFIX = win32/ endif - MODDIR ?= \$(firstword \$(wildcard \$(DEV_PROJECTS_DIR)/jw-build \$(BUILD_TOOLS_PREFIX)/opt/\$(FLAVOUR_PATH_PREFIX)jw-build)) + JWBDIR ?= \$(firstword \$(wildcard \$(DEV_PROJECTS_DIR)/jw-build \$(BUILD_TOOLS_PREFIX)/opt/\$(FLAVOUR_PATH_PREFIX)jw-build)) USE_PROJECT_LIB = false HDRDIR_SCOPE_SUFFIX = \$(PROJECT) diff --git a/tmpl/Makefile b/tmpl/Makefile index 2f00ade7..a9018b59 100644 --- a/tmpl/Makefile +++ b/tmpl/Makefile @@ -1,4 +1,4 @@ TOPDIR = .. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/dirs.mk +include $(JWBDIR)/make/dirs.mk diff --git a/tmpl/doxygen/Makefile b/tmpl/doxygen/Makefile index 352a06a0..616c1ae1 100644 --- a/tmpl/doxygen/Makefile +++ b/tmpl/doxygen/Makefile @@ -8,11 +8,11 @@ GENERATED_WIDTHS_PNG = 400 LOGO = logo.png include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/svg.mk +include $(JWBDIR)/make/svg.mk LOCAL_TMPL = $(wildcard *.html *.tmpl $(LOGO)) -include $(MODDIR)/make/tmpl.mk +include $(JWBDIR)/make/tmpl.mk all: $(LOGO) clean: clean.local diff --git a/tmpl/tagged/Makefile b/tmpl/tagged/Makefile index a5f21879..b1ec41b6 100644 --- a/tmpl/tagged/Makefile +++ b/tmpl/tagged/Makefile @@ -1,4 +1,4 @@ TOPDIR = ../.. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/dirs.mk +include $(JWBDIR)/make/dirs.mk diff --git a/tmpl/tagged/cortex-m/Makefile b/tmpl/tagged/cortex-m/Makefile index ff529b71..62d684a7 100644 --- a/tmpl/tagged/cortex-m/Makefile +++ b/tmpl/tagged/cortex-m/Makefile @@ -1,4 +1,4 @@ TOPDIR = ../../.. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/dirs.mk +include $(JWBDIR)/make/dirs.mk diff --git a/tmpl/tagged/cortex-m/ld/Makefile b/tmpl/tagged/cortex-m/ld/Makefile index 8b04c5f4..bc9a1d01 100644 --- a/tmpl/tagged/cortex-m/ld/Makefile +++ b/tmpl/tagged/cortex-m/ld/Makefile @@ -1,4 +1,4 @@ TOPDIR = ../../../.. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/tagged-tmpl-repo.mk +include $(JWBDIR)/make/tagged-tmpl-repo.mk diff --git a/tmpl/tex/Makefile b/tmpl/tex/Makefile index a5f21879..b1ec41b6 100644 --- a/tmpl/tex/Makefile +++ b/tmpl/tex/Makefile @@ -1,4 +1,4 @@ TOPDIR = ../.. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/dirs.mk +include $(JWBDIR)/make/dirs.mk diff --git a/tmpl/tex/de_contract/Makefile b/tmpl/tex/de_contract/Makefile index 0b974bd6..5fc1d264 100644 --- a/tmpl/tex/de_contract/Makefile +++ b/tmpl/tex/de_contract/Makefile @@ -5,4 +5,4 @@ TOPDIR = ../../.. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/text.mk +include $(JWBDIR)/make/text.mk diff --git a/tmpl/tex/de_presentation/Makefile b/tmpl/tex/de_presentation/Makefile index 0b974bd6..5fc1d264 100644 --- a/tmpl/tex/de_presentation/Makefile +++ b/tmpl/tex/de_presentation/Makefile @@ -5,4 +5,4 @@ TOPDIR = ../../.. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/text.mk +include $(JWBDIR)/make/text.mk diff --git a/tmpl/tex/de_technical/Makefile b/tmpl/tex/de_technical/Makefile index 0b974bd6..5fc1d264 100644 --- a/tmpl/tex/de_technical/Makefile +++ b/tmpl/tex/de_technical/Makefile @@ -5,4 +5,4 @@ TOPDIR = ../../.. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/text.mk +include $(JWBDIR)/make/text.mk diff --git a/tmpl/tex/en_technical/Makefile b/tmpl/tex/en_technical/Makefile index 0b974bd6..5fc1d264 100644 --- a/tmpl/tex/en_technical/Makefile +++ b/tmpl/tex/en_technical/Makefile @@ -5,4 +5,4 @@ TOPDIR = ../../.. include $(TOPDIR)/make/proj.mk -include $(MODDIR)/make/text.mk +include $(JWBDIR)/make/text.mk