From 7067725092db66d665eb829de6ce11a653b087e3 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Tue, 20 Apr 2004 16:48:50 +0000
Subject: [PATCH] $(TOPDIR), make: Merged changes of V_1_1_7_1_JL

---
 CHANGES           |  4 ++++
 VERSION           |  2 +-
 make/defs.mk      | 10 ++++++----
 make/linux-rpm.mk | 12 ++++++++++--
 make/rules.mk     | 17 ++++++++++-------
 make/subdirs.mk   |  3 +--
 6 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/CHANGES b/CHANGES
index f85a1c3f..8fbae2b4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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 make: now supporting local.mk
 o make: added linux-rpm.mk
+
+1.1.8-0
+-------
+o merged changes of V_1_1_7_1_JL
diff --git a/VERSION b/VERSION
index 3d39b781..993e186f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.7-1-dev
+1.1.8-0-dev
diff --git a/make/defs.mk b/make/defs.mk
index b2a85786..cb7c94a0 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -43,7 +43,7 @@ CFILES       = $(wildcard *.c)
 CPPFILES     = $(wildcard *.cc *.cpp)
 CALLSRC      = $(CFILES) $(CPPFILES)
 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))
 SCRIPTS      = $(patsubst %.tmpl,%,$(wildcard *.tmpl))
 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_DEBUG   = -Wall -D_DEBUG_ -g3 $(MEMWATCH) 
 CPPFLAGS_DEBUG = $(CFLAGS_DEBUG)
-CFLAGS      += $(INCLUDE) $(PROJECT_CFLAGS)   $(LOCAL_CFLAGS)   $(YLIB_CFLAGS)
-CPPFLAGS    += $(INCLUDE) $(PROJECT_CPPFLAGS)  $(LOCAL_CPPFLAGS) $(YLIB_CPPFLAGS)
+CFLAGS      += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(YLIB_CFLAGS) $(INCLUDE)  
+CPPFLAGS    += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS)  $(YLIB_CPPFLAGS) $(INCLUDE)  
 LDFFTW    = -lrfftw -lfftw -lm
 #LDAUDIO   = -laudiofile
 
@@ -174,8 +174,10 @@ endif
 
 ifeq ($(GCC_MAJOR),2)
 LPPFLAGS  += -lg++ -lstdc++
+DEPEND_CPPFLAGS  += -I/usr/include/g++ -I/usr/local/include
 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
 
 ifeq ($(LIBTYPE),shared)
diff --git a/make/linux-rpm.mk b/make/linux-rpm.mk
index 475dc219..1a739f63 100644
--- a/make/linux-rpm.mk
+++ b/make/linux-rpm.mk
@@ -22,7 +22,11 @@ TMP_INSTALL          = $(KERNEL_BASE)-$(KERNEL_VERSION)-$(KERNEL_RELEASE)
 TAG                  = $(shell echo V_$(KERNEL_VERSION)_$(KERNEL_RELEASE) | sed 's/\./_/g')
 
 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$$' \
+>>>>>>> 1.1.2.2
 		> RELEASE-$(KERNEL_VERSION); \
 		cvs add RELEASE-$(KERNEL_VERSION); \
 		cvs commit -m "initial checkin" RELEASE-$(KERNEL_VERSION); \
@@ -81,7 +85,7 @@ unpack.done: $(KERNEL_PKG)
 	tar -xzf $(KERNEL_PKG)
 	touch $@
 
-%.lxdone: unpack.done config-$(KERNEL_VERSION)
+%.lxdone: unpack.done config-$(KERNEL_VERSION) $(LOCAL_PRE_BUILD)
 	$(BUILD) $(basename $@)
 	touch $@
 
@@ -174,7 +178,7 @@ ssh:
 	
 # user targets
 unpack: unpack.done
-build: build.lxdone
+build: build.lxdone 
 driver: driver.done
 tgz: $(F_TGZ)
 spm: $(F_SPM)
@@ -187,6 +191,10 @@ copy-devel: copy-devel.done
 copy: copy-run copy-devel
 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
 	cd ..;\
 	tar -czf kernel.tar.gz `find kernel -type f -maxdepth 1 | grep -ve "setup\|trash\|CVS"`
diff --git a/make/rules.mk b/make/rules.mk
index 7ec3c812..828776b8 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -56,13 +56,13 @@ timers_%.h: %.h $(GENERATE_FUNC_TIMERS)
 	sh $(GENERATE_FUNC_TIMERS) $< $@
 
 ifeq ($(USE_PROJECT_LIB),true)
-ifeq ($(LIBTYPE),shared)
-$(EXE) $(EXE_BIN): $(OBJ) $(LIB_SO)
+  ifeq ($(LIBTYPE),shared)
+    $(EXE) $(EXE_BIN): $(OBJ) $(LIB_SO)
+  else
+    $(EXE) $(EXE_BIN): $(OBJ) $(LIB_A)
+  endif
 else
-$(EXE) $(EXE_BIN): $(OBJ) $(LIB_A)
-endif
-else
-$(EXE) $(EXE_BIN): $(OBJ)
+  $(EXE) $(EXE_BIN): $(OBJ)
 endif
 	$(CC) $(OBJ) $(LDFLAGS) -o $@ 
 	mkdir -p $(BUILD_BINDIR)
@@ -119,7 +119,7 @@ $(INSTALL_MKDIR)/%.mk: %.mk
 $(INSTALL_DOCDIR_DIST)/% $(INSTALL_DOCDIR_DEVEL)/%: %
 	mkdir -p $(dir $@)
 	$(INSTALL) -o $(HDROWNER) -g $(HDRGROUP) -m $(HDRMODE) $< $@
-	
+
 $(INSTALLED_PROFILE_PATH_SCRIPT):
 	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
@@ -136,6 +136,9 @@ else
 install_profile_path: $(INSTALLED_PROFILE_PATH_SCRIPT)
 endif
 
+depend:
+	makedepend -- $(CPPFLAGS) $(DEPEND_CPPFLAGS) -- $(wildcard *.cpp *.h)
+
 checkroot:
 	@if [ "$(CHECK_ROOT)" = true -o "$(CHECK_ROOT)" = TRUE ] ; then \
 		echo "Error: You can only do this if either" ;\
diff --git a/make/subdirs.mk b/make/subdirs.mk
index 042cf2af..b6900949 100644
--- a/make/subdirs.mk
+++ b/make/subdirs.mk
@@ -3,8 +3,7 @@ install: install.dirs
 clean: clean.dirs clean.var
 distclean: distclean.dirs distclean.var
 
-ifdef SUBDIRS
-
+ifneq ($(SUBDIRS),)
 all.dirs:
 	set -e; for dir in $(SUBDIRS); do make -C $$dir all; done
 install.dirs: