janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-24 06:40:39 +01:00
Code Activity

$(TOPDIR), make: Merged changes of V_1_1_7_1_JL

Browse source
This commit is contained in:
Jan Lindemann 2004-04-20 16:48:50 +00:00 • committed by Jan Lindemann
commit 7067725092
6 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -136,3 +136,7 @@ o uclnt/usrv: now supporting application defined down_terminate messages
o YMutex: made YDummyMutex YDebugMutex and made it lock again o YMutex: made YDummyMutex YDebugMutex and made it lock again
o make: now supporting local.mk o make: now supporting local.mk
o make: added linux-rpm.mk o make: added linux-rpm.mk
1.1.8-0
-------
o merged changes of V_1_1_7_1_JL

2
VERSION
View file

@ -1 +1 @@
1.1.7-1-dev 1.1.8-0-dev

10
make/defs.mk
View file

@ -43,7 +43,7 @@ CFILES = $(wildcard *.c)
CPPFILES = $(wildcard *.cc *.cpp) CPPFILES = $(wildcard *.cc *.cpp)
CALLSRC = $(CFILES) $(CPPFILES) CALLSRC = $(CFILES) $(CPPFILES)
OBJ = $(patsubst %.cpp,%.o,$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(CALLSRC)))) OBJ = $(patsubst %.cpp,%.o,$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(CALLSRC))))
SHOBJS = $(patsubst %.cpp,%.o,$(patsubst %.cc,lib%.so,$(patsubst %.c,lib%.so,$(CALLSRC)))) SHOBJS = $(patsubst %.cpp,lib%.so,$(patsubst %.cc,lib%.so,$(patsubst %.c,lib%.so,$(CALLSRC))))
SHSCRIPTS = $(patsubst %.sh.tmpl,%.sh,$(wildcard *.sh.tmpl)) SHSCRIPTS = $(patsubst %.sh.tmpl,%.sh,$(wildcard *.sh.tmpl))
SCRIPTS = $(patsubst %.tmpl,%,$(wildcard *.tmpl)) SCRIPTS = $(patsubst %.tmpl,%,$(wildcard *.tmpl))
LOCAL_HDR = $(patsubst %.h,$(TOPDIR)/include/%.h,$(wildcard *.h)) LOCAL_HDR = $(patsubst %.h,$(TOPDIR)/include/%.h,$(wildcard *.h))
@ -133,8 +133,8 @@ MEMBERS = $(LIB_A)($(OBJ))
#CFLAGS += -DNDEBUG -O2 -g $(INCLUDE) $(LOCAL_CFLAGS) #production #CFLAGS += -DNDEBUG -O2 -g $(INCLUDE) $(LOCAL_CFLAGS) #production
CFLAGS_DEBUG = -Wall -D_DEBUG_ -g3 $(MEMWATCH) CFLAGS_DEBUG = -Wall -D_DEBUG_ -g3 $(MEMWATCH)
CPPFLAGS_DEBUG = $(CFLAGS_DEBUG) CPPFLAGS_DEBUG = $(CFLAGS_DEBUG)
CFLAGS += $(INCLUDE) $(PROJECT_CFLAGS) $(LOCAL_CFLAGS) $(YLIB_CFLAGS) CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(YLIB_CFLAGS) $(INCLUDE)
CPPFLAGS += $(INCLUDE) $(PROJECT_CPPFLAGS) $(LOCAL_CPPFLAGS) $(YLIB_CPPFLAGS) CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(YLIB_CPPFLAGS) $(INCLUDE)
LDFFTW = -lrfftw -lfftw -lm LDFFTW = -lrfftw -lfftw -lm
#LDAUDIO = -laudiofile #LDAUDIO = -laudiofile
@ -174,8 +174,10 @@ endif
ifeq ($(GCC_MAJOR),2) ifeq ($(GCC_MAJOR),2)
LPPFLAGS += -lg++ -lstdc++ LPPFLAGS += -lg++ -lstdc++
DEPEND_CPPFLAGS += -I/usr/include/g++ -I/usr/local/include
else else
LPPFLAGS += -lstdc++ -L/usr/local/lib LPPFLAGS += -L/usr/local/gcc3.3/lib -lstdc++ -lgcc_s
DEPEND_CPPFLAGS += -I/usr/local/gcc3.3/include/c++/3.3 -I/usr/local/gcc3.3/include/c++/3.3/i686-pc-linux-gnu -I/usr/local/include
endif endif
ifeq ($(LIBTYPE),shared) ifeq ($(LIBTYPE),shared)

12
make/linux-rpm.mk
View file

@ -22,7 +22,11 @@ TMP_INSTALL = $(KERNEL_BASE)-$(KERNEL_VERSION)-$(KERNEL_RELEASE)
TAG = $(shell echo V_$(KERNEL_VERSION)_$(KERNEL_RELEASE) | sed 's/\./_/g') TAG = $(shell echo V_$(KERNEL_VERSION)_$(KERNEL_RELEASE) | sed 's/\./_/g')
ifeq ($(wildcard RELEASE-$(KERNEL_VERSION)),) ifeq ($(wildcard RELEASE-$(KERNEL_VERSION)),)
<<<<<<< linux-rpm.mk
KERNEL_RELEASE := $(shell echo '\# $$Id$(KERNEL_VERSION),v 0.1$$' \ KERNEL_RELEASE := $(shell echo '\# $$Id$(KERNEL_VERSION),v 0.1$$' \
=======
KERNEL_RELEASE := $(shell echo '\# $$Id$(KERNEL_VERSION),v 0.1$$' \
>>>>>>> 1.1.2.2
> RELEASE-$(KERNEL_VERSION); \ > RELEASE-$(KERNEL_VERSION); \
cvs add RELEASE-$(KERNEL_VERSION); \ cvs add RELEASE-$(KERNEL_VERSION); \
cvs commit -m "initial checkin" RELEASE-$(KERNEL_VERSION); \ cvs commit -m "initial checkin" RELEASE-$(KERNEL_VERSION); \
@ -81,7 +85,7 @@ unpack.done: $(KERNEL_PKG)
tar -xzf $(KERNEL_PKG) tar -xzf $(KERNEL_PKG)
touch $@ touch $@
%.lxdone: unpack.done config-$(KERNEL_VERSION) %.lxdone: unpack.done config-$(KERNEL_VERSION) $(LOCAL_PRE_BUILD)
$(BUILD) $(basename $@) $(BUILD) $(basename $@)
touch $@ touch $@
@ -174,7 +178,7 @@ ssh:
# user targets # user targets
unpack: unpack.done unpack: unpack.done
build: build.lxdone build: build.lxdone
driver: driver.done driver: driver.done
tgz: $(F_TGZ) tgz: $(F_TGZ)
spm: $(F_SPM) spm: $(F_SPM)
@ -187,6 +191,10 @@ copy-devel: copy-devel.done
copy: copy-run copy-devel copy: copy-run copy-devel
reboot: reboot:
ssh -l root $(HOST) "reboot" ssh -l root $(HOST) "reboot"
update-rpm: copy
ssh -l root $(HOST) rpm -U $(addprefix rpm/,$(F_RPMS))
erase-rpm:
ssh -l root $(HOST) rpm -e $(KERNEL_BASE)-run $(KERNEL_BASE)-devel
dist: clean dist: clean
cd ..;\ cd ..;\
tar -czf kernel.tar.gz `find kernel -type f -maxdepth 1 | grep -ve "setup\|trash\|CVS"` tar -czf kernel.tar.gz `find kernel -type f -maxdepth 1 | grep -ve "setup\|trash\|CVS"`

17
make/rules.mk
View file

@ -56,13 +56,13 @@ timers_%.h: %.h $(GENERATE_FUNC_TIMERS)
sh $(GENERATE_FUNC_TIMERS) $< $@ sh $(GENERATE_FUNC_TIMERS) $< $@
ifeq ($(USE_PROJECT_LIB),true) ifeq ($(USE_PROJECT_LIB),true)
ifeq ($(LIBTYPE),shared) ifeq ($(LIBTYPE),shared)
$(EXE) $(EXE_BIN): $(OBJ) $(LIB_SO) $(EXE) $(EXE_BIN): $(OBJ) $(LIB_SO)
else
$(EXE) $(EXE_BIN): $(OBJ) $(LIB_A)
endif
else else
$(EXE) $(EXE_BIN): $(OBJ) $(LIB_A) $(EXE) $(EXE_BIN): $(OBJ)
endif
else
$(EXE) $(EXE_BIN): $(OBJ)
endif endif
$(CC) $(OBJ) $(LDFLAGS) -o $@ $(CC) $(OBJ) $(LDFLAGS) -o $@
mkdir -p $(BUILD_BINDIR) mkdir -p $(BUILD_BINDIR)
@ -119,7 +119,7 @@ $(INSTALL_MKDIR)/%.mk: %.mk
$(INSTALL_DOCDIR_DIST)/% $(INSTALL_DOCDIR_DEVEL)/%: % $(INSTALL_DOCDIR_DIST)/% $(INSTALL_DOCDIR_DEVEL)/%: %
mkdir -p $(dir $@) mkdir -p $(dir $@)
$(INSTALL) -o $(HDROWNER) -g $(HDRGROUP) -m $(HDRMODE) $< $@ $(INSTALL) -o $(HDROWNER) -g $(HDRGROUP) -m $(HDRMODE) $< $@
$(INSTALLED_PROFILE_PATH_SCRIPT): $(INSTALLED_PROFILE_PATH_SCRIPT):
echo "if [ -z \"\$$PATH\" ]; then PATH=$(shell echo $(INSTALL_BINDIR) | sed -e s%^$(ENV_PREFIX)/%/%)" > path_script.sh echo "if [ -z \"\$$PATH\" ]; then PATH=$(shell echo $(INSTALL_BINDIR) | sed -e s%^$(ENV_PREFIX)/%/%)" > path_script.sh
echo "else PATH=\$$PATH:$(shell echo $(INSTALL_BINDIR) | sed -e s%^$(ENV_PREFIX)/%/%); fi" >> path_script.sh echo "else PATH=\$$PATH:$(shell echo $(INSTALL_BINDIR) | sed -e s%^$(ENV_PREFIX)/%/%); fi" >> path_script.sh
@ -136,6 +136,9 @@ else
install_profile_path: $(INSTALLED_PROFILE_PATH_SCRIPT) install_profile_path: $(INSTALLED_PROFILE_PATH_SCRIPT)
endif endif
depend:
makedepend -- $(CPPFLAGS) $(DEPEND_CPPFLAGS) -- $(wildcard *.cpp *.h)
checkroot: checkroot:
@if [ "$(CHECK_ROOT)" = true -o "$(CHECK_ROOT)" = TRUE ] ; then \ @if [ "$(CHECK_ROOT)" = true -o "$(CHECK_ROOT)" = TRUE ] ; then \
echo "Error: You can only do this if either" ;\ echo "Error: You can only do this if either" ;\

3
make/subdirs.mk
View file

@ -3,8 +3,7 @@ install: install.dirs
clean: clean.dirs clean.var clean: clean.dirs clean.var
distclean: distclean.dirs distclean.var distclean: distclean.dirs distclean.var
ifdef SUBDIRS ifneq ($(SUBDIRS),)
all.dirs: all.dirs:
set -e; for dir in $(SUBDIRS); do make -C $$dir all; done set -e; for dir in $(SUBDIRS); do make -C $$dir all; done
install.dirs: install.dirs: