ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-23 04:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bootstrap with automake 1.7

Browse Source 
fix generation of modules.conf from modules.conf.in on first build
some more steps towards removing gmake specific stuff from our makefiles.



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4617 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris
2007-03-16 19:20:24 +00:00
parent b9e033535b
commit 4ffd0bc0bd
8 changed files with 564 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mod/Makefile.am
+21 -12
View File
@@ -1,15 +1,16 @@
CONF_MODULES=$(shell grep -v "\#" $(switch_builddir)/modules.conf)
FOUND_MODULES=$(shell find . -type d -name mod_\*)
OUR_MODULES=`if test -z "$(MODULES)" ; then echo $(CONF_MODULES) ; else echo $(MODULES) ; fi ;`
OUR_CLEAN_MODULES=`if test -z "$(MODULES)" ; then echo $(CONF_MODULES) $(FOUND_MODULES) ; else echo $(MODULES) ; fi ;`
CONF_MODULES=if test ! -f $(switch_builddir)/modules.conf ; then cp $(switch_builddir)/modules.conf.in $(switch_builddir)/modules.conf ; fi ; conf_modules=`grep -v "\#" $(switch_builddir)/modules.conf` ;
FOUND_MODULES=found_modules=`find . -type d -name mod_\*` ;
OUR_MODULES=if test -z "$(MODULES)" ; then our_modules=$$conf_modules ; else our_modules=$(MODULES) ; fi ;
OUR_CLEAN_MODULES=if test -z "$(MODULES)" ; then our_clean_modules=`echo $$conf_modules $$found_modules` ; else our_clean_modules=$(MODULES) ; fi ;
MOD_NAME=`echo $$i | sed -e 's|^.*/||'`
MOD_DIR=`if test -d $(switch_srcdir)/src/mod/$$i ; then echo $(switch_srcdir)/src/mod/$$i ; else echo $$i ; fi;`
all:
@if [ ! -f $(switch_builddir)/modules.conf ] ; then cp $(switch_builddir)/modules.conf.in $(switch_builddir)/modules.conf ; fi
@echo making modules
@for i in $(OUR_MODULES) ; do \
@$(CONF_MODULES) \
$(OUR_MODULES) \
echo making modules ; \
for i in $$our_modules ; do \
echo making $$i ; \
moddir=$(MOD_DIR); \
if test -f $$moddir/Makefile ; then \
@@ -19,7 +20,11 @@ all:
done
clean:
@for i in $(OUR_CLEAN_MODULES) ; do \
@$(CONF_MODULES) \
$(FOUND_MODULES) \
$(OUR_CLEAN_MODULES) \
echo making clean modules ; \
for i in $$our_clean_modules ; do \
echo making clean $$i ; \
moddir=$(MOD_DIR); \
if test -f $$moddir/Makefile ; then \
@@ -29,8 +34,10 @@ clean:
done
install:
@echo Installing Modules
@for i in $(OUR_MODULES) ; do \
@$(CONF_MODULES) \
$(OUR_MODULES) \
echo Installing Modules ; \
for i in $$our_modules ; do \
echo making install $$i ; \
moddir=$(MOD_DIR); \
if test -f $$moddir/Makefile ; then \
@@ -41,8 +48,10 @@ install:
@echo done
uninstall:
@echo Uninstalling Modules
@for i in $(OUR_MODULES) ; do \
@$(CONF_MODULES) \
$(OUR_MODULES) \
echo Uninstalling Modules ; \
for i in $$our_modules ; do \
echo making uninstall $$i ; \
moddir=$(MOD_DIR); \
if test -f $$moddir/Makefile ; then \
src/mod/Makefile.in
+21 -12
View File
@@ -165,10 +165,10 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
uint64_t_fmt = @uint64_t_fmt@
voidp_size = @voidp_size@
CONF_MODULES = $(shell grep -v "\#" $(switch_builddir)/modules.conf)
FOUND_MODULES = $(shell find . -type d -name mod_\*)
OUR_MODULES = `if test -z "$(MODULES)" ; then echo $(CONF_MODULES) ; else echo $(MODULES) ; fi ;`
OUR_CLEAN_MODULES = `if test -z "$(MODULES)" ; then echo $(CONF_MODULES) $(FOUND_MODULES) ; else echo $(MODULES) ; fi ;`
CONF_MODULES = if test ! -f $(switch_builddir)/modules.conf ; then cp $(switch_builddir)/modules.conf.in $(switch_builddir)/modules.conf ; fi ; conf_modules=`grep -v "\#" $(switch_builddir)/modules.conf` ;
FOUND_MODULES = found_modules=`find . -type d -name mod_\*` ;
OUR_MODULES = if test -z "$(MODULES)" ; then our_modules=$$conf_modules ; else our_modules=$(MODULES) ; fi ;
OUR_CLEAN_MODULES = if test -z "$(MODULES)" ; then our_clean_modules=`echo $$conf_modules $$found_modules` ; else our_clean_modules=$(MODULES) ; fi ;
MOD_NAME = `echo $$i | sed -e 's|^.*/||'`
MOD_DIR = `if test -d $(switch_srcdir)/src/mod/$$i ; then echo $(switch_srcdir)/src/mod/$$i ; else echo $$i ; fi;`
all: all-am
@@ -319,9 +319,10 @@ uninstall-am: uninstall-info-am
all:
@if [ ! -f $(switch_builddir)/modules.conf ] ; then cp $(switch_builddir)/modules.conf.in $(switch_builddir)/modules.conf ; fi
@echo making modules
@for i in $(OUR_MODULES) ; do \
@$(CONF_MODULES) \
$(OUR_MODULES) \
echo making modules ; \
for i in $$our_modules ; do \
echo making $$i ; \
moddir=$(MOD_DIR); \
if test -f $$moddir/Makefile ; then \
@@ -331,7 +332,11 @@ all:
done
clean:
@for i in $(OUR_CLEAN_MODULES) ; do \
@$(CONF_MODULES) \
$(FOUND_MODULES) \
$(OUR_CLEAN_MODULES) \
echo making clean modules ; \
for i in $$our_clean_modules ; do \
echo making clean $$i ; \
moddir=$(MOD_DIR); \
if test -f $$moddir/Makefile ; then \
@@ -341,8 +346,10 @@ clean:
done
install:
@echo Installing Modules
@for i in $(OUR_MODULES) ; do \
@$(CONF_MODULES) \
$(OUR_MODULES) \
echo Installing Modules ; \
for i in $$our_modules ; do \
echo making install $$i ; \
moddir=$(MOD_DIR); \
if test -f $$moddir/Makefile ; then \
@@ -353,8 +360,10 @@ install:
@echo done
uninstall:
@echo Uninstalling Modules
@for i in $(OUR_MODULES) ; do \
@$(CONF_MODULES) \
$(OUR_MODULES) \
echo Uninstalling Modules ; \
for i in $$our_modules ; do \
echo making uninstall $$i ; \
moddir=$(MOD_DIR); \
if test -f $$moddir/Makefile ; then \