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

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) 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 $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/topdir.mk include $(JWBDIR)/make/topdir.mk
include $(MODDIR)/make/srcdist.mk include $(JWBDIR)/make/srcdist.mk
include $(MODDIR)/make/git-cvs-bridge.mk include $(JWBDIR)/make/git-cvs-bridge.mk
all: all:
clean: clean.pkgconfig clean: clean.pkgconfig

2
bin/Makefile
View file

@ -32,4 +32,4 @@
TOPDIR = .. TOPDIR = ..
include $(TOPDIR)/make/proj.mk 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 = .. TOPDIR = ..
include $(TOPDIR)/make/proj.mk 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)) SUBTREE_DIRS += $(dir $(SUBTREE_FILES))
include $(TOPDIR)/make/proj.mk 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 = ../.. TOPDIR = ../..
include $(TOPDIR)/make/proj.mk 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 = .. TOPDIR = ..
include $(TOPDIR)/make/proj.mk 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 = ../.. TOPDIR = ../..
include $(TOPDIR)/make/proj.mk 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_NAME = $(shell echo $(OS_NAME_VERSION) | sed 's/-.*//')
RPM_UPLOAD_OS_VERSION = $(shell echo $(OS_NAME_VERSION) | sed 's/[^-]\+-//') RPM_UPLOAD_OS_VERSION = $(shell echo $(OS_NAME_VERSION) | sed 's/[^-]\+-//')
@@ -88,8 +89,9 @@ @@ -88,8 +89,9 @@
include $(MODDIR)/make/upload-rules.mk include $(JWBDIR)/make/upload-rules.mk
PKG_SH = $(PKG_SH_EXE) \ PKG_SH = $(PKG_SH_EXE) \
- -N $(RPM_PROJECT) \ - -N $(RPM_PROJECT) \

4
htdocs/Makefile
View file

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

4
htdocs/images/Makefile
View file

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

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

@ -3,5 +3,5 @@ TOPDIR = ../../..
SVG_GENERATE_FORMATS ?= svg SVG_GENERATE_FORMATS ?= svg
include $(TOPDIR)/make/proj.mk include $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/svg.mk include $(JWBDIR)/make/svg.mk
include $(MODDIR)/make/htdocs.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 #CACHED_VARS += DEVELOPMENT
include $(TOPDIR)/make/proj.mk include $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/make.mk include $(JWBDIR)/make/make.mk
ifneq ($(MAKECMDGOALS),install-links) ifneq ($(MAKECMDGOALS),install-links)
ifneq ($(MAKECMDGOALS),do-install-links) ifneq ($(MAKECMDGOALS),do-install-links)
include $(MODDIR)/make/dirs.mk include $(JWBDIR)/make/dirs.mk
endif endif
endif endif
include $(MODDIR)/make/dev-utils.mk include $(JWBDIR)/make/dev-utils.mk
#include $(MODDIR)/make/cache.mk #include $(JWBDIR)/make/cache.mk
all: all:

4
make/bin.mk
View file

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

2
make/cache.mk
View file

@ -10,7 +10,7 @@ CACHE_FILE_MK ?= .cache.mk
all: cache all: cache
ifneq ($(foreach g,all cache,$(findstring $(g),$(MAKECMDGOALS))),) ifneq ($(foreach g,all cache,$(findstring $(g),$(MAKECMDGOALS))),)
cache: $(CACHE_FILE_MK) 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)),) ifeq ($(wildcard $(CACHE_FILE_MK)),)
@echo $(foreach v,$(CACHED_VARS),$v := $(value $(v))EOL) | $(SED) 's/EOL */\n/g;' | $(GREP) . | tee $@.tmp @echo $(foreach v,$(CACHED_VARS),$v := $(value $(v))EOL) | $(SED) 's/EOL */\n/g;' | $(GREP) . | tee $@.tmp
mv $@.tmp $@ mv $@.tmp $@

2
make/cleandirs.mk
View file

@ -5,7 +5,7 @@ install: do.install
clean: do.clean clean: do.clean
distclean: do.distclean distclean: do.distclean
include $(MODDIR)/make/defs.mk include $(JWBDIR)/make/defs.mk
SUBDIRS ?= $(FIND_SUBDIRS) SUBDIRS ?= $(FIND_SUBDIRS)

6
make/conf.mk
View file

@ -1,6 +1,6 @@
include $(MODDIR)/make/defs.mk include $(JWBDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk include $(JWBDIR)/make/rules.mk
include $(MODDIR)/make/dev-utils.mk include $(JWBDIR)/make/dev-utils.mk
all: all:
clean: clean.conf 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 $(JWBDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk include $(JWBDIR)/make/rules.mk
all: all:
clean: clean.conf 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_MODE ?= 664
DAV_RSYNC_DIRMODE ?= 775 DAV_RSYNC_DIRMODE ?= 775
include $(MODDIR)/make/defs.mk include $(JWBDIR)/make/defs.mk
all: all:
install: 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)) \ #PREREQ_CPP += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.c)) \
# $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.cpp)) # $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.cpp))
#PREREQ_CSRC += $(PREREQ_H) $(PREREQ_C) $(PREREQ_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_DONE += $(patsubst %,%/all.done,$(REQUIRED_DIR))
REQUIRED_H += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.h)) REQUIRED_H += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.h))
REQUIRED_C += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.c)) 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.*)) CORE += $(filter-out $(wildcard *.intern-state*),$(wildcard core core.* vgcore vgcore.*))
ifeq ($(USE_QT),true) ifeq ($(USE_QT),true)
include $(MODDIR)/make/qtversion.mk include $(JWBDIR)/make/qtversion.mk
include $(MODDIR)/make/qt-defs.mk include $(JWBDIR)/make/qt-defs.mk
endif endif
ifeq ($(USE_X),true) ifeq ($(USE_X),true)
@ -499,10 +499,10 @@ endif
# ----- standard features, switched on with USE_XXX = true # ----- standard features, switched on with USE_XXX = true
#include $(MODDIR)/make/lib-deps.mk #include $(JWBDIR)/make/lib-deps.mk
ifeq ($(USE_GFILTER),true) 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) ifneq ($(strip $(GFILT)),sh)
GXX = $(GFILT) GXX = $(GFILT)
endif endif
@ -598,7 +598,7 @@ ifeq ($(COMPILE_DEBUG_LOG),true)
endif endif
ifeq ($(USE_MPATROL),true) ifeq ($(USE_MPATROL),true)
FINAL_CPPFLAGS += -include $(MODDIR)/include/mpatrol.h FINAL_CPPFLAGS += -include $(JWBDIR)/include/mpatrol.h
FINAL_LDFLAGS += -lmpatrolmt -lbfd -liberty FINAL_LDFLAGS += -lmpatrolmt -lbfd -liberty
endif endif
@ -779,8 +779,8 @@ ifeq ($(USE_PROJECT_LIB),true)
INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
else else
LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a
#WINRES_RC_TMPL = $(MODDIR)/make/winres-minimal.rc.tmpl #WINRES_RC_TMPL = $(JWBDIR)/make/winres-minimal.rc.tmpl
WINRES_RC_TMPL = $(MODDIR)/make/winres.rc.tmpl WINRES_RC_TMPL = $(JWBDIR)/make/winres.rc.tmpl
WINRES_RC = $(BUILD_LIBDIR)/$(PROJECT).rc WINRES_RC = $(BUILD_LIBDIR)/$(PROJECT).rc
WINRES_O = $(WINRES_RC).o WINRES_O = $(WINRES_RC).o
SO_SUFFIX ?= dll SO_SUFFIX ?= dll

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