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

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
68 changed files with 211 additions and 293 deletions
Download patch file Download diff file Expand all files Collapse all files

1
make/Makefile
View file

@ -34,4 +34,3 @@ grep-vars:
$(INSTALL_MAKEDIR)/%.tmpl: %.tmpl $(TOPDIR)/dir_install_MAKE.done
$(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_INSTALL = $(SUBDIRS)
else
SUBDIRS_ALL ?=
SUBDIRS_INSTALL ?=
SUBDIRS_ALL ?=
SUBDIRS_INSTALL ?=
endif
do.all:
@ -26,4 +26,3 @@ do.install:
do.%:
set -e; for d in $(SUBDIRS); do make -wC $$d $*; done
$(RM) -rf $(TEXTCLEAN) $(CLEAN) *.done *~ .*.swp *.tmp core *.rep dirs-*.done

1
make/contrib.mk
View file

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

1
make/cpp.mk
View file

@ -1,2 +1 @@
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_EXCLUDE ?= $(shell bash $(MOD_SCRIPT_DIR)/scm.sh ls-files)
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_MODE ?= 664
DAV_RSYNC_DIRMODE ?= 775
@ -42,4 +42,3 @@ dload.done:
dav.clean:
$(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` .
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

14
make/defs-cpp.mk
View file

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

5
make/defs-dev.mk
View file

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

4
make/defs-dist.mk
View file

@ -1,6 +1,6 @@
# jw-build library
# (c) 2001 jannet it services
# contact@jannet.de
# contact@jannet.de
# $Id$
# -- files
@ -28,7 +28,7 @@ RSYSLOG_DIR ?= $(ENV_PREFIX)/etc/rsyslog.d
IMG_PREFIX ?= $(PREFIX)
LOG_PREFIX ?= $(ENV_PREFIX)/var/log
JAVA_PREFIX ?= $(PREFIX)
HDR_SCOPE_PREFIX ?=
HDR_SCOPE_PREFIX ?=
IMAGEDIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/images
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)
endif
ifndef AR
AR = $(shell $(WHICH) ar)
AR := $(shell $(WHICH) ar)
endif
#ifndef PWD
PWD := $(shell $(WHICH) pwd)
@ -391,14 +391,14 @@ INSTALLED_MAKE += $(addprefix $(INSTALL_MAKEDIR)/,$(MKFILES))
# -- IMG
INSTALLATION_FILE_TYPES += IMG
BUILD_IMG ?=
BUILD_IMG ?=
BUILD_IMGDIR ?= $(TOPDIR)/images
INSTALL_IMGDIR ?= $(IMG_PREFIX)/images
INSTALLED_IMG ?= $(addprefix $(INSTALL_IMGDIR)/,$(IMAGES))
# -- MO
INSTALLATION_FILE_TYPES += MO
BUILD_MO ?=
BUILD_MO ?=
BUILD_MODIR ?= $(CWD)
INSTALL_MODIR ?= $(ENV_PREFIX)/usr/share/locale/$(GETTEXT_LOCALE)/LC_MESSAGES
INSTALLED_MO ?= $(addprefix $(INSTALL_MODIR)/,$(wildcard *.mo))
@ -406,9 +406,9 @@ INSTALLED_MO ?= $(addprefix $(INSTALL_MODIR)/,$(wildcard *.mo))
# -- LOG
INSTALLATION_FILE_TYPES += LOG
BUILD_LOGDIR ?= $(TOPDIR)/log
BUILD_LOG ?=
BUILD_LOG ?=
INSTALL_LOGDIR ?= $(LOG_PREFIX)/$(PROJECT)
INSTALLED_LOG ?=
INSTALLED_LOG ?=
# -- PROFILE
INSTALLATION_FILE_TYPES += PROFILE

1
make/disabled.mk
View file

@ -5,4 +5,3 @@ all:
install clean distclean:
$(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 "\
cd $$DIR; find . -type d | xargs -r chmod $(TARGET_DIR_MODE); find . -type f | xargs -r chmod $(TARGET_FILE_MODE)" ;\
done

2
make/doc-rules.mk
View file

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

1
make/doc.mk
View file

@ -6,4 +6,3 @@
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/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_INPUT_DIRS ?= $(TOPDIR)/include
DX_SRC_IS_JAVA ?= NO
DX_EXCLUDE_FILES ?=
DX_INCLUDE_PATH ?=
DX_EXCLUDE_FILES ?=
DX_INCLUDE_PATH ?=
DX_RECURSIVE ?= YES
DX_EXTRACT_STATIC ?= NO
DX_INLINE_SOURCES ?= NO
@ -51,7 +51,7 @@ doxygen.done: $(DX_UNTEMPLATED) $(DX_INCLUDE)
umask 022; doxygen $(DX_DOXYGEN_CONF)
touch $@
cpfiles.done: doxygen.done $(DX_DOC_FILES)
cpfiles.done: doxygen.done $(DX_DOC_FILES)
umask 022; cp $(DX_DOC_FILES) $(DX_OUTPUT_DIR)
touch $@
@ -70,7 +70,7 @@ clean.doxygen:
inst-dir.done:
$(INSTALL) -d -o $(DOCDIROWNER) -g $(DOCDIRGROUP) -m $(DOCDIRMODE) $(DX_INSTALL_DIR)
touch $@
install.done: doxygen.done inst-dir.done
make install.doxygen
touch $@
@ -128,4 +128,3 @@ doxygen.conf.tmpl: | $(DX_FALLBACK_CONF_TMPL)
mv $@.tmp $@
endif

1
make/exe.mk
View file

@ -19,4 +19,3 @@ $(LIB_SO): $(LIB_A)
$(EXE): $(LIB_SO)
endif
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 submodule init
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 ;\
done
touch $@

1
make/isolinux.mk
View file

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

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