retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed building out of source tree (thanks mikma), silenced a benign message. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@1524 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2007-12-10 15:34:48 +00:00
parent 5ecb976700
commit 03e9405f6d
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf.d/Makefile.in
View File

@ -17,7 +17,7 @@ all:
.PHONY: install
install:
@mkdir -p "$(DESTDIR)$(confdir)/" && \
lst="`ls -1 @srcdir@/*.conf @srcdir@/*.sample @srcdir@/*.default | sed 's/\.sample//g; s/\.default//g; s/[^ ]*\*\.[^ ]*//g' | sort | uniq`" ; \
lst="`ls -1 @srcdir@/*.conf @srcdir@/*.sample @srcdir@/*.default 2>/dev/null | sed 's/\.sample//g; s/\.default//g; s/[^ ]*\*\.[^ ]*//g' | sort | uniq`" ; \
for s in $$lst; do \
d="$(DESTDIR)$(confdir)/`echo $$s | sed 's,.*/,,'`" ; \
if [ -f "$$d" ]; then \

20
modules/Makefile.in
View File

@ -117,7 +117,7 @@ moddir = $(basedir)/modules
-include YateLocal.mak
.PHONY: all debug ddebug xdebug
all: do-all $(LIBS) $(PROGS)
all: subdirs do-all $(LIBS) $(PROGS)
debug:
$(MAKE) all DEBUG=-g3 MODSTRIP=
@ -156,6 +156,10 @@ uninstall: do-uninstall
@-rmdir "$(DESTDIR)$(moddir)"
@-rmdir "$(DESTDIR)$(basedir)"
.PHONY: subdirs
subdirs:
@mkdir -p client server gtk2
%.o: @srcdir@/%.cpp $(MKDEPS) $(INCFILES)
$(COMPILE) -c $<
@ -178,12 +182,20 @@ lib%.so: %.o
%.yate: @srcdir@/%.cpp $(MKDEPS) $(INCFILES)
$(MODCOMP) -o $@ $(LOCALFLAGS) $< $(LOCALLIBS)
server/%.yate: @srcdir@/server/%.cpp $(MKDEPS) $(INCFILES)
$(MODCOMP) -o $@ $(LOCALFLAGS) $< $(LOCALLIBS)
client/%.yate: @srcdir@/client/%.cpp $(MKDEPS) $(INCFILES)
$(MODCOMP) -o $@ $(LOCALFLAGS) $< $(LOCALLIBS)
gtk2/%.yate: @srcdir@/gtk2/%.cpp $(MKDEPS) $(INCFILES)
$(MODCOMP) -o $@ $(LOCALFLAGS) $< $(LOCALLIBS)
# Take special care of the modules that depend on optional libs
server/ysigchan.yate server/wpcard.yate server/zapcard.yate server/analog.yate: ../libyatesig.so
server/ysigchan.yate server/wpcard.yate server/analog.yate: LOCALFLAGS = -I../libs/ysig
server/zapcard.yate: LOCALFLAGS = -I../libs/ysig @ZAP_FLAGS@
server/ysigchan.yate server/wpcard.yate server/analog.yate: LOCALFLAGS = -I@top_srcdir@/libs/ysig
server/zapcard.yate: LOCALFLAGS = -I@top_srcdir@/libs/ysig @ZAP_FLAGS@
server/ysigchan.yate server/wpcard.yate server/zapcard.yate server/analog.yate: LOCALLIBS = -lyatesig
h323chan.yate: LOCALFLAGS = -DPHAS_TEMPLATES -D_REENTRANT -DP_HAS_SEMAPHORES @H323_INC@
@ -251,7 +263,7 @@ rmanager.yate: LOCALLIBS = $(COREDUMP_LIB)
../libs/ilbc/libilbc.a:
$(MAKE) -C ../libs/ilbc
../libs/ysip/libyatesip.a:
$(MAKE) -C ../libs/ysip