janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-23 14:30:39 +01:00
Code Activity

make: Clean up library dependencies

Browse source 
Clean up dependencies of version.ldscript, libdir.done in defs.mk and
rules.mk.
This commit is contained in:
Jan Lindemann 2005-05-07 16:44:31 +00:00 • committed by Jan Lindemann
commit 81de57cbd9
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/Makefile
View file

@ -4,8 +4,6 @@
# $Id$ # $Id$
MODDIR = .. MODDIR = ..
include $(MODDIR)/make/ytools.mk include $(MODDIR)/make/ytools.mk
include $(MODDIR)/make/make.mk include $(MODDIR)/make/make.mk
tst:
echo $(AC_FILES_IN)

6
make/defs.mk
View file

@ -103,6 +103,7 @@ INSTALL_BINDIR = $(PREFIX)/bin
endif endif
BUILD_BINDIR = $(TOPDIR)/bin BUILD_BINDIR = $(TOPDIR)/bin
LIBDIR = $(TOPDIR)/lib
INSTALL_DOCDIR_DIST = $(DOC_PREFIX) INSTALL_DOCDIR_DIST = $(DOC_PREFIX)
INSTALL_DOCDIR_DEVEL = $(DOC_PREFIX)-devel INSTALL_DOCDIR_DEVEL = $(DOC_PREFIX)-devel
DOCS = $(wildcard README CHANGES TODO LICENSE AUTHORS CREDITS *.pdf *.txt *.html) DOCS = $(wildcard README CHANGES TODO LICENSE AUTHORS CREDITS *.pdf *.txt *.html)
@ -116,7 +117,9 @@ INSTALLED_DOCS_DEVEL = $(addprefix $(INSTALL_DOCDIR_DEVEL)/,$(DOCS))
SO_SUFFIX = so.$(shell echo $(VERSION) | cut -d- -f1) SO_SUFFIX = so.$(shell echo $(VERSION) | cut -d- -f1)
LIB_A = $(LIBDIR)/lib$(LIBNAME).a LIB_A = $(LIBDIR)/lib$(LIBNAME).a
LIB_SO = $(LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX) LIB_SO = $(LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
VERSION_SCRIPT = $(LIBDIR)/version.ldscript
INSTALLED_LIB_SO = $(INSTALL_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX) INSTALLED_LIB_SO = $(INSTALL_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
INSTALLED_SHOBJS = $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS))
INSTALLED_LINKS_SO = $(shell echo $(INSTALLED_LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO)) INSTALLED_LINKS_SO = $(shell echo $(INSTALLED_LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO))
LINKS_SO = $(shell echo $(LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO)) LINKS_SO = $(shell echo $(LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO))
INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
@ -141,9 +144,6 @@ LDFFTW = -lrfftw -lfftw -lm
#LDAUDIO = -laudiofile #LDAUDIO = -laudiofile
CORE = $(wildcard core core.*) CORE = $(wildcard core core.*)
LIBDIR = $(TOPDIR)/lib
INSTALLED_SHOBJS = $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS))
ifeq ($(USE_QT),true) ifeq ($(USE_QT),true)
USE_X = true USE_X = true

12
make/rules.mk
View file

@ -54,10 +54,10 @@ lib%.so: %.o
$(CC) $(LDFLAGS) $^ -o $@ $(CC) $(LDFLAGS) $^ -o $@
endif endif
version.ldscript: $(VERSION_SCRIPT):
$(MOD_SCRIPT_DIR)/make_version_script.sh $(BINARY_VERSION) > $@ $(MOD_SCRIPT_DIR)/make_version_script.sh $(BINARY_VERSION) > $@
$(LIB_SO): version.ldscript $(LIB_A) $(LIB_SO): $(VERSION_SCRIPT) $(LIB_A)
$(CC) -shared -Wl,--whole-archive,-soname=$(notdir $@) $^ -Wl,--no-whole-archive \ $(CC) -shared -Wl,--whole-archive,-soname=$(notdir $@) $^ -Wl,--no-whole-archive \
$(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@ $(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@
@ -120,10 +120,12 @@ $(INSTALL_HDRDIR) $(INSTALL_BINDIR) $(INSTALL_LIBDIR) $(INSTALL_MKDIR):
$(INSTALLED_LIB_SO) $(INSTALLED_LIB_A): $(TOPDIR)/libdir.done $(INSTALLED_LIB_SO) $(INSTALLED_LIB_A): $(TOPDIR)/libdir.done
$(TOPDIR)/libdir.done: $(INSTALL_LIBDIR) $(TOPDIR)/libdir.done:
if [ -n "$(INSTALL_LIBDIR)" ]; then mkdir -p $(INSTALL_LIBDIR); fi
touch $@ touch $@
hdrdir.done: $(INSTALL_HDRDIR) hdrdir.done:
if [ -n "$(INSTALL_HDRDIR)" ]; then mkdir -p $(INSTALL_HDRDIR); fi
touch $@ touch $@
$(LINKS_SO): $(LINKS_SO):
@ -236,7 +238,7 @@ localclean: $(LOCAL_CLEAN)
rm -rf $(CLEAN) rm -rf $(CLEAN)
libclean: libclean:
rm -rf $(LIB_A) $(LIB_SO) version.ldscript rm -rf $(LIB_A) $(LIB_SO) $(VERSION_SCRIPT)
vcdistclean: vcdistclean:
rm -rf *.plg *.opt *.ncb Debug *.exe dist *.ilk rm -rf *.plg *.opt *.ncb Debug *.exe dist *.ilk