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

make: Add support for linking shared libs correctly

Browse source
This commit is contained in:
Jan Lindemann 2002-07-02 12:49:50 +00:00 • committed by Jan Lindemann
commit bf5ee92e61
4 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
make/cfg_dev.mk
View file

@ -7,29 +7,29 @@
PREFIX = $(HOME)/dat/test/$(PROJECT)-$(shell cat $(TOPDIR)/VERSION) PREFIX = $(HOME)/dat/test/$(PROJECT)-$(shell cat $(TOPDIR)/VERSION)
VAR_PREFIX = $(PREFIX)/var VAR_PREFIX = $(PREFIX)/var
DOC_PREFIX = $(PREFIX)/doc/$(PROJECT) DOC_PREFIX = $(PREFIX)/doc/$(PROJECT)
EXEGROUP = $(shell id -g) EXEGROUP = $(shell id -gn)
EXEOWNER = $(shell whoami) EXEOWNER = $(shell whoami)
EXEMODE = 770 EXEMODE = 770
CFGGROUP = $(shell id -g) CFGGROUP = $(shell id -gn)
CFGOWNER = $(shell whoami) CFGOWNER = $(shell whoami)
CFGMODE = 660 CFGMODE = 660
CTRLGROUP = $(shell id -g) CTRLGROUP = $(shell id -gn)
CTRLOWNER = $(shell whoami) CTRLOWNER = $(shell whoami)
CTRLMODE = 770 CTRLMODE = 770
INITGROUP = $(shell id -g) INITGROUP = $(shell id -gn)
INITOWNER = $(shell whoami) INITOWNER = $(shell whoami)
INITMODE = 770 INITMODE = 770
LIBGROUP = $(shell id -g) LIBGROUP = $(shell id -gn)
LIBOWNER = $(shell whoami) LIBOWNER = $(shell whoami)
LIBMODE = 770 LIBMODE = 770
HDRGROUP = $(shell id -g) HDRGROUP = $(shell id -gn)
HDROWNER = $(shell whoami) HDROWNER = $(shell whoami)
HDRMODE = 644 HDRMODE = 644
INITDIR = $(HOME)/bin INITDIR = $(HOME)/bin
PIDDIR = $(VAR_PREFIX)/run PIDDIR = $(VAR_PREFIX)/run
DAEMON_RUN_DIR = $(HOME) DAEMON_RUN_DIR = $(HOME)
DAEMON_RUN_USER = $(shell whoami) DAEMON_RUN_USER = $(shell whoami)
DAEMON_RUN_GROUP = $(shell id -g) DAEMON_RUN_GROUP = $(shell id -gn)
LOGNAME = $(shell whoami)-$(PROJECT) LOGNAME = $(shell whoami)-$(PROJECT)
DOWNLOADDIRS = root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT) DOWNLOADDIRS = root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT)
CLIENT_INC_DIR = $(TOPDIR)/../shared/tools CLIENT_INC_DIR = $(TOPDIR)/../shared/tools

6
make/defs-orig.mk
View file

@ -144,7 +144,7 @@ CFLAGS += $(CFLAGS_DEBUG)
CPPFLAGS += $(CFLAGS_DEBUG) CPPFLAGS += $(CFLAGS_DEBUG)
endif endif
LIBDIR = $(MODDIR)/lib LIBDIR = $(TOPDIR)/lib
INSTALLED_SHOBJS = $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS)) INSTALLED_SHOBJS = $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS))
ifeq ($(USE_QT),true) ifeq ($(USE_QT),true)
@ -192,10 +192,14 @@ RM = rm
AR = ar AR = ar
ifdef INSTALL_LOG ifdef INSTALL_LOG
INSTALL=$(MODDIR)/devutil/scripts/log_install.sh -l $(INSTALL_LOG) INSTALL=$(MODDIR)/devutil/scripts/log_install.sh -l $(INSTALL_LOG)
LINK_LIB=$(MODDIR)/devutil/scripts/log_install.sh -L -l $(INSTALL_LOG)
else else
ifndef INSTALL ifndef INSTALL
INSTALL = install INSTALL = install
endif endif
ifndef LINK_LIB
LINK_LIB=$(MODDIR)/devutil/scripts/log_install.sh -L
endif
endif endif

4
make/mkspec.sh
View file

@ -114,8 +114,8 @@ echo "export INSTALL_LOG=$INSTALL_LOG"
echo "mkdir -p `dirname $INSTALL_LOG`" echo "mkdir -p `dirname $INSTALL_LOG`"
echo "> $INSTALL_LOG" echo "> $INSTALL_LOG"
echo "make install" echo "make install"
echo "cat $INSTALL_LOG | sed \"s% \$RPM_BUILD_ROOT% %\" | grep -ve 'include\|devel' > $INSTALL_LOG.$NAME" echo "cat $INSTALL_LOG | sed \"s% \$RPM_BUILD_ROOT% %\" | grep -ve 'include\|devel\|make\|lib.*\.a$' > $INSTALL_LOG.$NAME"
echo "cat $INSTALL_LOG | sed \"s% \$RPM_BUILD_ROOT% %\" | grep -e 'include\|devel' > $INSTALL_LOG.$NAME-devel" echo "cat $INSTALL_LOG | sed \"s% \$RPM_BUILD_ROOT% %\" | grep -e 'include\|devel\|make\|lib.*\.a$' > $INSTALL_LOG.$NAME-devel"
#echo "install -m 755 $TOPDIR/lib/*.so \$RPM_BUILD_ROOT/opt/ytools/lib" #echo "install -m 755 $TOPDIR/lib/*.so \$RPM_BUILD_ROOT/opt/ytools/lib"
#echo "install -m 644 $TOPDIR/doc/ytools/dist/* \$RPM_BUILD_ROOT/usr/share/doc/packages/ytools" #echo "install -m 644 $TOPDIR/doc/ytools/dist/* \$RPM_BUILD_ROOT/usr/share/doc/packages/ytools"
#echo "install -m 644 $TOPDIR/COPYING \$RPM_BUILD_ROOT/usr/share/doc/packages/ytools" #echo "install -m 644 $TOPDIR/COPYING \$RPM_BUILD_ROOT/usr/share/doc/packages/ytools"

15
make/rules.mk
View file

@ -72,10 +72,17 @@ $(LIBS):
$(INSTALL_HDRDIR) $(INSTALL_BINDIR) $(INSTALL_LIBDIR) $(INSTALL_MKDIR): $(INSTALL_HDRDIR) $(INSTALL_BINDIR) $(INSTALL_LIBDIR) $(INSTALL_MKDIR):
mkdir -p $@ mkdir -p $@
$(INSTALLED_LIB_SO) $(INSTALLED_LIB_A): $(INSTALL_LIBDIR) $(INSTALLED_LIB_SO) $(INSTALLED_LIB_A): libdir.done
$(INSTALLED_LINKS_SO) $(LINKS_SO): libdir.done:
cd $(dir $@); ln -sf $(notdir $(shell echo $@ | sed -e 's/\.so$$\|\.so.*$$//').$(SO_SUFFIX)) $(notdir $@) mkdir -p $(INSTALL_LIBDIR)
touch $@
$(LINKS_SO):
cd $(dir $@); ln -sf $(shell echo $@ | sed -e 's/\.so$$\|\.so.*$$//').$(SO_SUFFIX) $(notdir $@)
#$(INSTALLED_LINKS_SO) $(LINKS_SO):
# $(LINK_LIB) $(shell echo $@ | sed -e 's/\.so$$\|\.so.*$$//').$(SO_SUFFIX) $@
#$(INSTALL_BINDIR)/%.bin: %.bin #$(INSTALL_BINDIR)/%.bin: %.bin
# $(INSTALL) -o $(EXEOWNER) -g $(EXEGROUP) -m $(EXEMODE) $< $@ # $(INSTALL) -o $(EXEOWNER) -g $(EXEGROUP) -m $(EXEMODE) $< $@
@ -91,6 +98,8 @@ $(INSTALL_LIBDIR)/%.so: %.so
$(INSTALL) -o $(LIBOWNER) -g $(LIBGROUP) -m $(LIBMODE) $< $@ $(INSTALL) -o $(LIBOWNER) -g $(LIBGROUP) -m $(LIBMODE) $< $@
$(INSTALL_LIBDIR)/%.$(SO_SUFFIX): %.$(SO_SUFFIX) $(INSTALL_LIBDIR)/%.$(SO_SUFFIX): %.$(SO_SUFFIX)
$(INSTALL) -o $(LIBOWNER) -g $(LIBGROUP) -m $(LIBMODE) $< $@ $(INSTALL) -o $(LIBOWNER) -g $(LIBGROUP) -m $(LIBMODE) $< $@
$(INSTALL_LIBDIR)/%.a: %.a
$(INSTALL) -o $(LIBOWNER) -g $(LIBGROUP) -m $(LIBMODE) $< $@
$(INSTALL_HDRDIR)/%.h: %.h $(INSTALL_HDRDIR)/%.h: %.h
$(INSTALL) -o $(HDROWNER) -g $(HDRGROUP) -m $(HDRMODE) $< $@ $(INSTALL) -o $(HDROWNER) -g $(HDRGROUP) -m $(HDRMODE) $< $@