janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

Everywhere: Rename MODDIR -> JWBDIR

Browse source 
Rename the omnipresent MODDIR variable to JWBDIR, since that's more to the
point.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-06-29 21:34:18 +00:00
commit b2d6e6f554
109 changed files with 279 additions and 277 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -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

2
bin/Makefile
View file

@ -32,4 +32,4 @@
TOPDIR = ..
include $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/bin.mk
include $(JWBDIR)/make/bin.mk

2
conf/Makefile
View file

@ -1,4 +1,4 @@
TOPDIR = ..
include $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/dirs.mk
include $(JWBDIR)/make/dirs.mk

2
conf/jcs/Makefile
View file

@ -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

2
conf/profile/Makefile
View file

@ -1,4 +1,4 @@
TOPDIR = ../..
include $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/profile.mk
include $(JWBDIR)/make/profile.mk

2
doc/Makefile
View file

@ -1,4 +1,4 @@
TOPDIR = ..
include $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/cleandirs.mk
include $(JWBDIR)/make/cleandirs.mk

2
doc/packaging/Makefile
View file

@ -1,4 +1,4 @@
TOPDIR = ../..
include $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/dummy.mk
include $(JWBDIR)/make/dummy.mk

2
doc/packaging/add-pkg-conflicts-support.patch
View file

@ -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) \

4
htdocs/Makefile
View file

@ -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

4
htdocs/images/Makefile
View file

@ -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

4
htdocs/images/logo-janware/Makefile
View file

@ -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

8
make/Makefile
View file

@ -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:

4
make/bin.mk
View file

@ -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:

2
make/cache.mk
View file

@ -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 $@

2
make/cleandirs.mk
View file

@ -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)

6
make/conf.mk
View file

@ -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

2
make/cpp.mk
View file

@ -1 +1 @@
include $(MODDIR)/make/tools.mk
include $(JWBDIR)/make/tools.mk

4
make/crontab.mk
View file

@ -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

2
make/dav.mk
View file

@ -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:

16
make/defs-cpp.mk
View file

@ -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

10
make/defs-dev.mk
View file

@ -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

8
make/defs-dist.mk
View file

@ -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

16
make/defs.mk
View file

@ -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))

2
make/dev-utils.mk
View file

@ -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

4
make/dirs.mk
View file

@ -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),)

8
make/dist.mk
View file

@ -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)

6
make/doc.mk
View file

@ -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

10
make/doxygen.mk
View file

@ -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; \

2
make/dummy.mk
View file

@ -3,7 +3,7 @@
# contact@jannet.de
# $Id$
include $(MODDIR)/make/defs.mk
include $(JWBDIR)/make/defs.mk
all:
clean:

6
make/exe.mk
View file

@ -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)

4
make/generic.mk
View file

@ -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

6
make/gettext.mk
View file

@ -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

2
make/git-submod.mk
View file

@ -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:

6
make/header.mk
View file

@ -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

8
make/htdocs.mk
View file

@ -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

4
make/images.mk
View file

@ -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

8
make/include.mk
View file

@ -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

4
make/install-files.mk
View file

@ -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)

2
make/java.mk
View file

@ -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:

8
make/lib.mk
View file

@ -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:

2
make/libsrc.mk
View file

@ -3,4 +3,4 @@
# contact@jannet.de
# $Id$
include $(MODDIR)/make/tools.mk
include $(JWBDIR)/make/tools.mk

4
make/linux-rpm-build.mk
View file

@ -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

6
make/linux-rpm.mk
View file

@ -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

12
make/lo.mk
View file

@ -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

2
make/main.mk
View file

@ -4,7 +4,7 @@ ifneq ($(TARGET),mingw)
FINAL_LDFLAGS += -rdynamic
endif
include $(MODDIR)/make/exe.mk
include $(JWBDIR)/make/exe.mk
all:
clean: profclean

16
make/make.mk
View file

@ -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) \

2
make/mcu-defs.mk
View file

@ -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)

10
make/mcu-exe.mk
View file

@ -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)

6
make/mcu-topdir.mk
View file

@ -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

6
make/platform.mk
View file

@ -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

6
make/plugin-version.mk
View file

@ -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:

18
make/plugin.mk
View file

@ -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

4
make/profile.mk
View file

@ -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

4
make/profiler.mk
View file

@ -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

2
make/proj.mk
View file

@ -2,7 +2,7 @@
# contact@jannet.de
# $Id$
MODDIR ?= $(TOPDIR)
JWBDIR ?= $(TOPDIR)
JANWARE_WIKI = priv
# rpmdist.mk variable overrides

2
make/projdefs.mk
View file

@ -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)

2
make/projects-dir.mk
View file

@ -19,6 +19,8 @@
# ------------ Makefile and environment variable definitions
.NOTPARALLEL:
-include local.mk
SHELL = /bin/bash -o pipefail +H

2
make/projects.mk
View file

@ -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)

2
make/py-defs.mk
View file

@ -99,4 +99,4 @@ py-libpath:
@echo export PYTHONPATH=$(PYTHONPATH)
endif
include $(MODDIR)/make/ldlibpath.mk
include $(JWBDIR)/make/ldlibpath.mk

10
make/py-mod.mk
View file

@ -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

2
make/py-rules.mk
View file

@ -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)

8
make/py-run.mk
View file

@ -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 ?=

2
make/python-cli.mk
View file

@ -1,4 +1,4 @@
include $(MODDIR)/make/defs.mk
include $(JWBDIR)/make/defs.mk
EXE ?= $(shell $(PWD)).py
EXE_PATH ?= ./$(EXE)

4
make/qt.mk
View file

@ -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

10
make/qtexe.mk
View file

@ -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

4
make/qtplugin.mk
View file

@ -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

6
make/qtso.mk
View file

@ -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

12
make/qttools.mk
View file

@ -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

8
make/rpmdist.mk
View file

@ -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) \

2
make/rules.mk
View file

@ -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 \

20
make/run.mk
View file

@ -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)

8
make/scripts.mk
View file

@ -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

6
make/smart-selection.mk
View file

@ -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 $@

10
make/so.mk
View file

@ -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

2
make/srcdist.mk
View file

@ -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

4
make/standalone-exe.mk
View file

@ -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)

2
make/std-tools.mk
View file

@ -1,4 +1,4 @@
include $(MODDIR)/make/defs.mk
include $(JWBDIR)/make/defs.mk
PROFILE_SH = profile-$(PROJECT).sh

2
make/subdirs.mk
View file

@ -1,4 +1,4 @@
include $(MODDIR)/make/defs-dirs.mk
include $(JWBDIR)/make/defs-dirs.mk
all:
clean: clean.var

2
make/subtree.mk
View file

@ -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)

4
make/suse-selection.mk
View file

@ -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

12
make/swig.mk
View file

@ -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

2
make/tagged-tmpl-repo.mk
View file

@ -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

2
make/tagged-tmpl.mk
View file

@ -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

2
make/targets-tools.mk
View file

@ -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)),)

2
make/test-exe.mk
View file

@ -5,7 +5,7 @@
EXE_BASENAME ?= test-$(notdir $(shell $(PWD)))
include $(MODDIR)/make/run.mk
include $(JWBDIR)/make/run.mk
all: $(EXE)
install:

2
make/test-java.mk
View file

@ -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)

8
make/tex.mk
View file

@ -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

4
make/text.mk
View file

@ -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:

4
make/theme-images.mk
View file

@ -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

4
make/tmpl.mk
View file

@ -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

2
make/tools-matlab.mk
View file

@ -1 +1 @@
include $(MODDIR)/make/dummy.mk
include $(JWBDIR)/make/dummy.mk

16
make/tools.mk
View file

@ -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

4
make/topdir-autoconf.mk
View file

@ -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

12
make/topdir.mk
View file

@ -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

2
make/upload.mk
View file

@ -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)

2
make/yapp.mk
View file

@ -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

8
make/zip-windows-files.mk
View file

@ -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 $@) $@

2
scripts/Makefile
View file

@ -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

6
scripts/jw-build-create-project.sh
View file

@ -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)

2
tmpl/Makefile
View file

@ -1,4 +1,4 @@
TOPDIR = ..
include $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/dirs.mk
include $(JWBDIR)/make/dirs.mk

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