janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-16 04:23:31 +01:00
Code Activity

$(TOPDIR), make, scripts: Merged changes of V_1_1_5-2 -> V_1_1_5-2F3

Browse source
This commit is contained in:
Jan Lindemann 2004-09-04 19:46:32 +00:00 • committed by Jan Lindemann
commit aa4bc767d9
6 changed files with 39 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/cfg_dev.mk
View file

@ -40,6 +40,9 @@ CONFIG_DIR = $(PREFIX)/etc
CONFIG_FILE = $(CONFIG_DIR)/$(PROJECT).cfg
LIBTYPE = static
FTP_PUB_DIR_ABS = $(JANNET_PROJ_DIR)/$(PROJECT)
PROFILE_DIR = $(HOME)/.profile.d
ROOTOWNER = $(shell id -un)
ROOTGROUP = $(shell id -gn)
# -- debugging options
@ -56,4 +59,3 @@ USE_COMPILER_DEBUG_OPTS = true
#LOG_THREAD_NAMES = true
#USE_COMPILER_OPTIMIZATION_OPTS = true
#USE_TRACING = true
USE_TIMER = true

3
make/cfg_dist.mk
View file

@ -38,6 +38,9 @@ DOWNLOADDIRS = root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/
CONFIG_DIR = $(PREFIX)/etc
CONFIG_FILE = $(CONFIG_DIR)/$(PROJECT).cfg
LIBTYPE = shared
PROFILE_DIR = $(ENV_PREFIX)/etc/profile.d
ROOTOWNER = root
ROOTGROUP = root
# -- debugging options

6
make/defs.mk
View file

@ -155,6 +155,8 @@ else
QT_PREFIX = /usr/lib/qt2
endif
LD_LIB_PATH += $(QT_PREFIX)/lib
MOC = $(QT_PREFIX)/bin/moc
UIC = $(QT_PREFIX)/bin/uic
@ -195,8 +197,8 @@ LDFLAGS += -fprofile-arcs -ftest-coverage
endif
ifeq ($(USE_MPATROL),true)
PROJECT_CFLAGS += -include $(MODDIR)/include/mpatrol.h
#PROJECT_CPPFLAGS += -include $(MODDIR)/include/mpatrol.h
PROJECT_CFLAGS += -include /usr/include/mpatrol.h
#PROJECT_CPPFLAGS += -include /usr/include/mpatrol.h
PROJECT_LDFLAGS += -lmpatrolmt -lbfd -liberty
endif

6
make/exe.mk
View file

@ -6,11 +6,13 @@
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk
EXPORT_LD_LIB_PATH = export LD_LIBRARY_PATH=$(shell echo $(strip $(LD_LIB_PATH)) | sed 's/ /:/g')
all: $(EXE) $(EXE_BIN)
install: $(INSTALLED_EXE) $(INSTALLED_EXE_BIN)
run: $(EXE) $(EXE_BIN)
$(EXPORT_LD_LIB_PATH) ./$(EXE) $(EXE_ARGS)
$(EXPORT_LD_LIB_PATH); ./$(EXE) $(EXE_ARGS)
strace: $(EXE) $(EXE_BIN)
$(EXPORT_LD_LIB_PATH) strace -f ./$(EXE) $(EXE_ARGS)
$(EXPORT_LD_LIB_PATH); strace -f ./$(EXE) $(EXE_ARGS)
clean: execlean localclean