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

6
make/defs.mk
View file

@ -103,6 +103,7 @@ INSTALL_BINDIR = $(PREFIX)/bin
endif
BUILD_BINDIR = $(TOPDIR)/bin
LIBDIR = $(TOPDIR)/lib
INSTALL_DOCDIR_DIST = $(DOC_PREFIX)
INSTALL_DOCDIR_DEVEL = $(DOC_PREFIX)-devel
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)
LIB_A = $(LIBDIR)/lib$(LIBNAME).a
LIB_SO = $(LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
VERSION_SCRIPT = $(LIBDIR)/version.ldscript
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))
LINKS_SO = $(shell echo $(LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO))
INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
@ -141,9 +144,6 @@ LDFFTW = -lrfftw -lfftw -lm
#LDAUDIO = -laudiofile
CORE = $(wildcard core core.*)
LIBDIR = $(TOPDIR)/lib
INSTALLED_SHOBJS = $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS))
ifeq ($(USE_QT),true)
USE_X = true