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: Purge spaces in text files

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-06 12:38:20 +00:00
commit aa85417a17
96 changed files with 211 additions and 293 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -12,4 +12,3 @@ clean: clean.pkgconfig
clean.pkgconfig: clean.pkgconfig:
rm -rf pkgconfig rm -rf pkgconfig

1
conf/Makefile
View file

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

4
conf/jcs/jcs.mk
View file

@ -95,7 +95,7 @@ checksum: checkroot # TODO integrate tripwire
install: checkroot $(LOCAL_INSTALL) install_inf install_link $(LOCAL_POST_INSTALL) checksum install: checkroot $(LOCAL_INSTALL) install_inf install_link $(LOCAL_POST_INSTALL) checksum
$(recurse_subdirs) $(recurse_subdirs)
setup: checkroot $(LOCAL_SETUP) setup_inf setup_link $(LOCAL_POST_SETUP) checksum setup: checkroot $(LOCAL_SETUP) setup_inf setup_link $(LOCAL_POST_SETUP) checksum
$(recurse_subdirs) $(recurse_subdirs)
@ -108,7 +108,7 @@ dist: clean
grep -ve "CVS\|trash\|$(MOD)/setup" | \ grep -ve "CVS\|trash\|$(MOD)/setup" | \
xargs tar -cvzf $(MOD).tar.gz ;\ xargs tar -cvzf $(MOD).tar.gz ;\
mv $(MOD).tar.gz $(MOD) mv $(MOD).tar.gz $(MOD)
checkroot: checkroot:
# @if [ `whoami` != root ] ; then echo "Only root can do this." >&2; exit 1; fi # @if [ `whoami` != root ] ; then echo "Only root can do this." >&2; exit 1; fi

10
conf/jcs/templates/dir/src/Makefile
View file

@ -2,14 +2,14 @@
# (c) 2000 jannet # (c) 2000 jannet
# contact@jannet.de # contact@jannet.de
MAKE_SH := jcs smake MAKE_SH := jcs smake
SUBDIRS = cur SUBDIRS = cur
setup: setup:
$(MAKE_SH) setup $(SUBDIRS) $(MAKE_SH) setup $(SUBDIRS)
install: install:
$(MAKE_SH) install $(SUBDIRS) $(MAKE_SH) install $(SUBDIRS)
clean: clean:
$(MAKE_SH) clean $(SUBDIRS) $(MAKE_SH) clean $(SUBDIRS)

1
conf/profile/Makefile
View file

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

1
htdocs/Makefile
View file

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

1
htdocs/images/Makefile
View file

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

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

@ -5,4 +5,3 @@ SVG_GENERATE_FORMATS ?= svg
include $(TOPDIR)/make/proj.mk include $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/svg.mk include $(MODDIR)/make/svg.mk
include $(MODDIR)/make/htdocs.mk include $(MODDIR)/make/htdocs.mk

1
make/Makefile
View file

@ -34,4 +34,3 @@ grep-vars:
$(INSTALL_MAKEDIR)/%.tmpl: %.tmpl $(TOPDIR)/dir_install_MAKE.done $(INSTALL_MAKEDIR)/%.tmpl: %.tmpl $(TOPDIR)/dir_install_MAKE.done
$(INSTALL) -o $(MAKEOWNER) -g $(MAKEGROUP) -m $(MAKEMODE) $< $@A $(INSTALL) -o $(MAKEOWNER) -g $(MAKEGROUP) -m $(MAKEMODE) $< $@A

5
make/cleandirs.mk
View file

@ -13,8 +13,8 @@ ifeq ($(FORCE_REBUILD_CLEANDIRS),true)
SUBDIRS_ALL = $(SUBDIRS) SUBDIRS_ALL = $(SUBDIRS)
SUBDIRS_INSTALL = $(SUBDIRS) SUBDIRS_INSTALL = $(SUBDIRS)
else else
SUBDIRS_ALL ?= SUBDIRS_ALL ?=
SUBDIRS_INSTALL ?= SUBDIRS_INSTALL ?=
endif endif
do.all: do.all:
@ -26,4 +26,3 @@ do.install:
do.%: do.%:
set -e; for d in $(SUBDIRS); do make -wC $$d $*; done set -e; for d in $(SUBDIRS); do make -wC $$d $*; done
$(RM) -rf $(TEXTCLEAN) $(CLEAN) *.done *~ .*.swp *.tmp core *.rep dirs-*.done $(RM) -rf $(TEXTCLEAN) $(CLEAN) *.done *~ .*.swp *.tmp core *.rep dirs-*.done

1
make/contrib.mk
View file

@ -45,4 +45,3 @@ distclean:
unpack: unpack.done unpack: unpack.done
apply-patches: apply-patches.done apply-patches: apply-patches.done

1
make/cpp.mk
View file

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

3
make/dav.mk
View file

@ -8,7 +8,7 @@ DAV_RSYNC_DIR ?= /srv/dav/pub/groups/$(DAV_GROUP)/$(DAV_GROUP_PROJ
DAV_RSYNC_URL = $(DAV_RSYNC_SERVER):$(DAV_RSYNC_DIR) DAV_RSYNC_URL = $(DAV_RSYNC_SERVER):$(DAV_RSYNC_DIR)
DAV_RSYNC_EXCLUDE ?= $(shell bash $(MOD_SCRIPT_DIR)/scm.sh ls-files) DAV_RSYNC_EXCLUDE ?= $(shell bash $(MOD_SCRIPT_DIR)/scm.sh ls-files)
DAV_RSYNC_EXCLUDE_OPTS = $(addprefix --exclude , $(DAV_RSYNC_EXCLUDE) '*.done') DAV_RSYNC_EXCLUDE_OPTS = $(addprefix --exclude , $(DAV_RSYNC_EXCLUDE) '*.done')
DAV_RSYNC_EXTRA_OPTS ?= DAV_RSYNC_EXTRA_OPTS ?=
DAV_RSYNC ?= rsync $(DAV_RSYNC_EXCLUDE_OPTS) DAV_RSYNC ?= rsync $(DAV_RSYNC_EXCLUDE_OPTS)
DAV_RSYNC_MODE ?= 664 DAV_RSYNC_MODE ?= 664
DAV_RSYNC_DIRMODE ?= 775 DAV_RSYNC_DIRMODE ?= 775
@ -42,4 +42,3 @@ dload.done:
dav.clean: dav.clean:
$(RM) -f upload.done dload.done $(RM) -f upload.done dload.done

2
make/debugger.mk
View file

@ -68,7 +68,7 @@ localcore:
cp `ls -rt /var/cores/*core* 2>/dev/null | tail -1` . cp `ls -rt /var/cores/*core* 2>/dev/null | tail -1` .
centralcore: centralcore:
echo /var/cores/core.%h.%e.%p | sudo tee /proc/sys/kernel/core_pattern echo /var/cores/core.%h.%e.%p | sudo tee /proc/sys/kernel/core_pattern
coreclean: centralcore-clean coreclean: centralcore-clean

14
make/defs-cpp.mk
View file

@ -12,11 +12,11 @@ endif
ifeq ($(TARGET_ARCH),armv7hl) ifeq ($(TARGET_ARCH),armv7hl)
PROJECT_CFLAGS += -fPIC PROJECT_CFLAGS += -fPIC
PROJECT_CPPFLAGS += -fPIC PROJECT_CPPFLAGS += -fPIC
PROJECT_LDFLAGS += PROJECT_LDFLAGS +=
else ifeq ($(TARGET_ARCH),aarch64) else ifeq ($(TARGET_ARCH),aarch64)
PROJECT_CFLAGS += -fPIC PROJECT_CFLAGS += -fPIC
PROJECT_CPPFLAGS += -fPIC PROJECT_CPPFLAGS += -fPIC
PROJECT_LDFLAGS += PROJECT_LDFLAGS +=
endif endif
ifeq ($(findstring $(TARGET_OS),linux),) ifeq ($(findstring $(TARGET_OS),linux),)
@ -78,7 +78,7 @@ ifneq ($(TARGET_TRIPLET),$(HOST_TRIPLET)) # we're cross-compiling
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
ifneq ($(wildcard $(TC_BIN_PREFIX)gcc),) ifneq ($(wildcard $(TC_BIN_PREFIX)gcc),)
CROSS_TOOL_DIR ?= CROSS_TOOL_DIR ?=
TC_SYS_ROOT ?= /usr/$(TARGET_TRIPLET)/sys-root/mingw TC_SYS_ROOT ?= /usr/$(TARGET_TRIPLET)/sys-root/mingw
else else
CROSS_TOOL_DIR ?= /opt/cross-tools CROSS_TOOL_DIR ?= /opt/cross-tools
@ -107,7 +107,7 @@ endif
ifeq ($(TARGET_ARCH),x86_64) ifeq ($(TARGET_ARCH),x86_64)
BUILD_CFLAGS += -fPIC BUILD_CFLAGS += -fPIC
BUILD_CPPFLAGS += -fPIC BUILD_CPPFLAGS += -fPIC
LIBFLAGS += LIBFLAGS +=
endif endif
ifeq ($(TARGET_TRIPLET),arm-none-eabi) ifeq ($(TARGET_TRIPLET),arm-none-eabi)
@ -319,7 +319,7 @@ endif
ifeq ($(USE_VALGRIND),true) ifeq ($(USE_VALGRIND),true)
BUILD_CFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_ BUILD_CFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_
BUILD_CPPFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_ BUILD_CPPFLAGS += -include /usr/include/valgrind/memcheck.h -D_VALGRIND_
# BUILD_LDFLAGS += # BUILD_LDFLAGS +=
endif endif
ifeq ($(USE_MCHECK),true) ifeq ($(USE_MCHECK),true)
@ -536,7 +536,7 @@ ifeq ($(USE_PROJECT_LIB),true)
VERSION_SCRIPT = $(BUILD_LIBDIR)/version.ldscript VERSION_SCRIPT = $(BUILD_LIBDIR)/version.ldscript
# TODO: use something like this as unifying variable, there are far too many # TODO: use something like this as unifying variable, there are far too many
# lib-related variables # lib-related variables
LOCAL_LIBS += LOCAL_LIBS +=
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME).a LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME).a
SO_SUFFIX = so.$(MAJOR_MINOR_RELEASE) SO_SUFFIX = so.$(MAJOR_MINOR_RELEASE)
@ -552,7 +552,7 @@ ifeq ($(USE_PROJECT_LIB),true)
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
SO_PREFIX ?= SO_PREFIX ?=
LIB_DEF = $(BUILD_LIBDIR)/$(LIBNAME).def LIB_DEF = $(BUILD_LIBDIR)/$(LIBNAME).def
MSVCPP_IMPLIB = $(BUILD_LIBDIR)/$(LIBNAME).lib MSVCPP_IMPLIB = $(BUILD_LIBDIR)/$(LIBNAME).lib
LIB_SO = $(BUILD_LIBDIR)/$(LIBNAME).dll LIB_SO = $(BUILD_LIBDIR)/$(LIBNAME).dll

5
make/defs-dev.mk
View file

@ -1,6 +1,6 @@
# jw-build library # jw-build library
# (c) 2001 jannet it services # (c) 2001 jannet it services
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
# -- files # -- files
@ -28,7 +28,7 @@ RSYSLOG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/rsyslog.d
IMG_PREFIX ?= $(PREFIX) IMG_PREFIX ?= $(PREFIX)
LOG_PREFIX ?= $(PREFIX)/log LOG_PREFIX ?= $(PREFIX)/log
JAVA_PREFIX ?= $(PREFIX) JAVA_PREFIX ?= $(PREFIX)
HDR_SCOPE_PREFIX ?= HDR_SCOPE_PREFIX ?=
IMAGEDIR ?= $(MODDIR)/../../images IMAGEDIR ?= $(MODDIR)/../../images
CTRLDIR ?= $(ENV_PREFIX)$(HOME)/bin$(FLAVOUR_PATH_SUFFIX) CTRLDIR ?= $(ENV_PREFIX)$(HOME)/bin$(FLAVOUR_PATH_SUFFIX)
@ -298,4 +298,3 @@ BREAK_ABI ?= true
#INSTALL_HOME_BIN_WRAPPERS ?= true #INSTALL_HOME_BIN_WRAPPERS ?= true
#export MALLOC_CHECK_ = 3 #export MALLOC_CHECK_ = 3

1
make/defs-dirs.mk
View file

@ -7,4 +7,3 @@ ALLOWED_SUBDIR_TARGETS ?= all install clean distclean test link-in
SUBDIRS ?= $(ORDERED_SUBDIRS) $(filter-out $(ORDERED_SUBDIRS),$(FIND_SUBDIRS)) SUBDIRS ?= $(ORDERED_SUBDIRS) $(filter-out $(ORDERED_SUBDIRS),$(FIND_SUBDIRS))
#SUBDIRS ?= $(filter-out $(ORDERED_SUBDIRS),$(FIND_SUBDIRS)) #SUBDIRS ?= $(filter-out $(ORDERED_SUBDIRS),$(FIND_SUBDIRS))
#SUBDIRS ?= $(FIND_SUBDIRS) #SUBDIRS ?= $(FIND_SUBDIRS)

4
make/defs-dist.mk
View file

@ -1,6 +1,6 @@
# jw-build library # jw-build library
# (c) 2001 jannet it services # (c) 2001 jannet it services
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
# -- files # -- files
@ -28,7 +28,7 @@ RSYSLOG_DIR ?= $(ENV_PREFIX)/etc/rsyslog.d
IMG_PREFIX ?= $(PREFIX) IMG_PREFIX ?= $(PREFIX)
LOG_PREFIX ?= $(ENV_PREFIX)/var/log LOG_PREFIX ?= $(ENV_PREFIX)/var/log
JAVA_PREFIX ?= $(PREFIX) JAVA_PREFIX ?= $(PREFIX)
HDR_SCOPE_PREFIX ?= HDR_SCOPE_PREFIX ?=
IMAGEDIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/images IMAGEDIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/images
CTRLDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)init.d CTRLDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)init.d

10
make/defs.mk
View file

@ -41,7 +41,7 @@ ifeq ($(origin RM),default)
RM := $(shell $(WHICH) rm) RM := $(shell $(WHICH) rm)
endif endif
ifndef AR ifndef AR
AR = $(shell $(WHICH) ar) AR := $(shell $(WHICH) ar)
endif endif
#ifndef PWD #ifndef PWD
PWD := $(shell $(WHICH) pwd) PWD := $(shell $(WHICH) pwd)
@ -391,14 +391,14 @@ INSTALLED_MAKE += $(addprefix $(INSTALL_MAKEDIR)/,$(MKFILES))
# -- IMG # -- IMG
INSTALLATION_FILE_TYPES += IMG INSTALLATION_FILE_TYPES += IMG
BUILD_IMG ?= BUILD_IMG ?=
BUILD_IMGDIR ?= $(TOPDIR)/images BUILD_IMGDIR ?= $(TOPDIR)/images
INSTALL_IMGDIR ?= $(IMG_PREFIX)/images INSTALL_IMGDIR ?= $(IMG_PREFIX)/images
INSTALLED_IMG ?= $(addprefix $(INSTALL_IMGDIR)/,$(IMAGES)) INSTALLED_IMG ?= $(addprefix $(INSTALL_IMGDIR)/,$(IMAGES))
# -- MO # -- MO
INSTALLATION_FILE_TYPES += MO INSTALLATION_FILE_TYPES += MO
BUILD_MO ?= BUILD_MO ?=
BUILD_MODIR ?= $(CWD) BUILD_MODIR ?= $(CWD)
INSTALL_MODIR ?= $(ENV_PREFIX)/usr/share/locale/$(GETTEXT_LOCALE)/LC_MESSAGES INSTALL_MODIR ?= $(ENV_PREFIX)/usr/share/locale/$(GETTEXT_LOCALE)/LC_MESSAGES
INSTALLED_MO ?= $(addprefix $(INSTALL_MODIR)/,$(wildcard *.mo)) INSTALLED_MO ?= $(addprefix $(INSTALL_MODIR)/,$(wildcard *.mo))
@ -406,9 +406,9 @@ INSTALLED_MO ?= $(addprefix $(INSTALL_MODIR)/,$(wildcard *.mo))
# -- LOG # -- LOG
INSTALLATION_FILE_TYPES += LOG INSTALLATION_FILE_TYPES += LOG
BUILD_LOGDIR ?= $(TOPDIR)/log BUILD_LOGDIR ?= $(TOPDIR)/log
BUILD_LOG ?= BUILD_LOG ?=
INSTALL_LOGDIR ?= $(LOG_PREFIX)/$(PROJECT) INSTALL_LOGDIR ?= $(LOG_PREFIX)/$(PROJECT)
INSTALLED_LOG ?= INSTALLED_LOG ?=
# -- PROFILE # -- PROFILE
INSTALLATION_FILE_TYPES += PROFILE INSTALLATION_FILE_TYPES += PROFILE

1
make/disabled.mk
View file

@ -5,4 +5,3 @@ all:
install clean distclean: install clean distclean:
$(call DISABLED,$@) $(call DISABLED,$@)

1
make/dist.mk
View file

@ -85,4 +85,3 @@ install.dist: $(DIST_FILE) $(SSI_PREFIX)_$(PROJECT)_$(DIST_VERSION).html
$(CVS_RSH) -l $(TARGET_USER) $(TARGET_HOST) -C "\ $(CVS_RSH) -l $(TARGET_USER) $(TARGET_HOST) -C "\
cd $$DIR; find . -type d | xargs -r chmod $(TARGET_DIR_MODE); find . -type f | xargs -r chmod $(TARGET_FILE_MODE)" ;\ cd $$DIR; find . -type d | xargs -r chmod $(TARGET_DIR_MODE); find . -type f | xargs -r chmod $(TARGET_FILE_MODE)" ;\
done done

2
make/doc-rules.mk
View file

@ -10,5 +10,3 @@ distclean:
doc.clean: doc.clean:
$(RM) -rf *~ .*.swp $(RM) -rf *~ .*.swp

1
make/doc.mk
View file

@ -6,4 +6,3 @@
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk include $(MODDIR)/make/rules.mk
include $(MODDIR)/make/doc-rules.mk include $(MODDIR)/make/doc-rules.mk

9
make/doxygen.mk
View file

@ -31,8 +31,8 @@ DX_BROWSER ?= $(BROWSER)
DX_FILE_PATTERNS ?= *.h *.c *.cpp DX_FILE_PATTERNS ?= *.h *.c *.cpp
DX_INPUT_DIRS ?= $(TOPDIR)/include DX_INPUT_DIRS ?= $(TOPDIR)/include
DX_SRC_IS_JAVA ?= NO DX_SRC_IS_JAVA ?= NO
DX_EXCLUDE_FILES ?= DX_EXCLUDE_FILES ?=
DX_INCLUDE_PATH ?= DX_INCLUDE_PATH ?=
DX_RECURSIVE ?= YES DX_RECURSIVE ?= YES
DX_EXTRACT_STATIC ?= NO DX_EXTRACT_STATIC ?= NO
DX_INLINE_SOURCES ?= NO DX_INLINE_SOURCES ?= NO
@ -51,7 +51,7 @@ doxygen.done: $(DX_UNTEMPLATED) $(DX_INCLUDE)
umask 022; doxygen $(DX_DOXYGEN_CONF) umask 022; doxygen $(DX_DOXYGEN_CONF)
touch $@ touch $@
cpfiles.done: doxygen.done $(DX_DOC_FILES) cpfiles.done: doxygen.done $(DX_DOC_FILES)
umask 022; cp $(DX_DOC_FILES) $(DX_OUTPUT_DIR) umask 022; cp $(DX_DOC_FILES) $(DX_OUTPUT_DIR)
touch $@ touch $@
@ -70,7 +70,7 @@ clean.doxygen:
inst-dir.done: inst-dir.done:
$(INSTALL) -d -o $(DOCDIROWNER) -g $(DOCDIRGROUP) -m $(DOCDIRMODE) $(DX_INSTALL_DIR) $(INSTALL) -d -o $(DOCDIROWNER) -g $(DOCDIRGROUP) -m $(DOCDIRMODE) $(DX_INSTALL_DIR)
touch $@ touch $@
install.done: doxygen.done inst-dir.done install.done: doxygen.done inst-dir.done
make install.doxygen make install.doxygen
touch $@ touch $@
@ -128,4 +128,3 @@ doxygen.conf.tmpl: | $(DX_FALLBACK_CONF_TMPL)
mv $@.tmp $@ mv $@.tmp $@
endif endif

1
make/exe.mk
View file

@ -19,4 +19,3 @@ $(LIB_SO): $(LIB_A)
$(EXE): $(LIB_SO) $(EXE): $(LIB_SO)
endif endif
all.dirs: all.dirs:

1
make/git-submod.mk
View file

@ -30,4 +30,3 @@ git-init-submod-remote:
git -C $(TOPDIR) submodule add -f $(GIT_REPO_URL) $(SUBMOD_PATH) git -C $(TOPDIR) submodule add -f $(GIT_REPO_URL) $(SUBMOD_PATH)
git submodule init git submodule init
git commit -m "Add git submodule $(SUBMOD_PATH)" $(SUBMOD_SRC_DIR) $(TOPDIR)/.gitmodules git commit -m "Add git submodule $(SUBMOD_PATH)" $(SUBMOD_SRC_DIR) $(TOPDIR)/.gitmodules

1
make/install-files.mk
View file

@ -52,4 +52,3 @@ install-old.done:
fi ;\ fi ;\
done done
touch $@ touch $@

1
make/isolinux.mk
View file

@ -60,4 +60,3 @@ BOOT_CONF = boot.conf
$(ISO_IMAGE): $(BOOT_CONF) dirs.done $(CD_FILES) $(ISO_IMAGE): $(BOOT_CONF) dirs.done $(CD_FILES)
$(GENERATE) -o $@ -d $(BUILD_DIR) -f $< $(CD_FILES) $(GENERATE) -o $@ -d $(BUILD_DIR) -f $< $(CD_FILES)

2
make/js.mk
View file

@ -2,7 +2,7 @@ JAVA ?= /usr/bin/java
JS_MINIFY_FILTER_IN ?= sed 's/console\.[a-z]\+([^)]\+) *;//g' JS_MINIFY_FILTER_IN ?= sed 's/console\.[a-z]\+([^)]\+) *;//g'
JS_SRC ?= $(filter-out %.min.js,$(wildcard *.js)) JS_SRC ?= $(filter-out %.min.js,$(wildcard *.js))
JS_GENERATED ?= $(patsubst %.js,%.min.js,$(JS_SRC)) JS_GENERATED ?= $(patsubst %.js,%.min.js,$(JS_SRC))
JS_EXTRA_EXTERNS ?= JS_EXTRA_EXTERNS ?=
JS_CC_BUILD_ROOT ?= $(PROJECTS_DIR)/closure-compiler/contrib/closure-compiler/install-root JS_CC_BUILD_ROOT ?= $(PROJECTS_DIR)/closure-compiler/contrib/closure-compiler/install-root
JS_EXTERNS_DIRS ?= $(firstword $(wildcard $(JS_CC_BUILD_ROOT)/$(realpath $(PROJECTS_DIR))/closure-compiler/share/externs /opt/closure-compiler/share/externs)) JS_EXTERNS_DIRS ?= $(firstword $(wildcard $(JS_CC_BUILD_ROOT)/$(realpath $(PROJECTS_DIR))/closure-compiler/share/externs /opt/closure-compiler/share/externs))
JS_EXTERNS ?= $(sort $(JS_EXTRA_EXTERNS) jquery-3.3.js) JS_EXTERNS ?= $(sort $(JS_EXTRA_EXTERNS) jquery-3.3.js)

2
make/ldlibpath.mk
View file

@ -1,4 +1,4 @@
# jan's utility modules # jan's utility modules
# (c) 2001-2005 jannet it services # (c) 2001-2005 jannet it services
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$

1
make/lib.mk
View file

@ -89,4 +89,3 @@ clean: clean.winres
#%.o : %.rc #%.o : %.rc
# $(WINDRES) $^ -o $@ # $(WINDRES) $^ -o $@
endif endif

1
make/libsrc.mk
View file

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

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

@ -108,7 +108,7 @@ $(TMP_INSTALL)/boot/%-$(KERNEL_VERSION)-$(RPM_RELEASE): build.lxdone $(LOCAL_AFT
$(TMP_INSTALL)/boot/%-$(KERNEL_VERSION)-$(RPM_RELEASE): $(TMP_INSTALL)/boot/%-$(KERNEL_VERSION) $(TMP_INSTALL)/boot/%-$(KERNEL_VERSION)-$(RPM_RELEASE): $(TMP_INSTALL)/boot/%-$(KERNEL_VERSION)
cp $< $@ cp $< $@
$(F_TGZ): Makefile build.lxdone $(F_BOOTFILES) $(TMP_INSTALL)/$(F_SPEC) $(F_TGZ): Makefile build.lxdone $(F_BOOTFILES) $(TMP_INSTALL)/$(F_SPEC)
tar -czf $@ \ tar -czf $@ \
$(F_BOOTFILES) \ $(F_BOOTFILES) \
$(addprefix $(TMP_INSTALL)/, \ $(addprefix $(TMP_INSTALL)/, \
@ -178,10 +178,10 @@ ping:
ping $(HOST) ping $(HOST)
ssh: ssh:
$(CVS_RSH) -l root $(HOST) $(CVS_RSH) -l root $(HOST)
# user targets # user targets
unpack: unpack.done unpack: unpack.done
build: build.lxdone build: build.lxdone
driver: driver.done driver: driver.done
tgz: $(F_TGZ) tgz: $(F_TGZ)
spm: $(F_SPM) spm: $(F_SPM)

2
make/lo.mk
View file

@ -2,7 +2,7 @@
TOOLS_DIR ?= $(TOPDIR)/tools TOOLS_DIR ?= $(TOPDIR)/tools
TOOLS_INCLUDE_DIR ?= $(TOOLS_DIR) TOOLS_INCLUDE_DIR ?= $(TOOLS_DIR)
CPP_PREFIX ?= YLo CPP_PREFIX ?= YLo
CPP_SUFFIX ?= CPP_SUFFIX ?=
SO_PREFIX ?= lo_ SO_PREFIX ?= lo_
LOADABLE_OBJ_HOOK ?= LOADABLE_OBJECT_HOOK LOADABLE_OBJ_HOOK ?= LOADABLE_OBJECT_HOOK
# === change this < # === change this <

4
make/make.mk
View file

@ -74,8 +74,6 @@ $(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_D
mv $@.tmp $@ mv $@.tmp $@
$(BUILD_PKG_CONFIG): $(LOCAL_PKG_CONFIG) $(BUILD_PKG_CONFIG): $(LOCAL_PKG_CONFIG)
clean.pkg-config: clean.pkg-config:
$(RM) -f *.pc $(BUILD_PKG_CONFIG) $(RM) -f *.pc $(BUILD_PKG_CONFIG)

1
make/plugin-defs.mk
View file

@ -26,4 +26,3 @@ PLUGIN_VERSION_LIB = $(BUILD_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME)
#INSTALLED_PLUGIN_VERSION_LIB = $(INSTALL_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a #INSTALLED_PLUGIN_VERSION_LIB = $(INSTALL_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a
PROJECT_LDFLAGS += -Wl,--whole-archive -l$(PLUGIN_VERSION_LIB_BASENAME) -Wl,--no-whole-archive PROJECT_LDFLAGS += -Wl,--whole-archive -l$(PLUGIN_VERSION_LIB_BASENAME) -Wl,--no-whole-archive
endif endif

1
make/plugin-version.mk
View file

@ -15,4 +15,3 @@ clean.local:
$(PLUGIN_VERSION_LIB): version.o $(PLUGIN_VERSION_LIB): version.o
ar r $@ $< ar r $@ $<

1
make/prereq-installed.mk
View file

@ -3,4 +3,3 @@ PREREQ_INSTALLED_TARGETS += run gdb valgrind attach attach-strace libpath valgri
ifneq ($(filter $(PREREQ_INSTALLED_TARGETS),$(MAKECMDGOALS)),) ifneq ($(filter $(PREREQ_INSTALLED_TARGETS),$(MAKECMDGOALS)),)
PREREQ_BUILD += $(shell ls /etc/ld.so.conf.d | sed '/ld-.*.conf/ !d; s/ld-\(.*\).conf/\1/') PREREQ_BUILD += $(shell ls /etc/ld.so.conf.d | sed '/ld-.*.conf/ !d; s/ld-\(.*\).conf/\1/')
endif endif

2
make/profile.mk
View file

@ -4,7 +4,7 @@
# $Id$ # $Id$
PATH_PROFILE ?= path-$(PROJECT).sh PATH_PROFILE ?= path-$(PROJECT).sh
EXE_SH = EXE_SH =
ifeq ($(PROFILE),) ifeq ($(PROFILE),)
PROFILE = $(PATH_PROFILE) PROFILE = $(PATH_PROFILE)

1
make/profiler-rules-run.mk
View file

@ -82,4 +82,3 @@ gprof-view-callgraph-pdf: gprof-callgraph.pdf
okular $< okular $<
clean.gprof: clean.gprof:
$(RM) -f gmon.out gprof.txt *.tmp gprof-callgraph.pdf $(RM) -f gmon.out gprof.txt *.tmp gprof-callgraph.pdf

2
make/projdefs.mk
View file

@ -10,5 +10,3 @@ include $(MODDIR)/make/defs.mk
$(CAP_PROJECT)_VERSION := $(VERSION) $(CAP_PROJECT)_VERSION := $(VERSION)
$(CAP_PROJECT)_INSTALL_LIBDIR := $(INSTALL_LIBDIR) $(CAP_PROJECT)_INSTALL_LIBDIR := $(INSTALL_LIBDIR)
$(CAP_PROJECT)_TOPDIR := $(TOPDIR) $(CAP_PROJECT)_TOPDIR := $(TOPDIR)

6
make/projects-dir.mk
View file

@ -71,7 +71,7 @@ endif
ifeq ($(OFFLINE),true) ifeq ($(OFFLINE),true)
UNAVAILABLE_TARGETS ?= pull.done update.done clone.done UNAVAILABLE_TARGETS ?= pull.done update.done clone.done
else else
UNAVAILABLE_TARGETS ?= UNAVAILABLE_TARGETS ?=
export CVSROOT = :ext:$(JANWARE_USER)@cvs.janware.com:/srv/cvs export CVSROOT = :ext:$(JANWARE_USER)@cvs.janware.com:/srv/cvs
endif endif
@ -122,7 +122,7 @@ GIT_PROJECTS = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /.gi
CVS_PROJECTS = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /CVS,$(BUILD_PROJECTS))))) CVS_PROJECTS = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /CVS,$(BUILD_PROJECTS)))))
# ------------ targets # ------------ targets
# --- mandatory targets # --- mandatory targets
all: $(filter-out $(UNAVAILABLE_TARGETS),pull.done links.done) all: $(filter-out $(UNAVAILABLE_TARGETS),pull.done links.done)
@ -149,7 +149,7 @@ doc-project doc-module:
$(BROWSER) $(firstword $(shell sed '/https:/ !d; s%.*https%https%; s/ .*//' $(firstword $(MAKEFILE_LIST)))) $(BROWSER) $(firstword $(shell sed '/https:/ !d; s%.*https%https%; s/ .*//' $(firstword $(MAKEFILE_LIST))))
status: $(SSH_WRAPPER_SH) status: $(SSH_WRAPPER_SH)
for p in $(CVS_PROJECTS); do test -f $$d/CVS || echo $$p; done for p in $(CVS_PROJECTS); do test -f $$d/CVS || echo $$p; done
cvs status $(addsuffix VERSION,$(CVS_PROJECTS)) cvs status $(addsuffix VERSION,$(CVS_PROJECTS))
$(PGIT_SH) -uno status $(PGIT_SH) -uno status

2
make/py-defs.mk
View file

@ -29,7 +29,7 @@ PY_MOD ?= $(subst /,.,$(PY_INSTALL_MOD))
PY_INSTALL_DIR ?= $(ENV_PREFIX)$(PY_SITE_PACKAGES_PATH)/$(patsubst .,/,$(PY_INSTALL_MOD)) PY_INSTALL_DIR ?= $(ENV_PREFIX)$(PY_SITE_PACKAGES_PATH)/$(patsubst .,/,$(PY_INSTALL_MOD))
PY_INSTALLED_REG = $(addprefix $(PY_INSTALL_DIR)/,$(PY_ALL_PY) $(PY_PYC)) PY_INSTALLED_REG = $(addprefix $(PY_INSTALL_DIR)/,$(PY_ALL_PY) $(PY_PYC))
empty := empty :=
space := $(empty) $(empty) space := $(empty) $(empty)
PYTHONPATH ?= $(call proj_query, pythonpath $(PROJECT)) PYTHONPATH ?= $(call proj_query, pythonpath $(PROJECT))
#PYTHONPATH = $(subst $(space),,$(ENV_PYTHONPATH)$(foreach d,$(PY_MODULE_DIRS),:$(d))) #PYTHONPATH = $(subst $(space),,$(ENV_PYTHONPATH)$(foreach d,$(PY_MODULE_DIRS),:$(d)))

1
make/py-run.mk
View file

@ -13,4 +13,3 @@ distclean:
run: run:
/usr/bin/python2 $(EXE) $(EXE_ARGS) /usr/bin/python2 $(EXE) $(EXE_ARGS)

3
make/qt-defs.mk
View file

@ -63,7 +63,7 @@ CPPFLAGS += -DQT_THREAD_SUPPORT
#endif #endif
# ------------------------------- Qt defs # ------------------------------- Qt defs
#Qt5Designer \ #Qt5Designer \
ifeq ($(QT_MAJOR_VERSION),5) ifeq ($(QT_MAJOR_VERSION),5)
@ -155,4 +155,3 @@ OBJ += $(patsubst %.cpp,%.o,$(UIC_CPP))
OBJ += $(patsubst %.cpp,%.o,$(RCC_CPP)) OBJ += $(patsubst %.cpp,%.o,$(RCC_CPP))
endif # USE_QT endif # USE_QT

1
make/qt-pro.mk
View file

@ -17,4 +17,3 @@ all: $(QMAKE_MAKEFILE)
qmake.clean: qmake.clean:
if [ -f $(QMAKE_MAKEFILE) ]; then make -f $(QMAKE_MAKEFILE) clean; fi if [ -f $(QMAKE_MAKEFILE) ]; then make -f $(QMAKE_MAKEFILE) clean; fi
$(RM) -f $(QMAKE_MAKEFILE) *.tmp $(EXE) .qmake.stash $(RM) -f $(QMAKE_MAKEFILE) *.tmp $(EXE) .qmake.stash

7
make/qt-rules.mk
View file

@ -12,9 +12,9 @@ rcc_%.cpp: %.qrc
$(RCC) -o $@ $< $(RCC) -o $@ $<
ifeq ($(QT_MAJOR_VERSION),4) ifeq ($(QT_MAJOR_VERSION),4)
ui_%.h: %.ui ui_%.h: %.ui
else else
%.h: %.ui %.h: %.ui
endif endif
$(UIC) $< -o $@ $(UIC) $< -o $@
@ -22,7 +22,6 @@ ifeq ($(QT_MAJOR_VERSION),4)
uic_%.cpp: ui_%.h uic_%.cpp: ui_%.h
echo -e "#include \"$<\"\n" > $@ echo -e "#include \"$<\"\n" > $@
else else
uic_%.cpp: %.h %.ui uic_%.cpp: %.h %.ui
$(UIC) $*.ui -i $< -o $@ $(UIC) $*.ui -i $< -o $@
endif endif

1
make/qtexe.mk
View file

@ -10,4 +10,3 @@ include $(MODDIR)/make/defs-cpp.mk
include $(MODDIR)/make/qt-defs.mk include $(MODDIR)/make/qt-defs.mk
include $(MODDIR)/make/exe.mk include $(MODDIR)/make/exe.mk
include $(MODDIR)/make/qt.mk include $(MODDIR)/make/qt.mk

1
make/qtplugin.mk
View file

@ -8,4 +8,3 @@ QT_MAJOR_VERSION ?= 4
include $(MODDIR)/make/plugin.mk include $(MODDIR)/make/plugin.mk
include $(MODDIR)/make/qt.mk include $(MODDIR)/make/qt.mk

1
make/qtso.mk
View file

@ -6,4 +6,3 @@
include $(MODDIR)/make/qtversion.mk include $(MODDIR)/make/qtversion.mk
include $(MODDIR)/make/so.mk include $(MODDIR)/make/so.mk
include $(MODDIR)/make/qt.mk include $(MODDIR)/make/qt.mk

2
make/qttools.mk
View file

@ -7,7 +7,7 @@ include $(MODDIR)/make/qtversion.mk
include $(MODDIR)/make/tools.mk include $(MODDIR)/make/tools.mk
#include $(MODDIR)/make/defs.mk #include $(MODDIR)/make/defs.mk
#include $(MODDIR)/make/defs-cpp.mk #include $(MODDIR)/make/defs-cpp.mk
#ALL += $(BUILD_LIBDIR) $(PREREQ_DONE) $(BUILD_HDR) $(LOCAL_EXE_SH) $(MEMBERS) #ALL += $(BUILD_LIBDIR) $(PREREQ_DONE) $(BUILD_HDR) $(LOCAL_EXE_SH) $(MEMBERS)
#include $(MODDIR)/make/rules.mk #include $(MODDIR)/make/rules.mk
#clean: objclean textclean localclean #clean: objclean textclean localclean
#install: $(ALL) #install: $(ALL)

6
make/rpmdist.mk
View file

@ -145,7 +145,7 @@ clean.rpm:
#$(LOCAL_MKSPEC_SH): $(PROJECT_DESCR_FILE) #$(LOCAL_MKSPEC_SH): $(PROJECT_DESCR_FILE)
# sh $(MOD_SCRIPT_DIR)/create-mkspec.sh $< > $@.tmp # sh $(MOD_SCRIPT_DIR)/create-mkspec.sh $< > $@.tmp
# mv $@.tmp $@ # mv $@.tmp $@
# #
#clean.mkspec: #clean.mkspec:
# $(RM) -f $(LOCAL_MKSPEC_SH) $(LOCAL_MKSPEC_SH).tmp # $(RM) -f $(LOCAL_MKSPEC_SH) $(LOCAL_MKSPEC_SH).tmp
# #
@ -231,7 +231,7 @@ ifeq ($(wildcard $(TOPDIR)/.git),)
SCM_COMMIT = cvs commit SCM_COMMIT = cvs commit
SCM_ADD = cvs add SCM_ADD = cvs add
SCM_PUSH = SCM_PUSH =
SCM_PULL = cvs update -dP SCM_PULL = cvs update -dP
define check_scm_sync define check_scm_sync
@ -302,7 +302,7 @@ define check_reinstall_old
(true $(addprefix && test -f ,$(DIST_PCKG_RPM)) && make pkg-uninstall && make pkg-install) (true $(addprefix && test -f ,$(DIST_PCKG_RPM)) && make pkg-uninstall && make pkg-install)
endef endef
md5: md5:
echo $(HASH) > HASH echo $(HASH) > HASH
pkg-next-build: pkg-next-build:

6
make/rules.mk
View file

@ -139,7 +139,7 @@ prepend_header:
set -e; for f in $(SRC_UNHEADERED); do sh $(TOPDIR)/hdr/prepend_header.sh $$f; done set -e; for f in $(SRC_UNHEADERED); do sh $(TOPDIR)/hdr/prepend_header.sh $$f; done
remake: remake:
set -e; make $(addprefix -W ,$(SRC_FILES)) $(filter-out remake,$(MAKECMDGOALS)) set -e; make $(addprefix -W ,$(SRC_FILES)) $(filter-out remake,$(MAKECMDGOALS))
echo-target: echo-target:
@echo "TARGET_TUPLE = $(TARGET_TUPLE)" @echo "TARGET_TUPLE = $(TARGET_TUPLE)"
@ -345,10 +345,10 @@ else
endif endif
$(EXE) $(EXE_BIN): $(EXE) $(EXE_BIN):
$(CPP) $(sort $(OBJ)) $(BUILD_LDFLAGS) -o $@ $(CPP) $(sort $(OBJ)) $(BUILD_LDFLAGS) -o $@
$(PLUGIN) $(PLUGIN_LIB): $(PLUGIN) $(PLUGIN_LIB):
$(CPP) -shared $(sort $(OBJ)) $(BUILD_LDFLAGS) -o $@ $(CPP) -shared $(sort $(OBJ)) $(BUILD_LDFLAGS) -o $@
# mkdir -p $(BUILD_LIBDIR) # mkdir -p $(BUILD_LIBDIR)
# $(BIN_INSTALL) -m 755 $@ $(BUILD_LIBDIR) # $(BIN_INSTALL) -m 755 $@ $(BUILD_LIBDIR)

23
make/run.mk
View file

@ -6,7 +6,7 @@
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/defs-cpp.mk include $(MODDIR)/make/defs-cpp.mk
DIR_BASENAME = $(notdir $(shell $(PWD))) DIR_BASENAME = $(notdir $(CWD))
ifeq ($(EXE_BASENAME),) ifeq ($(EXE_BASENAME),)
ifneq ($(DIR_BASENAME),test) ifneq ($(DIR_BASENAME),test)
@ -17,13 +17,13 @@ ifeq ($(EXE_BASENAME),)
endif endif
ifneq ($(EXE_BASENAME),) ifneq ($(EXE_BASENAME),)
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
EXE ?= $(EXE_BASENAME) EXE ?= $(EXE_BASENAME)
SHORTCUT_SCRIPT ?= ./run.sh SHORTCUT_SCRIPT ?= ./run.sh
else else
EXE ?= $(EXE_BASENAME).exe EXE ?= $(EXE_BASENAME).exe
SHORTCUT_SCRIPT ?= run.bat SHORTCUT_SCRIPT ?= run.bat
endif endif
endif endif
EXE_PATH ?= ./$(EXE) EXE_PATH ?= ./$(EXE)
@ -33,7 +33,7 @@ LOCAL_CFLAGS += -DEXE_NAME=\"$(EXE)\"
LOCAL_CPPFLAGS += -DEXE_NAME=\"$(EXE)\" LOCAL_CPPFLAGS += -DEXE_NAME=\"$(EXE)\"
include $(MODDIR)/make/profiler.mk include $(MODDIR)/make/profiler.mk
BUILD_HDR = BUILD_HDR =
include $(MODDIR)/make/rules.mk include $(MODDIR)/make/rules.mk
include $(MODDIR)/make/ldlibpath.mk include $(MODDIR)/make/ldlibpath.mk
include $(MODDIR)/make/path-rules.mk include $(MODDIR)/make/path-rules.mk
@ -42,7 +42,7 @@ include $(MODDIR)/make/debugger.mk
EXE_ARGS += $(LOCAL_EXE_ARGS) EXE_ARGS += $(LOCAL_EXE_ARGS)
ifneq ($(wildcard local.supp),) ifneq ($(wildcard local.supp),)
VALGRIND_OPTS += --suppressions=local.supp VALGRIND_OPTS += --suppressions=local.supp
endif endif
all: all:
@ -108,7 +108,7 @@ valgrind: run-prereq
valkyrie: run-prereq valkyrie: run-prereq
$(RM) -f core.* $(RM) -f core.*
valkyrie $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS) valkyrie $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS)
efence: run-prereq efence: run-prereq
$(RM) -f core.* $(RM) -f core.*
ef $(EXE_PATH) $(EXE_ARGS) ef $(EXE_PATH) $(EXE_ARGS)
@ -157,4 +157,3 @@ kcg:
kcachegrind callgrind.* kcachegrind callgrind.*
clean: runclean localclean clean: runclean localclean

1
make/scripts-targets.mk
View file

@ -34,4 +34,3 @@ install-home-bin: $(HOME_BIN_EXE_SH)
clean.init: clean.init:
$(RM) -f $(_INIT_SCRIPTS) $(RM) -f $(_INIT_SCRIPTS)

1
make/smart-selection.mk
View file

@ -68,4 +68,3 @@ smart-config.done:
sudo smart config --set rpm-check-signatures=false sudo smart config --set rpm-check-signatures=false
sudo smart config --set remove-packages=false sudo smart config --set remove-packages=false
touch $@ touch $@

1
make/standalone-exe.mk
View file

@ -31,4 +31,3 @@ strace: $(EXE) $(EXE_BIN)
all.dirs: all.dirs:
clean: execlean localclean clean.standalone-exe clean: execlean localclean clean.standalone-exe
clean.standalone-exe: clean.standalone-exe:

3
make/std-tools.mk
View file

@ -29,7 +29,6 @@ install.std-tools.done: install.std-dir.done
$(INSTALL) -p -o $(PROFILEOWNER) -g $(PROFILEGROUP) -m $(PROFILEMODE) $(PROFILE_SH) $(PROFILE_DIR) $(INSTALL) -p -o $(PROFILEOWNER) -g $(PROFILEGROUP) -m $(PROFILEMODE) $(PROFILE_SH) $(PROFILE_DIR)
touch $@ touch $@
install.std-dir.done: install.std-dir.done:
mkdir -p $(PROFILE_DIR) mkdir -p $(PROFILE_DIR)
touch $@ touch $@

1
make/subdirs.mk
View file

@ -13,4 +13,3 @@ clean.var:
$(RM) -rf $(CLEAN) $(RM) -rf $(CLEAN)
distclean.var: distclean.var:
$(RM) -rf $(DISTCLEAN) $(RM) -rf $(DISTCLEAN)

1
make/subtree.mk
View file

@ -37,4 +37,3 @@ $(INSTALLED_SUBTREE_DIRS):
$(ENV_PREFIX)$(SUBTREE_INSTALL_PREFIX)/%: % $(ENV_PREFIX)$(SUBTREE_INSTALL_PREFIX)/%: %
$(INSTALL) -p -o $(SUBTREE_OWNER) -g $(SUBTREE_GROUP) -m $(SUBTREE_MODE) $< $@ $(INSTALL) -p -o $(SUBTREE_OWNER) -g $(SUBTREE_GROUP) -m $(SUBTREE_MODE) $< $@

3
make/swig.mk
View file

@ -94,7 +94,7 @@ else ifeq ($(SWIG_TARGET),java)
#SWIG_INSTALLED_EXTRA += $(SWIG_MODULE_TARGET_DIR)/$(SWIG_PY_MODULE_PYC) #SWIG_INSTALLED_EXTRA += $(SWIG_MODULE_TARGET_DIR)/$(SWIG_PY_MODULE_PYC)
INCLUDE += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux INCLUDE += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
#BUILD_LDFLAGS += #BUILD_LDFLAGS +=
INSTALL_LIBDIR = $(SWIG_MODULE_TARGET_DIR) INSTALL_LIBDIR = $(SWIG_MODULE_TARGET_DIR)
@ -178,4 +178,3 @@ clean.generated:
include $(MODDIR)/make/rules.mk include $(MODDIR)/make/rules.mk
include $(MODDIR)/make/depend.mk include $(MODDIR)/make/depend.mk

1
make/test-exe.mk
View file

@ -30,4 +30,3 @@ $(LIB_SO): $(LIB_A)
$(EXE): $(LIB_SO) $(EXE): $(LIB_SO)
endif endif
all.dirs: all.dirs:

7
make/tex.mk
View file

@ -8,7 +8,7 @@ CUSTOMER ?= jannet
PROJECT ?= legal PROJECT ?= legal
TOPIC ?= $(notdir $(shell $(PWD))) TOPIC ?= $(notdir $(shell $(PWD)))
VERSION ?= $(shell sed "s/-dev$$//" VERSION) VERSION ?= $(shell sed "s/-dev$$//" VERSION)
AUTHORS ?= AUTHORS ?=
#TITLE ?= Allgemeine Bedingungen für #TITLE ?= Allgemeine Bedingungen für
#SUBTITLE ?= Dienstgüte-Vereinbarungen #SUBTITLE ?= Dienstgüte-Vereinbarungen
DATE ?= $(shell date +'%Y/%m/%d') DATE ?= $(shell date +'%Y/%m/%d')
@ -314,7 +314,7 @@ dirs.done:
touch dirs.done touch dirs.done
dirs: dirs.done dirs: dirs.done
arch: arch:
test $(shell uname -s) = Linux test $(shell uname -s) = Linux
@ -334,7 +334,7 @@ $(OUT).tex.zip: cfgtest $(LATEX_INPUT)
#$(OUTPUT).dvi: $(LATEX_INPUT) #$(OUTPUT).dvi: $(LATEX_INPUT)
# @echo "-- creating dvi file" # @echo "-- creating dvi file"
# $(latex) $(MAIN).tex; $(latex) $(MAIN).tex; $(latex) $(MAIN).tex; # $(latex) $(MAIN).tex; $(latex) $(MAIN).tex; $(latex) $(MAIN).tex;
# cp $(MAIN).dvi $@ # cp $(MAIN).dvi $@
#$(OUT).dvi.zip: $(OUTPUT).dvi #$(OUT).dvi.zip: $(OUTPUT).dvi
@ -431,4 +431,3 @@ unzip:
UPLOAD_FILES = $(OUTPUT).pdf UPLOAD_FILES = $(OUTPUT).pdf
include $(MODDIR)/make/upload.mk include $(MODDIR)/make/upload.mk

1
make/text.mk
View file

@ -11,4 +11,3 @@ install:
distclean: textclean localclean distclean: textclean localclean
clean: textclean localclean clean: textclean localclean
test: test:

1
make/textest.mk
View file

@ -32,4 +32,3 @@ $(OUT_PNG): $(OUT_PDF)
clean.files: clean.files:
$(RM) -rf *.done *.aux *.log *.pdf *.nav *.out *.snm *.toc .*.swp $(OUT_PNG) *.vrb $(RM) -rf *.done *.aux *.log *.pdf *.nav *.out *.snm *.toc .*.swp $(OUT_PNG) *.vrb

1
make/theme-images.mk
View file

@ -32,4 +32,3 @@ install-images.done: basedir.done generate.done $(INSTALLED_IMG)
blah: blah:
@echo GENERATED_IMAGES = $(GENERATED_IMAGES) @echo GENERATED_IMAGES = $(GENERATED_IMAGES)

1
make/tmpl.mk
View file

@ -20,4 +20,3 @@ all:
install: install_TMPL install: install_TMPL
clean: textclean localclean doneclean clean: textclean localclean doneclean
test: test:

1
make/tools-matlab.mk
View file

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

4
make/topdir.mk
View file

@ -20,7 +20,7 @@ OPT_JANWARE_PROJECT ?= -j
ifeq ($(OPT_JANWARE_PROJECT),-j) ifeq ($(OPT_JANWARE_PROJECT),-j)
REMOTE_GIT_FLAVOUR ?= proj REMOTE_GIT_FLAVOUR ?= proj
else else
OPT_JANWARE_PROJECT = OPT_JANWARE_PROJECT =
REMOTE_GIT_FLAVOUR ?= priv REMOTE_GIT_FLAVOUR ?= priv
endif endif
@ -52,7 +52,7 @@ ifneq ($(SUBDIRS_TO_ITERATE),)
else else
SUBDIR_TARGETS = $(filter $(ALLOWED_SUBDIR_TARGETS),$(MAKECMDGOALS)) SUBDIR_TARGETS = $(filter $(ALLOWED_SUBDIR_TARGETS),$(MAKECMDGOALS))
endif endif
endif endif
include $(MODDIR)/make/rpmdist.mk include $(MODDIR)/make/rpmdist.mk

4
make/upload-defs.mk
View file

@ -8,11 +8,11 @@ UPLOAD_USER ?= $(shell id -nu)
UPLOAD_HOST_LOGIN ?= root UPLOAD_HOST_LOGIN ?= root
UPLOAD_HOST ?= files.janware.com UPLOAD_HOST ?= files.janware.com
UPLOAD_FILES_ROOT ?= /srv/dav/pub/clients/$(JANWARE_CLIENT) UPLOAD_FILES_ROOT ?= /srv/dav/pub/clients/$(JANWARE_CLIENT)
#UPLOAD_TEST_PREFIX ?= #UPLOAD_TEST_PREFIX ?=
UPLOAD_MODULE_PATH ?= $(UPLOAD_TEST_PREFIX)proj/$(UPLOAD_MODULE) UPLOAD_MODULE_PATH ?= $(UPLOAD_TEST_PREFIX)proj/$(UPLOAD_MODULE)
UPLOAD_MODULE_ROOT ?= $(UPLOAD_FILES_ROOT)/$(UPLOAD_MODULE_PATH) UPLOAD_MODULE_ROOT ?= $(UPLOAD_FILES_ROOT)/$(UPLOAD_MODULE_PATH)
UPLOAD_TARGET_PREFIX ?= rsync_ssh://$(UPLOAD_HOST_LOGIN)@$(UPLOAD_HOST):$(UPLOAD_MODULE_ROOT)/ UPLOAD_TARGET_PREFIX ?= rsync_ssh://$(UPLOAD_HOST_LOGIN)@$(UPLOAD_HOST):$(UPLOAD_MODULE_ROOT)/
#UPLOAD_FILES ?= #UPLOAD_FILES ?=
REMOTE_TARGETS ?= \ REMOTE_TARGETS ?= \
$(foreach f,$(notdir $(UPLOAD_FILES)),$(UPLOAD_TARGET_PREFIX)$f:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP)) $(foreach f,$(notdir $(UPLOAD_FILES)),$(UPLOAD_TARGET_PREFIX)$f:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP))
UPLOAD_SRC_DIR ?= . UPLOAD_SRC_DIR ?= .

1
make/upload-rules.mk
View file

@ -15,4 +15,3 @@ clean: upload.clean
upload.clean: upload.clean:
$(RM) -f upload.dist yupdate.*.dist $(RM) -f upload.dist yupdate.*.dist

1
make/upload.mk
View file

@ -29,4 +29,3 @@ clean: upload.clean
upload.clean: upload.clean:
$(RM) -f upload.dist $(RM) -f upload.dist

1
make/winres.rc.tmpl
View file

@ -51,4 +51,3 @@ BEGIN
VALUE "Translation", 0x409, 1252 VALUE "Translation", 0x409, 1252
END END
END END

1
make/wt-defs.mk
View file

@ -19,4 +19,3 @@ ifeq ($(USE_WT),true)
PROJECT_LDFLAGS += -lwt PROJECT_LDFLAGS += -lwt
endif endif

3
make/yapp.mk
View file

@ -4,7 +4,7 @@ YAPP_CLASS ?= $(firstword $(basename $(notdir $(wildcard $(addp
$(YAPP_INCLUDE_DIR)/, YApp*.h App*.h Y*.h *.h))))) $(YAPP_INCLUDE_DIR)/, YApp*.h App*.h Y*.h *.h)))))
YAPP_CLASS_H ?= $(firstword $(wildcard $(addsuffix /$(YAPP_CLASS).h,\ YAPP_CLASS_H ?= $(firstword $(wildcard $(addsuffix /$(YAPP_CLASS).h,\
$(YAPP_INCLUDE_DIR) $(subst -I,,$(INCLUDE)))) $(YAPP_CLASS).h) $(YAPP_INCLUDE_DIR) $(subst -I,,$(INCLUDE)))) $(YAPP_CLASS).h)
YAPP_NAMESPACE ?= YAPP_NAMESPACE ?=
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
LOCAL_LDFLAGS += -rdynamic LOCAL_LDFLAGS += -rdynamic
@ -26,4 +26,3 @@ main.cpp: $(YAPP_CLASS_H)
echo "#include <ytools/YAppRunner.h>" >> $@.tmp echo "#include <ytools/YAppRunner.h>" >> $@.tmp
echo "yapp_main($(YAPP_CLASS))" >> $@.tmp echo "yapp_main($(YAPP_CLASS))" >> $@.tmp
mv $@.tmp $@ mv $@.tmp $@

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

@ -58,5 +58,3 @@ $(WINLIB): $(REQUIRED_H)
cp $(MODDIR)/Makefile $(DISTDIR)/src/$(PROJECT)/mod/ cp $(MODDIR)/Makefile $(DISTDIR)/src/$(PROJECT)/mod/
cd $(DISTDIR)/src; zip -r $(notdir $@) $(PROJECT) cd $(DISTDIR)/src; zip -r $(notdir $@) $(PROJECT)
mv $(DISTDIR)/src/$(notdir $@) $@ mv $(DISTDIR)/src/$(notdir $@) $@

1
scripts/Makefile
View file

@ -5,4 +5,3 @@ include $(TOPDIR)/make/proj.mk
EXE_SH += jannet jcs jw-pkg EXE_SH += jannet jcs jw-pkg
include $(MODDIR)/make/scripts.mk include $(MODDIR)/make/scripts.mk

1
tmpl/doxygen/Makefile
View file

@ -22,4 +22,3 @@ $(LOGO): $(GENERATED_PNG)
clean.local: clean.local:
rm -f $(LOGO) rm -f $(LOGO)

3
tmpl/doxygen/doxygen.conf.tmpl
View file

@ -15,11 +15,10 @@ GRAPHICAL_HIERARCHY = YES
DIRECTORY_GRAPH = YES DIRECTORY_GRAPH = YES
HTML_HEADER = header.html HTML_HEADER = header.html
HTML_FOOTER = footer.html HTML_FOOTER = footer.html
HTML_EXTRA_STYLESHEET = styles.css HTML_EXTRA_STYLESHEET = styles.css
EXCLUDE_SYMLINKS = YES EXCLUDE_SYMLINKS = YES
EXTRACT_STATIC = __EXTRACT_STATIC__ EXTRACT_STATIC = __EXTRACT_STATIC__
INLINE_SOURCES = __INLINE_SOURCES__ INLINE_SOURCES = __INLINE_SOURCES__
SOURCE_BROWSER = __SOURCE_BROWSER__ SOURCE_BROWSER = __SOURCE_BROWSER__

2
tmpl/tagged/cortex-m/ld/30-mem.ld.tmpl
View file

@ -28,7 +28,7 @@
/* /*
* Memory Spaces Definitions. * Memory Spaces Definitions.
* *
* Need modifying for a specific board. * Need modifying for a specific board.
* FLASH.ORIGIN: starting address of flash * FLASH.ORIGIN: starting address of flash
* FLASH.LENGTH: length of flash * FLASH.LENGTH: length of flash
* RAM.ORIGIN: starting address of RAM bank 0 * RAM.ORIGIN: starting address of RAM bank 0

150
tmpl/tagged/cortex-m/ld/50-cortex-m-sections.ld.tmpl
View file

@ -26,9 +26,9 @@
*/ */
/* /*
* Default linker script for Cortex-M (it includes specifics for * Default linker script for Cortex-M (it includes specifics for
* STM32F[34]xx). * STM32F[34]xx).
* *
* To make use of the multi-region initialisations, define * To make use of the multi-region initialisations, define
* OS_INCLUDE_STARTUP_INIT_MULTIPLE_RAM_SECTIONS for the _startup.c file. * OS_INCLUDE_STARTUP_INIT_MULTIPLE_RAM_SECTIONS for the _startup.c file.
*/ */
@ -42,7 +42,7 @@ _estack = __stack; /* STM specific definition */
/* /*
* Default stack sizes. * Default stack sizes.
* These are used by the startup in order to allocate stacks * These are used by the startup in order to allocate stacks
* for the different modes. * for the different modes.
*/ */
@ -52,25 +52,25 @@ PROVIDE ( _Main_Stack_Size = __Main_Stack_Size ) ;
__Main_Stack_Limit = __stack - __Main_Stack_Size ; __Main_Stack_Limit = __stack - __Main_Stack_Size ;
/* "PROVIDE" allows to easily override these values from an /* "PROVIDE" allows to easily override these values from an
* object file or the command line. */ * object file or the command line. */
PROVIDE ( _Main_Stack_Limit = __Main_Stack_Limit ) ; PROVIDE ( _Main_Stack_Limit = __Main_Stack_Limit ) ;
/* /*
* There will be a link error if there is not this amount of * There will be a link error if there is not this amount of
* RAM free at the end. * RAM free at the end.
*/ */
_Minimum_Stack_Size = 256 ; _Minimum_Stack_Size = 256 ;
/* /*
* Default heap definitions. * Default heap definitions.
* The heap start immediately after the last statically allocated * The heap start immediately after the last statically allocated
* .sbss/.noinit section, and extends up to the main stack limit. * .sbss/.noinit section, and extends up to the main stack limit.
*/ */
PROVIDE ( _Heap_Begin = _end_noinit ) ; PROVIDE ( _Heap_Begin = _end_noinit ) ;
PROVIDE ( _Heap_Limit = __stack - __Main_Stack_Size ) ; PROVIDE ( _Heap_Limit = __stack - __Main_Stack_Size ) ;
/* /*
* The entry point is informative, for debuggers and simulators, * The entry point is informative, for debuggers and simulators,
* since the Cortex-M vector points to it anyway. * since the Cortex-M vector points to it anyway.
*/ */
@ -83,19 +83,19 @@ SECTIONS
{ {
/* /*
* For Cortex-M devices, the beginning of the startup code is stored in * For Cortex-M devices, the beginning of the startup code is stored in
* the .isr_vector section, which goes to FLASH. * the .isr_vector section, which goes to FLASH.
*/ */
.isr_vector : ALIGN(4) .isr_vector : ALIGN(4)
{ {
FILL(0xFF) FILL(0xFF)
__vectors_start = ABSOLUTE(.) ; __vectors_start = ABSOLUTE(.) ;
__vectors_start__ = ABSOLUTE(.) ; /* STM specific definition */ __vectors_start__ = ABSOLUTE(.) ; /* STM specific definition */
KEEP(*(.isr_vector)) /* Interrupt vectors */ KEEP(*(.isr_vector)) /* Interrupt vectors */
KEEP(*(.cfmconfig)) /* Freescale configuration words */ KEEP(*(.cfmconfig)) /* Freescale configuration words */
/* /*
* This section is here for convenience, to store the * This section is here for convenience, to store the
* startup code at the beginning of the flash area, hoping that * startup code at the beginning of the flash area, hoping that
* this will increase the readability of the listing. * this will increase the readability of the listing.
@ -106,13 +106,13 @@ SECTIONS
.inits : ALIGN(4) .inits : ALIGN(4)
{ {
/* /*
* Memory regions initialisation arrays. * Memory regions initialisation arrays.
* *
* Thee are two kinds of arrays for each RAM region, one for * Thee are two kinds of arrays for each RAM region, one for
* data and one for bss. Each is iterrated at startup and the * data and one for bss. Each is iterrated at startup and the
* region initialisation is performed. * region initialisation is performed.
* *
* The data array includes: * The data array includes:
* - from (LOADADDR()) * - from (LOADADDR())
* - region_begin (ADDR()) * - region_begin (ADDR())
@ -122,34 +122,34 @@ SECTIONS
* - region_begin (ADDR()) * - region_begin (ADDR())
* - region_end (ADDR()+SIZEOF()) * - region_end (ADDR()+SIZEOF())
* *
* WARNING: It is mandatory that the regions are word aligned, * WARNING: It is mandatory that the regions are word aligned,
* since the initialisation code works only on words. * since the initialisation code works only on words.
*/ */
__data_regions_array_start = .; __data_regions_array_start = .;
LONG(LOADADDR(.data)); LONG(LOADADDR(.data));
LONG(ADDR(.data)); LONG(ADDR(.data));
LONG(ADDR(.data)+SIZEOF(.data)); LONG(ADDR(.data)+SIZEOF(.data));
LONG(LOADADDR(.data_CCMRAM)); LONG(LOADADDR(.data_CCMRAM));
LONG(ADDR(.data_CCMRAM)); LONG(ADDR(.data_CCMRAM));
LONG(ADDR(.data_CCMRAM)+SIZEOF(.data_CCMRAM)); LONG(ADDR(.data_CCMRAM)+SIZEOF(.data_CCMRAM));
__data_regions_array_end = .; __data_regions_array_end = .;
__bss_regions_array_start = .; __bss_regions_array_start = .;
LONG(ADDR(.bss)); LONG(ADDR(.bss));
LONG(ADDR(.bss)+SIZEOF(.bss)); LONG(ADDR(.bss)+SIZEOF(.bss));
LONG(ADDR(.bss_CCMRAM)); LONG(ADDR(.bss_CCMRAM));
LONG(ADDR(.bss_CCMRAM)+SIZEOF(.bss_CCMRAM)); LONG(ADDR(.bss_CCMRAM)+SIZEOF(.bss_CCMRAM));
__bss_regions_array_end = .; __bss_regions_array_end = .;
/* End of memory regions initialisation arrays. */ /* End of memory regions initialisation arrays. */
/* /*
* These are the old initialisation sections, intended to contain * These are the old initialisation sections, intended to contain
* naked code, with the prologue/epilogue added by crti.o/crtn.o * naked code, with the prologue/epilogue added by crti.o/crtn.o
@ -162,23 +162,23 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
/* /*
* The preinit code, i.e. an array of pointers to initialisation * The preinit code, i.e. an array of pointers to initialisation
* functions to be performed before constructors. * functions to be performed before constructors.
*/ */
PROVIDE_HIDDEN (__preinit_array_start = .); PROVIDE_HIDDEN (__preinit_array_start = .);
/* /*
* Used to run the SystemInit() before anything else. * Used to run the SystemInit() before anything else.
*/ */
KEEP(*(.preinit_array_sysinit .preinit_array_sysinit.*)) KEEP(*(.preinit_array_sysinit .preinit_array_sysinit.*))
/* /*
* Used for other platform inits. * Used for other platform inits.
*/ */
KEEP(*(.preinit_array_platform .preinit_array_platform.*)) KEEP(*(.preinit_array_platform .preinit_array_platform.*))
/* /*
* The application inits. If you need to enforce some order in * The application inits. If you need to enforce some order in
* execution, create new sections, as before. * execution, create new sections, as before.
*/ */
KEEP(*(.preinit_array .preinit_array.*)) KEEP(*(.preinit_array .preinit_array.*))
@ -215,27 +215,27 @@ SECTIONS
{ {
*(.flashtext .flashtext.*) /* Startup code */ *(.flashtext .flashtext.*) /* Startup code */
} >FLASH } >FLASH
/* /*
* The program code is stored in the .text section, * The program code is stored in the .text section,
* which goes to FLASH. * which goes to FLASH.
*/ */
.text : ALIGN(4) .text : ALIGN(4)
{ {
*(.text .text.*) /* all remaining code */ *(.text .text.*) /* all remaining code */
/* read-only data (constants) */ /* read-only data (constants) */
*(.rodata .rodata.* .constdata .constdata.*) *(.rodata .rodata.* .constdata .constdata.*)
*(vtable) /* C++ virtual tables */ *(vtable) /* C++ virtual tables */
KEEP(*(.eh_frame*)) KEEP(*(.eh_frame*))
/* /*
* Stub sections generated by the linker, to glue together * Stub sections generated by the linker, to glue together
* ARM and Thumb code. .glue_7 is used for ARM code calling * ARM and Thumb code. .glue_7 is used for ARM code calling
* Thumb code, and .glue_7t is used for Thumb code calling * Thumb code, and .glue_7t is used for Thumb code calling
* ARM code. Apparently always generated by the linker, for some * ARM code. Apparently always generated by the linker, for some
* architectures, so better leave them here. * architectures, so better leave them here.
*/ */
@ -249,24 +249,24 @@ SECTIONS
{ {
*(.ARM.extab* .gnu.linkonce.armextab.*) *(.ARM.extab* .gnu.linkonce.armextab.*)
} > FLASH } > FLASH
. = ALIGN(4); . = ALIGN(4);
__exidx_start = .; __exidx_start = .;
.ARM.exidx : ALIGN(4) .ARM.exidx : ALIGN(4)
{ {
*(.ARM.exidx* .gnu.linkonce.armexidx.*) *(.ARM.exidx* .gnu.linkonce.armexidx.*)
} > FLASH } > FLASH
__exidx_end = .; __exidx_end = .;
. = ALIGN(4); . = ALIGN(4);
_etext = .; _etext = .;
__etext = .; __etext = .;
/* MEMORY_ARRAY */ /* MEMORY_ARRAY */
/* /*
.ROarraySection : .ROarraySection :
{ {
*(.ROarraySection .ROarraySection.*) *(.ROarraySection .ROarraySection.*)
} >MEMORY_ARRAY } >MEMORY_ARRAY
*/ */
@ -280,8 +280,8 @@ SECTIONS
. = ALIGN(4) ; . = ALIGN(4) ;
} > CCMRAM AT>FLASH } > CCMRAM AT>FLASH
/* /*
* This address is used by the startup code to * This address is used by the startup code to
* initialise the .data section. * initialise the .data section.
*/ */
_sidata = LOADADDR(.data); _sidata = LOADADDR(.data);
@ -291,7 +291,7 @@ SECTIONS
* *
* The program executes knowing that the data is in the RAM * The program executes knowing that the data is in the RAM
* but the loader puts the initial values in the FLASH (inidata). * but the loader puts the initial values in the FLASH (inidata).
* It is one task of the startup to copy the initial values from * It is one task of the startup to copy the initial values from
* FLASH to RAM. * FLASH to RAM.
*/ */
.data : ALIGN(4) .data : ALIGN(4)
@ -303,7 +303,7 @@ SECTIONS
*(.data_begin .data_begin.*) *(.data_begin .data_begin.*)
*(.data .data.*) *(.data .data.*)
*(.data_end .data_end.*) *(.data_end .data_end.*)
. = ALIGN(4); . = ALIGN(4);
@ -312,12 +312,12 @@ SECTIONS
__data_end__ = . ; __data_end__ = . ;
} >RAM AT>FLASH } >RAM AT>FLASH
/* /*
* The uninitialised data sections. NOLOAD is used to avoid * The uninitialised data sections. NOLOAD is used to avoid
* the "section `.bss' type changed to PROGBITS" warning * the "section `.bss' type changed to PROGBITS" warning
*/ */
/* The secondary uninitialised data section. */ /* The secondary uninitialised data section. */
.bss_CCMRAM (NOLOAD) : ALIGN(4) .bss_CCMRAM (NOLOAD) : ALIGN(4)
{ {
@ -333,7 +333,7 @@ SECTIONS
*(.bss .bss.*) *(.bss .bss.*)
*(COMMON) *(COMMON)
*(.bss_end .bss_end.*) *(.bss_end .bss_end.*)
. = ALIGN(4); . = ALIGN(4);
__bss_end__ = .; /* standard newlib definition */ __bss_end__ = .; /* standard newlib definition */
@ -342,25 +342,25 @@ SECTIONS
.noinit_CCMRAM (NOLOAD) : ALIGN(4) .noinit_CCMRAM (NOLOAD) : ALIGN(4)
{ {
*(.noinit.CCMRAM .noinit.CCMRAM.*) *(.noinit.CCMRAM .noinit.CCMRAM.*)
} > CCMRAM } > CCMRAM
.noinit (NOLOAD) : ALIGN(4) .noinit (NOLOAD) : ALIGN(4)
{ {
_noinit = .; _noinit = .;
*(.noinit .noinit.*) *(.noinit .noinit.*)
. = ALIGN(4) ; . = ALIGN(4) ;
_end_noinit = .; _end_noinit = .;
} > RAM } > RAM
/* Mandatory to be word aligned, _sbrk assumes this */ /* Mandatory to be word aligned, _sbrk assumes this */
PROVIDE ( end = _end_noinit ); /* was _ebss */ PROVIDE ( end = _end_noinit ); /* was _ebss */
PROVIDE ( _end = _end_noinit ); PROVIDE ( _end = _end_noinit );
PROVIDE ( __end = _end_noinit ); PROVIDE ( __end = _end_noinit );
PROVIDE ( __end__ = _end_noinit ); PROVIDE ( __end__ = _end_noinit );
/* /*
* Used for validation only, do not allocate anything here! * Used for validation only, do not allocate anything here!
* *
@ -371,10 +371,10 @@ SECTIONS
{ {
. = . + _Minimum_Stack_Size ; . = . + _Minimum_Stack_Size ;
} >RAM } >RAM
/* /*
* The FLASH Bank1. * The FLASH Bank1.
* The C or assembly source must explicitly place the code * The C or assembly source must explicitly place the code
* or data there using the "section" attribute. * or data there using the "section" attribute.
*/ */
.b1text : ALIGN(4) .b1text : ALIGN(4)
@ -383,7 +383,7 @@ SECTIONS
*(.b1rodata) /* read-only data (constants) */ *(.b1rodata) /* read-only data (constants) */
*(.b1rodata.*) *(.b1rodata.*)
} >FLASHB1 } >FLASHB1
/* /*
* The EXTMEM. * The EXTMEM.
* The C or assembly source must explicitly place the code or data there * The C or assembly source must explicitly place the code or data there
@ -397,7 +397,7 @@ SECTIONS
*(.eb0rodata) /* read-only data (constants) */ *(.eb0rodata) /* read-only data (constants) */
*(.eb0rodata.*) *(.eb0rodata.*)
} >EXTMEMB0 } >EXTMEMB0
/* EXTMEM Bank1 */ /* EXTMEM Bank1 */
.eb1text : ALIGN(4) .eb1text : ALIGN(4)
{ {
@ -405,7 +405,7 @@ SECTIONS
*(.eb1rodata) /* read-only data (constants) */ *(.eb1rodata) /* read-only data (constants) */
*(.eb1rodata.*) *(.eb1rodata.*)
} >EXTMEMB1 } >EXTMEMB1
/* EXTMEM Bank2 */ /* EXTMEM Bank2 */
.eb2text : ALIGN(4) .eb2text : ALIGN(4)
{ {
@ -413,7 +413,7 @@ SECTIONS
*(.eb2rodata) /* read-only data (constants) */ *(.eb2rodata) /* read-only data (constants) */
*(.eb2rodata.*) *(.eb2rodata.*)
} >EXTMEMB2 } >EXTMEMB2
/* EXTMEM Bank0 */ /* EXTMEM Bank0 */
.eb3text : ALIGN(4) .eb3text : ALIGN(4)
{ {
@ -421,12 +421,12 @@ SECTIONS
*(.eb3rodata) /* read-only data (constants) */ *(.eb3rodata) /* read-only data (constants) */
*(.eb3rodata.*) *(.eb3rodata.*)
} >EXTMEMB3 } >EXTMEMB3
/* After that there are only debugging sections. */ /* After that there are only debugging sections. */
/* This can remove the debugging information from the standard libraries */ /* This can remove the debugging information from the standard libraries */
/* /*
DISCARD : DISCARD :
{ {
libc.a ( * ) libc.a ( * )
@ -434,7 +434,7 @@ SECTIONS
libgcc.a ( * ) libgcc.a ( * )
} }
*/ */
/* Stabs debugging sections. */ /* Stabs debugging sections. */
.stab 0 : { *(.stab) } .stab 0 : { *(.stab) }
.stabstr 0 : { *(.stabstr) } .stabstr 0 : { *(.stabstr) }
@ -446,7 +446,7 @@ SECTIONS
/* /*
* DWARF debug sections. * DWARF debug sections.
* Symbols in the DWARF debugging sections are relative to the beginning * Symbols in the DWARF debugging sections are relative to the beginning
* of the section so we begin them at 0. * of the section so we begin them at 0.
*/ */
/* DWARF 1 */ /* DWARF 1 */
.debug 0 : { *(.debug) } .debug 0 : { *(.debug) }
@ -469,5 +469,5 @@ SECTIONS
.debug_weaknames 0 : { *(.debug_weaknames) } .debug_weaknames 0 : { *(.debug_weaknames) }
.debug_funcnames 0 : { *(.debug_funcnames) } .debug_funcnames 0 : { *(.debug_funcnames) }
.debug_typenames 0 : { *(.debug_typenames) } .debug_typenames 0 : { *(.debug_typenames) }
.debug_varnames 0 : { *(.debug_varnames) } .debug_varnames 0 : { *(.debug_varnames) }
} }

16
tmpl/tex/de_contract/frontpage.tex.tmpl
View file

@ -43,27 +43,27 @@
\fbox{ \fbox{
\parbox[t]{15cm} \parbox[t]{15cm}
{ {
\vspace{0.3cm} \vspace{0.3cm}
\centerline{\Huge \bf __TITLE__} \centerline{\Huge \bf __TITLE__}
\vspace{0.3cm} \vspace{0.3cm}
\centerline{\Huge \bf __SUBTITLE__} \centerline{\Huge \bf __SUBTITLE__}
\vspace{0.3cm} \vspace{0.3cm}
}} }}
\vspace{3cm} \vspace{3cm}
\centerline{\Large __DATE__} \centerline{\Large __DATE__}
\vspace{0.3cm} \vspace{0.3cm}
\centerline{\Large Dokumentversion: __VERSION__} \centerline{\Large Dokumentversion: __VERSION__}
\vspace{0.3cm} \vspace{0.3cm}
\end{center} \end{center}
@ -76,5 +76,3 @@
%\end{minipage} %\end{minipage}
%\end{flushright} %\end{flushright}
%\end{figure} %\end{figure}

8
tmpl/tex/de_contract/header.tex.tmpl
View file

@ -180,7 +180,7 @@
% \DeclareMathSymbol{\C}{\mathalpha}{\AMSb}{``43} % \DeclareMathSymbol{\C}{\mathalpha}{\AMSb}{``43}
% \DeclareMathSymbol{\R}{\mathalpha}{\AMSb}{``52} % \DeclareMathSymbol{\R}{\mathalpha}{\AMSb}{``52}
\newcolumntype{v}[1]{% \newcolumntype{v}[1]{%
>{\raggedright\hspace{0pt}\arraybackslash}p{#1}% >{\raggedright\hspace{0pt}\arraybackslash}p{#1}%
@ -217,7 +217,7 @@
\fancyhead[C]{__TITLE__ __SUBTITLE__} \fancyhead[C]{__TITLE__ __SUBTITLE__}
%Linie oben %Linie oben
%\renewcommand{\headrulewidth}{0.5pt} %\renewcommand{\headrulewidth}{0.5pt}
%Fußzeile links bzw. innen %Fußzeile links bzw. innen
\fancyfoot[L]{Dok.-Vers.: __VERSION__ vom __DATE__} \fancyfoot[L]{Dok.-Vers.: __VERSION__ vom __DATE__}
%\fancyfoot[L]{__TITLE__ __SUBTITLE__ __VERSION__} %\fancyfoot[L]{__TITLE__ __SUBTITLE__ __VERSION__}
@ -226,7 +226,7 @@
\fancyfoot[R]{Seite \thepage \hspace{2pt} von \ztotpages} \fancyfoot[R]{Seite \thepage \hspace{2pt} von \ztotpages}
%Linie unten %Linie unten
\renewcommand{\footrulewidth}{0.5pt} \renewcommand{\footrulewidth}{0.5pt}
% Fußzeile auf jeder Seite - auch Kapitel und Inhaltsverzeichnis % Fußzeile auf jeder Seite - auch Kapitel und Inhaltsverzeichnis
\fancypagestyle{plain}{% \fancypagestyle{plain}{%
\fancyhf{}% \fancyhf{}%
@ -235,5 +235,3 @@
\renewcommand{\headrulewidth}{0.0pt} %obere Linie ausblenden \renewcommand{\headrulewidth}{0.0pt} %obere Linie ausblenden
\fancyfoot[R]{\thepage} \fancyfoot[R]{\thepage}
} }

2
tmpl/tex/de_contract/index_head.html.tmpl
View file

@ -44,7 +44,7 @@
<h2>Achtung!</h2> <h2>Achtung!</h2>
Diese Website wurde automatisch mit Hilfe des Skripts Diese Website wurde automatisch mit Hilfe des Skripts
<a <a
href="http://cbl.leeds.ac.uk/nikos/tex2html/doc/latex2html/latex2html.html">latex2html</a> erstellt. href="http://cbl.leeds.ac.uk/nikos/tex2html/doc/latex2html/latex2html.html">latex2html</a> erstellt.
Obwohl es ein sehr n&uuml;tzliches Programm ist, ist bei seiner Anwendung ein Teil des urspr&uuml;ichen Dokuments verloren gegangen. Obwohl es ein sehr n&uuml;tzliches Programm ist, ist bei seiner Anwendung ein Teil des urspr&uuml;ichen Dokuments verloren gegangen.

16
tmpl/tex/de_presentation/frontpage.tex.tmpl
View file

@ -43,27 +43,27 @@
\fbox{ \fbox{
\parbox[t]{15cm} \parbox[t]{15cm}
{ {
\vspace{0.3cm} \vspace{0.3cm}
\centerline{\Huge \bf __TITLE__} \centerline{\Huge \bf __TITLE__}
\vspace{0.3cm} \vspace{0.3cm}
\centerline{\Huge \bf __SUBTITLE__} \centerline{\Huge \bf __SUBTITLE__}
\vspace{0.3cm} \vspace{0.3cm}
}} }}
\vspace{3cm} \vspace{3cm}
\centerline{\Large __DATE__} \centerline{\Large __DATE__}
\vspace{0.3cm} \vspace{0.3cm}
\centerline{\Large Dokumentversion: __VERSION__} \centerline{\Large Dokumentversion: __VERSION__}
\vspace{0.3cm} \vspace{0.3cm}
\end{center} \end{center}
@ -76,5 +76,3 @@
%\end{minipage} %\end{minipage}
%\end{flushright} %\end{flushright}
%\end{figure} %\end{figure}

1
tmpl/tex/de_presentation/header.tex.tmpl
View file

@ -20,4 +20,3 @@
\title{__TITLE__ -- __SUBTITLE__} \title{__TITLE__ -- __SUBTITLE__}
\author[__AUTHORS__]{__AUTHORS__\\\href{mailto:__CONTACT_EMAIL__}{\code{__CONTACT_EMAIL__}}} \author[__AUTHORS__]{__AUTHORS__\\\href{mailto:__CONTACT_EMAIL__}{\code{__CONTACT_EMAIL__}}}
\date{__DATE__} \date{__DATE__}

2
tmpl/tex/de_presentation/index_head.html.tmpl
View file

@ -44,7 +44,7 @@
<h2>Achtung!</h2> <h2>Achtung!</h2>
Diese Website wurde automatisch mit Hilfe des Skripts Diese Website wurde automatisch mit Hilfe des Skripts
<a <a
href="http://cbl.leeds.ac.uk/nikos/tex2html/doc/latex2html/latex2html.html">latex2html</a> erstellt. href="http://cbl.leeds.ac.uk/nikos/tex2html/doc/latex2html/latex2html.html">latex2html</a> erstellt.
Obwohl es ein sehr n&uuml;tzliches Programm ist, ist bei seiner Anwendung ein Teil des urspr&uuml;ichen Dokuments verloren gegangen. Obwohl es ein sehr n&uuml;tzliches Programm ist, ist bei seiner Anwendung ein Teil des urspr&uuml;ichen Dokuments verloren gegangen.

16
tmpl/tex/de_technical/frontpage.ger.tmpl
View file

@ -45,27 +45,27 @@ DELETE
\fbox{ \fbox{
\parbox[t]{15.0cm} \parbox[t]{15.0cm}
{ {
\vspace{0.3cm} \vspace{0.3cm}
\centerline{\Huge \bf __TITLE__} \centerline{\Huge \bf __TITLE__}
\vspace{0.3cm} \vspace{0.3cm}
\centerline{\Huge \bf __SUBTITLE__} \centerline{\Huge \bf __SUBTITLE__}
\vspace{0.3cm} \vspace{0.3cm}
}} }}
\vspace{3cm} \vspace{3cm}
\centerline{\Large __DATE__} \centerline{\Large __DATE__}
\vspace{0.3cm} \vspace{0.3cm}
\centerline{\Large Dokumentversion: __VERSION__} \centerline{\Large Dokumentversion: __VERSION__}
\vspace{0.3cm} \vspace{0.3cm}
\end{center} \end{center}
@ -78,5 +78,3 @@ DELETE
\end{minipage} \end{minipage}
\end{flushright} \end{flushright}
\end{figure} \end{figure}

16
tmpl/tex/de_technical/frontpage.tex.tmpl
View file

@ -51,27 +51,27 @@
\fbox{ \fbox{
\parbox[t]{15cm} \parbox[t]{15cm}
{ {
\vspace{0.3cm} \vspace{0.3cm}
\centerline{\Huge \bf __TITLE__} \centerline{\Huge \bf __TITLE__}
\vspace{0.3cm} \vspace{0.3cm}
\centerline{\Huge \bf __SUBTITLE__} \centerline{\Huge \bf __SUBTITLE__}
\vspace{0.3cm} \vspace{0.3cm}
}} }}
\vspace{3cm} \vspace{3cm}
\centerline{\Large __DATE__} \centerline{\Large __DATE__}
\vspace{0.3cm} \vspace{0.3cm}
\centerline{\Large Dokumentversion: __VERSION__} \centerline{\Large Dokumentversion: __VERSION__}
\vspace{0.3cm} \vspace{0.3cm}
\end{center} \end{center}
@ -84,5 +84,3 @@
\end{minipage} \end{minipage}
\end{flushright} \end{flushright}
\end{figure} \end{figure}

8
tmpl/tex/de_technical/header.ger.tmpl
View file

@ -118,7 +118,7 @@ DELETE
% \DeclareMathSymbol{\C}{\mathalpha}{\AMSb}{``43} % \DeclareMathSymbol{\C}{\mathalpha}{\AMSb}{``43}
% \DeclareMathSymbol{\R}{\mathalpha}{\AMSb}{``52} % \DeclareMathSymbol{\R}{\mathalpha}{\AMSb}{``52}
\renewcommand\floatpagefraction{.9} \renewcommand\floatpagefraction{.9}
\renewcommand\topfraction{.9} \renewcommand\topfraction{.9}
@ -126,7 +126,7 @@ DELETE
\renewcommand\textfraction{.1} \renewcommand\textfraction{.1}
\newenvironment{prog}{\begin{quote}}{\end{quote} } \newenvironment{prog}{\begin{quote}}{\end{quote} }
linkcolor=blue, linkcolor=blue,
linkcolor=blue, linkcolor=blue,
citecolor=blue, urlcolor=blue citecolor=blue, urlcolor=blue

8
tmpl/tex/de_technical/header.tex.tmpl
View file

@ -180,7 +180,7 @@
% \DeclareMathSymbol{\C}{\mathalpha}{\AMSb}{``43} % \DeclareMathSymbol{\C}{\mathalpha}{\AMSb}{``43}
% \DeclareMathSymbol{\R}{\mathalpha}{\AMSb}{``52} % \DeclareMathSymbol{\R}{\mathalpha}{\AMSb}{``52}
\newcolumntype{v}[1]{% \newcolumntype{v}[1]{%
>{\raggedright\hspace{0pt}\arraybackslash}p{#1}% >{\raggedright\hspace{0pt}\arraybackslash}p{#1}%
@ -217,7 +217,7 @@
\fancyhead[C]{__TITLE__ __SUBTITLE__} \fancyhead[C]{__TITLE__ __SUBTITLE__}
%Linie oben %Linie oben
%\renewcommand{\headrulewidth}{0.5pt} %\renewcommand{\headrulewidth}{0.5pt}
%Fußzeile links bzw. innen %Fußzeile links bzw. innen
\fancyfoot[L]{Dok.-Vers.: __VERSION__ vom __DATE__} \fancyfoot[L]{Dok.-Vers.: __VERSION__ vom __DATE__}
%\fancyfoot[L]{__TITLE__ __SUBTITLE__ __VERSION__} %\fancyfoot[L]{__TITLE__ __SUBTITLE__ __VERSION__}
@ -226,7 +226,7 @@
\fancyfoot[R]{Seite \thepage \hspace{2pt} von \ztotpages} \fancyfoot[R]{Seite \thepage \hspace{2pt} von \ztotpages}
%Linie unten %Linie unten
\renewcommand{\footrulewidth}{0.5pt} \renewcommand{\footrulewidth}{0.5pt}
% Fußzeile auf jeder Seite - auch Kapitel und Inhaltsverzeichnis % Fußzeile auf jeder Seite - auch Kapitel und Inhaltsverzeichnis
\fancypagestyle{plain}{% \fancypagestyle{plain}{%
\fancyhf{}% \fancyhf{}%
@ -235,5 +235,3 @@
\renewcommand{\headrulewidth}{0.0pt} %obere Linie ausblenden \renewcommand{\headrulewidth}{0.0pt} %obere Linie ausblenden
\fancyfoot[R]{\thepage} \fancyfoot[R]{\thepage}
} }

2
tmpl/tex/de_technical/index_head.html.tmpl
View file

@ -44,7 +44,7 @@
<h2>Achtung!</h2> <h2>Achtung!</h2>
Diese Website wurde automatisch mit Hilfe des Skripts Diese Website wurde automatisch mit Hilfe des Skripts
<a <a
href="http://cbl.leeds.ac.uk/nikos/tex2html/doc/latex2html/latex2html.html">latex2html</a> erstellt. href="http://cbl.leeds.ac.uk/nikos/tex2html/doc/latex2html/latex2html.html">latex2html</a> erstellt.
Obwohl es ein sehr n&uuml;tzliches Programm ist, ist bei seiner Anwendung ein Teil des urspr&uuml;ichen Dokuments verloren gegangen. Obwohl es ein sehr n&uuml;tzliches Programm ist, ist bei seiner Anwendung ein Teil des urspr&uuml;ichen Dokuments verloren gegangen.

16
tmpl/tex/en_technical/frontpage.ger.tmpl
View file

@ -43,27 +43,27 @@
\fbox{ \fbox{
\parbox[t]{15cm} \parbox[t]{15cm}
{ {
\vspace{0.3cm} \vspace{0.3cm}
\centerline{\Huge \bf __TITLE__} \centerline{\Huge \bf __TITLE__}
\vspace{0.3cm} \vspace{0.3cm}
\centerline{\Huge \bf __SUBTITLE__} \centerline{\Huge \bf __SUBTITLE__}
\vspace{0.3cm} \vspace{0.3cm}
}} }}
\vspace{3cm} \vspace{3cm}
\centerline{\Large __DATE__} \centerline{\Large __DATE__}
\vspace{0.3cm} \vspace{0.3cm}
\centerline{\Large Document Version: __VERSION__} \centerline{\Large Document Version: __VERSION__}
\vspace{0.3cm} \vspace{0.3cm}
\end{center} \end{center}
@ -76,5 +76,3 @@
\end{minipage} \end{minipage}
\end{flushright} \end{flushright}
\end{figure} \end{figure}

18
tmpl/tex/en_technical/frontpage.tex.tmpl
View file

@ -43,31 +43,31 @@
\fbox{ \fbox{
\parbox[t]{15cm} \parbox[t]{15cm}
{ {
\vspace{0.3cm} \vspace{0.3cm}
\centerline{\Huge \bf __TITLE__} \centerline{\Huge \bf __TITLE__}
\vspace{0.3cm} \vspace{0.3cm}
\centerline{\Huge \bf __SUBTITLE__} \centerline{\Huge \bf __SUBTITLE__}
\vspace{0.3cm} \vspace{0.3cm}
}} }}
\vspace{3cm} \vspace{3cm}
\centerline{\Huge \bf __CONFIDENTIAL_REMARK__} \centerline{\Huge \bf __CONFIDENTIAL_REMARK__}
\vspace{3cm} \vspace{3cm}
\centerline{\Large __DATE__} \centerline{\Large __DATE__}
\vspace{0.3cm} \vspace{0.3cm}
\centerline{\Large Document Version: __VERSION__} \centerline{\Large Document Version: __VERSION__}
\vspace{0.3cm} \vspace{0.3cm}
\end{center} \end{center}

3
tmpl/tex/en_technical/header.ger.tmpl
View file

@ -117,7 +117,7 @@
% \DeclareMathSymbol{\C}{\mathalpha}{\AMSb}{``43} % \DeclareMathSymbol{\C}{\mathalpha}{\AMSb}{``43}
% \DeclareMathSymbol{\R}{\mathalpha}{\AMSb}{``52} % \DeclareMathSymbol{\R}{\mathalpha}{\AMSb}{``52}
\renewcommand\floatpagefraction{.9} \renewcommand\floatpagefraction{.9}
\renewcommand\topfraction{.9} \renewcommand\topfraction{.9}
@ -125,4 +125,3 @@
\renewcommand\textfraction{.1} \renewcommand\textfraction{.1}
\newenvironment{prog}{\begin{quote}}{\end{quote} } \newenvironment{prog}{\begin{quote}}{\end{quote} }

3
tmpl/tex/en_technical/header.tex.tmpl
View file

@ -127,7 +127,7 @@
% \DeclareMathSymbol{\C}{\mathalpha}{\AMSb}{``43} % \DeclareMathSymbol{\C}{\mathalpha}{\AMSb}{``43}
% \DeclareMathSymbol{\R}{\mathalpha}{\AMSb}{``52} % \DeclareMathSymbol{\R}{\mathalpha}{\AMSb}{``52}
\newcolumntype{v}[1]{% \newcolumntype{v}[1]{%
>{\raggedright\hspace{0pt}\arraybackslash}p{#1}% >{\raggedright\hspace{0pt}\arraybackslash}p{#1}%
@ -139,4 +139,3 @@
\renewcommand\textfraction{.1} \renewcommand\textfraction{.1}
\newenvironment{prog}{\begin{quote}}{\end{quote} } \newenvironment{prog}{\begin{quote}}{\end{quote} }