janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 20:13:32 +01:00
Code Activity

make: Merge from V_1_1_5_2_FIXES

Browse source
This commit is contained in:
Jan Lindemann 2004-07-29 11:38:49 +00:00 • committed by Jan Lindemann
commit 3e9de8d25e
5 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
make/cfg_dev.mk
View file

@ -52,7 +52,8 @@ COMPILE_DEBUG_CODE = true
#USE_EFENCE = true
#USE_MPATROL = true
USE_COMPILER_DEBUG_OPTS = true
#USE_COMPILER_OPTIMIZATION = true
#USE_TRACING = true
#USE_TIMER = true
#LOG_THREAD_NAMES = true
#USE_COMPILER_OPTIMIZATION_OPTS = true
#USE_TRACING = true
USE_TIMER = true

4
make/cfg_dist.mk
View file

@ -49,7 +49,7 @@ LIBTYPE = shared
#USE_MEMWATCH = true
#USE_EFENCE = true
#USE_MPATROL = true
#USE_COMPILER_DEBUG_OPTS = true
#USE_COMPILER_OPTIMIZATION = true
USE_COMPILER_DEBUG_OPTS = true
#USE_COMPILER_OPTIMIZATION_OPTS = true
#USE_TRACING = true
#USE_TIMER = true

2
make/linux-rpm.mk
View file

@ -66,7 +66,7 @@ all: rpm
# file rules
$(KERNEL_PKG):
mkdir -p $(dirname $(KERNEL_PKG)
mkdir -p $(dir $(KERNEL_PKG))
ftp -a ftp.kernel.org:/pub/linux/kernel/v$(basename $(KERNEL_VERSION))/$(KERNEL_TGZ)
install -m 664 $(KERNEL_TGZ) $@

7
make/rpmdist.mk
View file

@ -15,7 +15,7 @@ endif
RPM_VERSION = $(VERSION)
TAG_VERSION = V_$(shell echo $(VERSION) | sed 's/[\.-]/_/g')
CLEAN += $(wildcard *.spec *.rpm *~ *.rpmrc *.dist .*.swp)
CLEAN += $(wildcard *.spec *.rpm *~ *.rpmrc *.dist .*.swp)
DIST_SRC_DIR = dist/src/$(RPM_PROJECT)-$(RPM_VERSION)
DIST_PCKG_DIR = dist/pckg
@ -84,7 +84,10 @@ cpfiles.dist:
%.tar.gz: cpfiles.dist cpmod.dist
mkdir -p $(DIST_PCKG_DIR)
tar -czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR))
tar -czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR)) \
$(addprefix --exclude=,$(notdir $(basename $(shell find . -name *.in))))
bla:
%.src.rpm: %.tar.gz
rpm -ts $<

16
make/ytools.mk.in
View file

@ -48,4 +48,20 @@ else
include $(TOPDIR)/make/cfg_dist.mk
endif
ifeq ($(USE_COMPILER_DEBUG_OPTS),true)
PROJECT_CFLAGS += -Wall -g3
PROJECT_CPPFLAGS += -Wall -g3
PROJECT_LDFLAGS += -Wall -g3
endif
ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true)
PROJECT_CFLAGS += -funroll-loops -O2
PROJECT_CPPFLAGS += -funroll-loops -O2
else
ifneq ($(USE_COMPILER_DEBUG_OPTS),true)
PROJECT_CFLAGS += -DNDEBUG
PROJECT_CPPFLAGS += -DNDEBUG
endif
endif
LDFLAGS += -lytools -ldl -pthread