From 6a37ebd3df1e7a14e7edac3d889913b1bafa7eed Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Thu, 16 Mar 2006 08:07:38 +0000
Subject: [PATCH] $(TOPDIR), make: Make it compile under SuSE 10.0, X86-64

---
 Makefile                |  3 ++-
 make/autoconf.mk        |  2 +-
 make/defs.mk            | 19 ++++++++++++-------
 make/linux-rpm-build.mk |  2 +-
 make/ytools.mk.in       |  7 +++++++
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 39ad8656..824c51a3 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,9 @@ SUBDIRS = inst/pre \
 		YMisc YMem YOptString \
 		cfgfile gtopts \
 		lock sigsync shmem \
+		contr \
 		msgfmt usrv uclnt statecheck \
-		YThread YEvent YCbContr contr \
+		YThread YEvent YCbContr \
 		YStopWatch YStopWatchList YStopWatchQueue YStopWatchThreadList \
 		eloop YApplication \
 		YOsc \
diff --git a/make/autoconf.mk b/make/autoconf.mk
index 24a3a43c..2038c1fb 100644
--- a/make/autoconf.mk
+++ b/make/autoconf.mk
@@ -5,7 +5,7 @@
 
 CONFIG_ACDONE := $(wildcard config.acdone)
 DISTCLEAN += configure config.log autoscan.log configure.ac config.status
-AC_FILES_IN = $(shell find . -name '*.in' -maxdepth 2 | grep -ve "contrib\|dist\|nomake")
+AC_FILES_IN = $(shell find . -maxdepth 2 -name '*.in' | grep -ve "contrib\|dist\|nomake")
 AC_FILES    = $(basename $(AC_FILES_IN))
 
 all: config.acdone make_all
diff --git a/make/defs.mk b/make/defs.mk
index f98f27b7..0094456f 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -18,8 +18,8 @@ PROJECT_STEM           = $(PROJECT)-$(DIST_VERSION)
 CVS_ROOT_DIR           = $(shell test -d CVS && pwd | sed -e "s%`cat CVS/Repository`%%; s%/$$%%")
 REV_SUBDIRS            = $(shell echo $(SUBDIRS) | awk '{for (i=NF; i>=1; i--) printf ("%s ",$$i)}')
 FRESH_CVSDIR           = $(HOME)/local/src/cvs.fresh
-
-FIND_SUBDIRS           = $(filter-out . .. ./CVS $(addprefix ./,$(IGNORE_SUBDIRS)), $(shell find . -type d -maxdepth 1))
+ARCH                   = @ARCH@
+FIND_SUBDIRS           = $(filter-out . .. ./CVS $(addprefix ./,$(IGNORE_SUBDIRS)), $(shell find . -maxdepth 1 -type d))
 
 PROJECT_CAPNAME        = $(shell echo $(PROJECT) | tr [a-z] [A-Z])
 
@@ -234,15 +234,20 @@ ifeq ($(USE_X),true)
 LDFLAGS               += -L/usr/X11/lib -lXext -lX11
 endif
 
+LPPFLAGS              += -lstdc++
 ifeq ($(GCC_MAJOR),2)
-LPPFLAGS              += -lstdc++ -lm
+LPPFLAGS              += -lm
 CFLAGS                += -I/usr/local/include
 CPPFLAGS              += -I/usr/local/include
-#DEPEND_CPPFLAGS       += -I/usr/include/g++ -I/usr/local/include
 else
-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 \
-#				-I/usr/include/g++/ext -I/usr/include/g++ -I/usr/include/g++/i586-suse-linux
+  ifeq ($(GCC_MAJOR),3)
+    LPPFLAGS          += -L/usr/local/gcc3.3/lib -lgcc_s
+  else
+    ifeq ($(GCC_MAJOR),4) # -PIC is more a thing with AMD64, I think
+       CPPFLAGS       += -fPIC
+       CFLAGS         += -fPIC
+    endif
+  endif
 endif
 
 ifeq ($(LIBTYPE),shared)
diff --git a/make/linux-rpm-build.mk b/make/linux-rpm-build.mk
index 64cb6afa..d70899d4 100644
--- a/make/linux-rpm-build.mk
+++ b/make/linux-rpm-build.mk
@@ -202,7 +202,7 @@ 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"`
+	tar -czf kernel.tar.gz `find kernel -maxdepth 1 -type f | grep -ve "setup\|trash\|CVS"`
 	mv ../kernel.tar.gz .
 clean:
 	rm -rf $(KERNEL_BASE)-*
diff --git a/make/ytools.mk.in b/make/ytools.mk.in
index ff8ff0ae..58bff050 100644
--- a/make/ytools.mk.in
+++ b/make/ytools.mk.in
@@ -49,7 +49,14 @@ else
 endif
 
 LDFLAGS += -lytools -ldl -pthread
+ARCH = @ARCH@
 
 LD_LIB_PATH=$(TOPDIR)/lib
 
+ifeq (@ARCH@,x86)
 PROJECT_LDFLAGS  += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig; pkg-config --libs glib-2.0)
+else
+  ifeq (@ARCH@,x86_64)
+    PROJECT_LDFLAGS  += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --libs glib-2.0)
+  endif
+endif