janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

$(TOPDIR), make: Make it compile under SuSE 10.0, X86-64

Browse source
This commit is contained in:
Jan Lindemann 2006-03-16 08:07:38 +00:00 • committed by Jan Lindemann
commit 6a37ebd3df
5 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -17,8 +17,9 @@ SUBDIRS = inst/pre \
YMisc YMem YOptString \ YMisc YMem YOptString \
cfgfile gtopts \ cfgfile gtopts \
lock sigsync shmem \ lock sigsync shmem \
contr \
msgfmt usrv uclnt statecheck \ msgfmt usrv uclnt statecheck \
YThread YEvent YCbContr contr \ YThread YEvent YCbContr \
YStopWatch YStopWatchList YStopWatchQueue YStopWatchThreadList \ YStopWatch YStopWatchList YStopWatchQueue YStopWatchThreadList \
eloop YApplication \ eloop YApplication \
YOsc \ YOsc \

2
make/autoconf.mk
View file

@ -5,7 +5,7 @@
CONFIG_ACDONE := $(wildcard config.acdone) CONFIG_ACDONE := $(wildcard config.acdone)
DISTCLEAN += configure config.log autoscan.log configure.ac config.status 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)) AC_FILES = $(basename $(AC_FILES_IN))
all: config.acdone make_all all: config.acdone make_all

19
make/defs.mk
View file

@ -18,8 +18,8 @@ PROJECT_STEM = $(PROJECT)-$(DIST_VERSION)
CVS_ROOT_DIR = $(shell test -d CVS && pwd | sed -e "s%`cat CVS/Repository`%%; s%/$$%%") 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)}') REV_SUBDIRS = $(shell echo $(SUBDIRS) | awk '{for (i=NF; i>=1; i--) printf ("%s ",$$i)}')
FRESH_CVSDIR = $(HOME)/local/src/cvs.fresh FRESH_CVSDIR = $(HOME)/local/src/cvs.fresh
ARCH = @ARCH@
FIND_SUBDIRS = $(filter-out . .. ./CVS $(addprefix ./,$(IGNORE_SUBDIRS)), $(shell find . -type d -maxdepth 1)) FIND_SUBDIRS = $(filter-out . .. ./CVS $(addprefix ./,$(IGNORE_SUBDIRS)), $(shell find . -maxdepth 1 -type d))
PROJECT_CAPNAME = $(shell echo $(PROJECT) | tr [a-z] [A-Z]) 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 LDFLAGS += -L/usr/X11/lib -lXext -lX11
endif endif
LPPFLAGS += -lstdc++
ifeq ($(GCC_MAJOR),2) ifeq ($(GCC_MAJOR),2)
LPPFLAGS += -lstdc++ -lm LPPFLAGS += -lm
CFLAGS += -I/usr/local/include CFLAGS += -I/usr/local/include
CPPFLAGS += -I/usr/local/include CPPFLAGS += -I/usr/local/include
#DEPEND_CPPFLAGS += -I/usr/include/g++ -I/usr/local/include
else else
LPPFLAGS += -L/usr/local/gcc3.3/lib -lstdc++ -lgcc_s ifeq ($(GCC_MAJOR),3)
#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 \ LPPFLAGS += -L/usr/local/gcc3.3/lib -lgcc_s
# -I/usr/include/g++/ext -I/usr/include/g++ -I/usr/include/g++/i586-suse-linux else
ifeq ($(GCC_MAJOR),4) # -PIC is more a thing with AMD64, I think
CPPFLAGS += -fPIC
CFLAGS += -fPIC
endif
endif
endif endif
ifeq ($(LIBTYPE),shared) ifeq ($(LIBTYPE),shared)

2
make/linux-rpm-build.mk
View file

@ -202,7 +202,7 @@ erase-rpm:
ssh -l root $(HOST) rpm -e $(KERNEL_BASE)-run $(KERNEL_BASE)-devel 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 -maxdepth 1 -type f | grep -ve "setup\|trash\|CVS"`
mv ../kernel.tar.gz . mv ../kernel.tar.gz .
clean: clean:
rm -rf $(KERNEL_BASE)-* rm -rf $(KERNEL_BASE)-*

7
make/ytools.mk.in
View file

@ -49,7 +49,14 @@ else
endif endif
LDFLAGS += -lytools -ldl -pthread LDFLAGS += -lytools -ldl -pthread
ARCH = @ARCH@
LD_LIB_PATH=$(TOPDIR)/lib 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) 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