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

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