mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-18 13:03:58 +01:00
Everywhere: Purge spaces in text files
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
f424f2cb5f
commit
aa85417a17
96 changed files with 211 additions and 293 deletions
|
|
@ -34,4 +34,3 @@ grep-vars:
|
|||
|
||||
$(INSTALL_MAKEDIR)/%.tmpl: %.tmpl $(TOPDIR)/dir_install_MAKE.done
|
||||
$(INSTALL) -o $(MAKEOWNER) -g $(MAKEGROUP) -m $(MAKEMODE) $< $@A
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -45,4 +45,3 @@ distclean:
|
|||
|
||||
unpack: unpack.done
|
||||
apply-patches: apply-patches.done
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
include $(MODDIR)/make/tools.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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
10
make/defs.mk
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ all:
|
|||
|
||||
install clean distclean:
|
||||
$(call DISABLED,$@)
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -10,5 +10,3 @@ distclean:
|
|||
|
||||
doc.clean:
|
||||
$(RM) -rf *~ .*.swp
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -6,4 +6,3 @@
|
|||
include $(MODDIR)/make/defs.mk
|
||||
include $(MODDIR)/make/rules.mk
|
||||
include $(MODDIR)/make/doc-rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -19,4 +19,3 @@ $(LIB_SO): $(LIB_A)
|
|||
$(EXE): $(LIB_SO)
|
||||
endif
|
||||
all.dirs:
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -52,4 +52,3 @@ install-old.done:
|
|||
fi ;\
|
||||
done
|
||||
touch $@
|
||||
|
||||
|
|
|
|||
|
|
@ -60,4 +60,3 @@ BOOT_CONF = boot.conf
|
|||
|
||||
$(ISO_IMAGE): $(BOOT_CONF) dirs.done $(CD_FILES)
|
||||
$(GENERATE) -o $@ -d $(BUILD_DIR) -f $< $(CD_FILES)
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ JAVA ?= /usr/bin/java
|
|||
JS_MINIFY_FILTER_IN ?= sed 's/console\.[a-z]\+([^)]\+) *;//g'
|
||||
JS_SRC ?= $(filter-out %.min.js,$(wildcard *.js))
|
||||
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_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)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# jan's utility modules
|
||||
# jan's utility modules
|
||||
# (c) 2001-2005 jannet it services
|
||||
# contact@jannet.de
|
||||
# $Id$
|
||||
|
|
|
|||
|
|
@ -89,4 +89,3 @@ clean: clean.winres
|
|||
#%.o : %.rc
|
||||
# $(WINDRES) $^ -o $@
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -4,4 +4,3 @@
|
|||
# $Id$
|
||||
|
||||
include $(MODDIR)/make/tools.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
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 $@ \
|
||||
$(F_BOOTFILES) \
|
||||
$(addprefix $(TMP_INSTALL)/, \
|
||||
|
|
@ -178,10 +178,10 @@ ping:
|
|||
ping $(HOST)
|
||||
ssh:
|
||||
$(CVS_RSH) -l root $(HOST)
|
||||
|
||||
|
||||
# user targets
|
||||
unpack: unpack.done
|
||||
build: build.lxdone
|
||||
build: build.lxdone
|
||||
driver: driver.done
|
||||
tgz: $(F_TGZ)
|
||||
spm: $(F_SPM)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
TOOLS_DIR ?= $(TOPDIR)/tools
|
||||
TOOLS_INCLUDE_DIR ?= $(TOOLS_DIR)
|
||||
CPP_PREFIX ?= YLo
|
||||
CPP_SUFFIX ?=
|
||||
CPP_SUFFIX ?=
|
||||
SO_PREFIX ?= lo_
|
||||
LOADABLE_OBJ_HOOK ?= LOADABLE_OBJECT_HOOK
|
||||
# === change this <
|
||||
|
|
|
|||
|
|
@ -74,8 +74,6 @@ $(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_D
|
|||
mv $@.tmp $@
|
||||
|
||||
$(BUILD_PKG_CONFIG): $(LOCAL_PKG_CONFIG)
|
||||
|
||||
|
||||
clean.pkg-config:
|
||||
$(RM) -f *.pc $(BUILD_PKG_CONFIG)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
PROJECT_LDFLAGS += -Wl,--whole-archive -l$(PLUGIN_VERSION_LIB_BASENAME) -Wl,--no-whole-archive
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -15,4 +15,3 @@ clean.local:
|
|||
|
||||
$(PLUGIN_VERSION_LIB): version.o
|
||||
ar r $@ $<
|
||||
|
||||
|
|
|
|||
|
|
@ -3,4 +3,3 @@ PREREQ_INSTALLED_TARGETS += run gdb valgrind attach attach-strace libpath valgri
|
|||
ifneq ($(filter $(PREREQ_INSTALLED_TARGETS),$(MAKECMDGOALS)),)
|
||||
PREREQ_BUILD += $(shell ls /etc/ld.so.conf.d | sed '/ld-.*.conf/ !d; s/ld-\(.*\).conf/\1/')
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# $Id$
|
||||
|
||||
PATH_PROFILE ?= path-$(PROJECT).sh
|
||||
EXE_SH =
|
||||
EXE_SH =
|
||||
|
||||
ifeq ($(PROFILE),)
|
||||
PROFILE = $(PATH_PROFILE)
|
||||
|
|
|
|||
|
|
@ -82,4 +82,3 @@ gprof-view-callgraph-pdf: gprof-callgraph.pdf
|
|||
okular $<
|
||||
clean.gprof:
|
||||
$(RM) -f gmon.out gprof.txt *.tmp gprof-callgraph.pdf
|
||||
|
||||
|
|
|
|||
|
|
@ -10,5 +10,3 @@ include $(MODDIR)/make/defs.mk
|
|||
$(CAP_PROJECT)_VERSION := $(VERSION)
|
||||
$(CAP_PROJECT)_INSTALL_LIBDIR := $(INSTALL_LIBDIR)
|
||||
$(CAP_PROJECT)_TOPDIR := $(TOPDIR)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ endif
|
|||
ifeq ($(OFFLINE),true)
|
||||
UNAVAILABLE_TARGETS ?= pull.done update.done clone.done
|
||||
else
|
||||
UNAVAILABLE_TARGETS ?=
|
||||
UNAVAILABLE_TARGETS ?=
|
||||
export CVSROOT = :ext:$(JANWARE_USER)@cvs.janware.com:/srv/cvs
|
||||
endif
|
||||
|
||||
|
|
@ -122,7 +122,7 @@ GIT_PROJECTS = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /.gi
|
|||
CVS_PROJECTS = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /CVS,$(BUILD_PROJECTS)))))
|
||||
|
||||
# ------------ targets
|
||||
|
||||
|
||||
# --- mandatory targets
|
||||
|
||||
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))))
|
||||
|
||||
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))
|
||||
$(PGIT_SH) -uno status
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ PY_MOD ?= $(subst /,.,$(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))
|
||||
|
||||
empty :=
|
||||
empty :=
|
||||
space := $(empty) $(empty)
|
||||
PYTHONPATH ?= $(call proj_query, pythonpath $(PROJECT))
|
||||
#PYTHONPATH = $(subst $(space),,$(ENV_PYTHONPATH)$(foreach d,$(PY_MODULE_DIRS),:$(d)))
|
||||
|
|
|
|||
|
|
@ -13,4 +13,3 @@ distclean:
|
|||
|
||||
run:
|
||||
/usr/bin/python2 $(EXE) $(EXE_ARGS)
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ CPPFLAGS += -DQT_THREAD_SUPPORT
|
|||
#endif
|
||||
|
||||
# ------------------------------- Qt defs
|
||||
|
||||
|
||||
#Qt5Designer \
|
||||
|
||||
ifeq ($(QT_MAJOR_VERSION),5)
|
||||
|
|
@ -155,4 +155,3 @@ OBJ += $(patsubst %.cpp,%.o,$(UIC_CPP))
|
|||
OBJ += $(patsubst %.cpp,%.o,$(RCC_CPP))
|
||||
|
||||
endif # USE_QT
|
||||
|
||||
|
|
|
|||
|
|
@ -17,4 +17,3 @@ all: $(QMAKE_MAKEFILE)
|
|||
qmake.clean:
|
||||
if [ -f $(QMAKE_MAKEFILE) ]; then make -f $(QMAKE_MAKEFILE) clean; fi
|
||||
$(RM) -f $(QMAKE_MAKEFILE) *.tmp $(EXE) .qmake.stash
|
||||
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ rcc_%.cpp: %.qrc
|
|||
$(RCC) -o $@ $<
|
||||
|
||||
ifeq ($(QT_MAJOR_VERSION),4)
|
||||
ui_%.h: %.ui
|
||||
ui_%.h: %.ui
|
||||
else
|
||||
%.h: %.ui
|
||||
%.h: %.ui
|
||||
endif
|
||||
$(UIC) $< -o $@
|
||||
|
||||
|
|
@ -22,7 +22,6 @@ ifeq ($(QT_MAJOR_VERSION),4)
|
|||
uic_%.cpp: ui_%.h
|
||||
echo -e "#include \"$<\"\n" > $@
|
||||
else
|
||||
uic_%.cpp: %.h %.ui
|
||||
uic_%.cpp: %.h %.ui
|
||||
$(UIC) $*.ui -i $< -o $@
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -10,4 +10,3 @@ include $(MODDIR)/make/defs-cpp.mk
|
|||
include $(MODDIR)/make/qt-defs.mk
|
||||
include $(MODDIR)/make/exe.mk
|
||||
include $(MODDIR)/make/qt.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -8,4 +8,3 @@ QT_MAJOR_VERSION ?= 4
|
|||
|
||||
include $(MODDIR)/make/plugin.mk
|
||||
include $(MODDIR)/make/qt.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -6,4 +6,3 @@
|
|||
include $(MODDIR)/make/qtversion.mk
|
||||
include $(MODDIR)/make/so.mk
|
||||
include $(MODDIR)/make/qt.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ include $(MODDIR)/make/qtversion.mk
|
|||
include $(MODDIR)/make/tools.mk
|
||||
#include $(MODDIR)/make/defs.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
|
||||
#clean: objclean textclean localclean
|
||||
#install: $(ALL)
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ clean.rpm:
|
|||
#$(LOCAL_MKSPEC_SH): $(PROJECT_DESCR_FILE)
|
||||
# sh $(MOD_SCRIPT_DIR)/create-mkspec.sh $< > $@.tmp
|
||||
# mv $@.tmp $@
|
||||
#
|
||||
#
|
||||
#clean.mkspec:
|
||||
# $(RM) -f $(LOCAL_MKSPEC_SH) $(LOCAL_MKSPEC_SH).tmp
|
||||
#
|
||||
|
|
@ -231,7 +231,7 @@ ifeq ($(wildcard $(TOPDIR)/.git),)
|
|||
|
||||
SCM_COMMIT = cvs commit
|
||||
SCM_ADD = cvs add
|
||||
SCM_PUSH =
|
||||
SCM_PUSH =
|
||||
SCM_PULL = cvs update -dP
|
||||
|
||||
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)
|
||||
endef
|
||||
|
||||
md5:
|
||||
md5:
|
||||
echo $(HASH) > HASH
|
||||
|
||||
pkg-next-build:
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ prepend_header:
|
|||
set -e; for f in $(SRC_UNHEADERED); do sh $(TOPDIR)/hdr/prepend_header.sh $$f; done
|
||||
|
||||
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_TUPLE = $(TARGET_TUPLE)"
|
||||
|
|
@ -345,10 +345,10 @@ else
|
|||
endif
|
||||
|
||||
$(EXE) $(EXE_BIN):
|
||||
$(CPP) $(sort $(OBJ)) $(BUILD_LDFLAGS) -o $@
|
||||
$(CPP) $(sort $(OBJ)) $(BUILD_LDFLAGS) -o $@
|
||||
|
||||
$(PLUGIN) $(PLUGIN_LIB):
|
||||
$(CPP) -shared $(sort $(OBJ)) $(BUILD_LDFLAGS) -o $@
|
||||
$(CPP) -shared $(sort $(OBJ)) $(BUILD_LDFLAGS) -o $@
|
||||
# mkdir -p $(BUILD_LIBDIR)
|
||||
# $(BIN_INSTALL) -m 755 $@ $(BUILD_LIBDIR)
|
||||
|
||||
|
|
|
|||
23
make/run.mk
23
make/run.mk
|
|
@ -6,7 +6,7 @@
|
|||
include $(MODDIR)/make/defs.mk
|
||||
include $(MODDIR)/make/defs-cpp.mk
|
||||
|
||||
DIR_BASENAME = $(notdir $(shell $(PWD)))
|
||||
DIR_BASENAME = $(notdir $(CWD))
|
||||
|
||||
ifeq ($(EXE_BASENAME),)
|
||||
ifneq ($(DIR_BASENAME),test)
|
||||
|
|
@ -17,13 +17,13 @@ ifeq ($(EXE_BASENAME),)
|
|||
endif
|
||||
|
||||
ifneq ($(EXE_BASENAME),)
|
||||
ifneq ($(TARGET),mingw)
|
||||
EXE ?= $(EXE_BASENAME)
|
||||
SHORTCUT_SCRIPT ?= ./run.sh
|
||||
else
|
||||
EXE ?= $(EXE_BASENAME).exe
|
||||
SHORTCUT_SCRIPT ?= run.bat
|
||||
endif
|
||||
ifneq ($(TARGET),mingw)
|
||||
EXE ?= $(EXE_BASENAME)
|
||||
SHORTCUT_SCRIPT ?= ./run.sh
|
||||
else
|
||||
EXE ?= $(EXE_BASENAME).exe
|
||||
SHORTCUT_SCRIPT ?= run.bat
|
||||
endif
|
||||
endif
|
||||
|
||||
EXE_PATH ?= ./$(EXE)
|
||||
|
|
@ -33,7 +33,7 @@ LOCAL_CFLAGS += -DEXE_NAME=\"$(EXE)\"
|
|||
LOCAL_CPPFLAGS += -DEXE_NAME=\"$(EXE)\"
|
||||
|
||||
include $(MODDIR)/make/profiler.mk
|
||||
BUILD_HDR =
|
||||
BUILD_HDR =
|
||||
include $(MODDIR)/make/rules.mk
|
||||
include $(MODDIR)/make/ldlibpath.mk
|
||||
include $(MODDIR)/make/path-rules.mk
|
||||
|
|
@ -42,7 +42,7 @@ include $(MODDIR)/make/debugger.mk
|
|||
EXE_ARGS += $(LOCAL_EXE_ARGS)
|
||||
|
||||
ifneq ($(wildcard local.supp),)
|
||||
VALGRIND_OPTS += --suppressions=local.supp
|
||||
VALGRIND_OPTS += --suppressions=local.supp
|
||||
endif
|
||||
|
||||
all:
|
||||
|
|
@ -108,7 +108,7 @@ valgrind: run-prereq
|
|||
valkyrie: run-prereq
|
||||
$(RM) -f core.*
|
||||
valkyrie $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS)
|
||||
|
||||
|
||||
efence: run-prereq
|
||||
$(RM) -f core.*
|
||||
ef $(EXE_PATH) $(EXE_ARGS)
|
||||
|
|
@ -157,4 +157,3 @@ kcg:
|
|||
kcachegrind callgrind.*
|
||||
|
||||
clean: runclean localclean
|
||||
|
||||
|
|
|
|||
|
|
@ -34,4 +34,3 @@ install-home-bin: $(HOME_BIN_EXE_SH)
|
|||
|
||||
clean.init:
|
||||
$(RM) -f $(_INIT_SCRIPTS)
|
||||
|
||||
|
|
|
|||
|
|
@ -68,4 +68,3 @@ smart-config.done:
|
|||
sudo smart config --set rpm-check-signatures=false
|
||||
sudo smart config --set remove-packages=false
|
||||
touch $@
|
||||
|
||||
|
|
|
|||
|
|
@ -31,4 +31,3 @@ strace: $(EXE) $(EXE_BIN)
|
|||
all.dirs:
|
||||
clean: execlean localclean clean.standalone-exe
|
||||
clean.standalone-exe:
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ install.std-tools.done: install.std-dir.done
|
|||
$(INSTALL) -p -o $(PROFILEOWNER) -g $(PROFILEGROUP) -m $(PROFILEMODE) $(PROFILE_SH) $(PROFILE_DIR)
|
||||
touch $@
|
||||
|
||||
install.std-dir.done:
|
||||
install.std-dir.done:
|
||||
mkdir -p $(PROFILE_DIR)
|
||||
touch $@
|
||||
|
||||
|
|
|
|||
|
|
@ -13,4 +13,3 @@ clean.var:
|
|||
$(RM) -rf $(CLEAN)
|
||||
distclean.var:
|
||||
$(RM) -rf $(DISTCLEAN)
|
||||
|
||||
|
|
|
|||
|
|
@ -37,4 +37,3 @@ $(INSTALLED_SUBTREE_DIRS):
|
|||
|
||||
$(ENV_PREFIX)$(SUBTREE_INSTALL_PREFIX)/%: %
|
||||
$(INSTALL) -p -o $(SUBTREE_OWNER) -g $(SUBTREE_GROUP) -m $(SUBTREE_MODE) $< $@
|
||||
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ else ifeq ($(SWIG_TARGET),java)
|
|||
#SWIG_INSTALLED_EXTRA += $(SWIG_MODULE_TARGET_DIR)/$(SWIG_PY_MODULE_PYC)
|
||||
|
||||
INCLUDE += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
|
||||
#BUILD_LDFLAGS +=
|
||||
#BUILD_LDFLAGS +=
|
||||
|
||||
INSTALL_LIBDIR = $(SWIG_MODULE_TARGET_DIR)
|
||||
|
||||
|
|
@ -178,4 +178,3 @@ clean.generated:
|
|||
|
||||
include $(MODDIR)/make/rules.mk
|
||||
include $(MODDIR)/make/depend.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -30,4 +30,3 @@ $(LIB_SO): $(LIB_A)
|
|||
$(EXE): $(LIB_SO)
|
||||
endif
|
||||
all.dirs:
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ CUSTOMER ?= jannet
|
|||
PROJECT ?= legal
|
||||
TOPIC ?= $(notdir $(shell $(PWD)))
|
||||
VERSION ?= $(shell sed "s/-dev$$//" VERSION)
|
||||
AUTHORS ?=
|
||||
AUTHORS ?=
|
||||
#TITLE ?= Allgemeine Bedingungen für
|
||||
#SUBTITLE ?= Dienstgüte-Vereinbarungen
|
||||
DATE ?= $(shell date +'%Y/%m/%d')
|
||||
|
|
@ -314,7 +314,7 @@ dirs.done:
|
|||
touch dirs.done
|
||||
|
||||
dirs: dirs.done
|
||||
|
||||
|
||||
arch:
|
||||
test $(shell uname -s) = Linux
|
||||
|
||||
|
|
@ -334,7 +334,7 @@ $(OUT).tex.zip: cfgtest $(LATEX_INPUT)
|
|||
|
||||
#$(OUTPUT).dvi: $(LATEX_INPUT)
|
||||
# @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 $@
|
||||
|
||||
#$(OUT).dvi.zip: $(OUTPUT).dvi
|
||||
|
|
@ -431,4 +431,3 @@ unzip:
|
|||
UPLOAD_FILES = $(OUTPUT).pdf
|
||||
|
||||
include $(MODDIR)/make/upload.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -11,4 +11,3 @@ install:
|
|||
distclean: textclean localclean
|
||||
clean: textclean localclean
|
||||
test:
|
||||
|
||||
|
|
|
|||
|
|
@ -32,4 +32,3 @@ $(OUT_PNG): $(OUT_PDF)
|
|||
|
||||
clean.files:
|
||||
$(RM) -rf *.done *.aux *.log *.pdf *.nav *.out *.snm *.toc .*.swp $(OUT_PNG) *.vrb
|
||||
|
||||
|
|
|
|||
|
|
@ -32,4 +32,3 @@ install-images.done: basedir.done generate.done $(INSTALLED_IMG)
|
|||
|
||||
blah:
|
||||
@echo GENERATED_IMAGES = $(GENERATED_IMAGES)
|
||||
|
||||
|
|
|
|||
|
|
@ -20,4 +20,3 @@ all:
|
|||
install: install_TMPL
|
||||
clean: textclean localclean doneclean
|
||||
test:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
include $(MODDIR)/make/dummy.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ OPT_JANWARE_PROJECT ?= -j
|
|||
ifeq ($(OPT_JANWARE_PROJECT),-j)
|
||||
REMOTE_GIT_FLAVOUR ?= proj
|
||||
else
|
||||
OPT_JANWARE_PROJECT =
|
||||
OPT_JANWARE_PROJECT =
|
||||
REMOTE_GIT_FLAVOUR ?= priv
|
||||
endif
|
||||
|
||||
|
|
@ -52,7 +52,7 @@ ifneq ($(SUBDIRS_TO_ITERATE),)
|
|||
else
|
||||
SUBDIR_TARGETS = $(filter $(ALLOWED_SUBDIR_TARGETS),$(MAKECMDGOALS))
|
||||
endif
|
||||
|
||||
|
||||
endif
|
||||
|
||||
include $(MODDIR)/make/rpmdist.mk
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@ UPLOAD_USER ?= $(shell id -nu)
|
|||
UPLOAD_HOST_LOGIN ?= root
|
||||
UPLOAD_HOST ?= files.janware.com
|
||||
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_ROOT ?= $(UPLOAD_FILES_ROOT)/$(UPLOAD_MODULE_PATH)
|
||||
UPLOAD_TARGET_PREFIX ?= rsync_ssh://$(UPLOAD_HOST_LOGIN)@$(UPLOAD_HOST):$(UPLOAD_MODULE_ROOT)/
|
||||
#UPLOAD_FILES ?=
|
||||
#UPLOAD_FILES ?=
|
||||
REMOTE_TARGETS ?= \
|
||||
$(foreach f,$(notdir $(UPLOAD_FILES)),$(UPLOAD_TARGET_PREFIX)$f:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP))
|
||||
UPLOAD_SRC_DIR ?= .
|
||||
|
|
|
|||
|
|
@ -15,4 +15,3 @@ clean: upload.clean
|
|||
|
||||
upload.clean:
|
||||
$(RM) -f upload.dist yupdate.*.dist
|
||||
|
||||
|
|
|
|||
|
|
@ -29,4 +29,3 @@ clean: upload.clean
|
|||
|
||||
upload.clean:
|
||||
$(RM) -f upload.dist
|
||||
|
||||
|
|
|
|||
|
|
@ -51,4 +51,3 @@ BEGIN
|
|||
VALUE "Translation", 0x409, 1252
|
||||
END
|
||||
END
|
||||
|
||||
|
|
|
|||
|
|
@ -19,4 +19,3 @@ ifeq ($(USE_WT),true)
|
|||
PROJECT_LDFLAGS += -lwt
|
||||
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ YAPP_CLASS ?= $(firstword $(basename $(notdir $(wildcard $(addp
|
|||
$(YAPP_INCLUDE_DIR)/, YApp*.h App*.h Y*.h *.h)))))
|
||||
YAPP_CLASS_H ?= $(firstword $(wildcard $(addsuffix /$(YAPP_CLASS).h,\
|
||||
$(YAPP_INCLUDE_DIR) $(subst -I,,$(INCLUDE)))) $(YAPP_CLASS).h)
|
||||
YAPP_NAMESPACE ?=
|
||||
YAPP_NAMESPACE ?=
|
||||
|
||||
ifneq ($(TARGET),mingw)
|
||||
LOCAL_LDFLAGS += -rdynamic
|
||||
|
|
@ -26,4 +26,3 @@ main.cpp: $(YAPP_CLASS_H)
|
|||
echo "#include <ytools/YAppRunner.h>" >> $@.tmp
|
||||
echo "yapp_main($(YAPP_CLASS))" >> $@.tmp
|
||||
mv $@.tmp $@
|
||||
|
||||
|
|
|
|||
|
|
@ -58,5 +58,3 @@ $(WINLIB): $(REQUIRED_H)
|
|||
cp $(MODDIR)/Makefile $(DISTDIR)/src/$(PROJECT)/mod/
|
||||
cd $(DISTDIR)/src; zip -r $(notdir $@) $(PROJECT)
|
||||
mv $(DISTDIR)/src/$(notdir $@) $@
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue