Author: mikej Date: Fri Mar 16 23:00:30 2007 New Revision: 4625 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/Makefile.in Log: rebuild core libraries if the directory or the .update file changes Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Mar 16 23:00:30 2007 @@ -12,6 +12,7 @@ LIBTOOL=$(switch_builddir)/libtool LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) +TOUCH_TARGET=if test -f "$@" ; then touch "$@" ; fi ; if CRASHPROT AM_CFLAGS += -DCRASH_PROT @@ -85,8 +86,6 @@ libfreeswitch_la_LIBADD = $(CORE_LIBS) nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h -$(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(library_include_HEADERS) - MOD_LINK = $(BASE)/libfreeswitch.la CLEANFILES = src/include/switch_version.h @@ -144,16 +143,35 @@ yesdepends: rm .nodepends -$(CORE_LIBS): - cd libs/sqlite && $(MAKE) +libs/apr/libapr-1.la: libs/apr libs/apr/.update cd libs/apr && $(MAKE) + $(TOUCH_TARGET) + +libs/apr-util/libaprutil-1.la: libs/apr-util libs/apr-util/.update cd libs/apr-util && $(MAKE) + $(TOUCH_TARGET) + +libs/sqlite/libsqlite3.la: libs/sqlite libs/sqlite/.update + cd libs/sqlite && $(MAKE) + $(TOUCH_TARGET) + +libs/pcre/libpcre.la: libs/pcre libs/pcre/.update cd libs/pcre && $(MAKE) + $(TOUCH_TARGET) + +libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update cd libs/srtp && $(MAKE) - cd libs/libresample && $(MAKE) + $(TOUCH_TARGET) + +libs/libteletone/libteletone.la: libs/libteletone libs/libteletone/.update cd libs/libteletone && $(MAKE) + $(TOUCH_TARGET) + +libs/libresample/libresample.la: libs/libresample libs/libresample/.update + cd libs/libresample && $(MAKE) + $(TOUCH_TARGET) -core: $(CORE_LIBS) libfreeswitch.la +core: libfreeswitch.la install_core: install-libLTLIBRARIES Modified: freeswitch/trunk/Makefile.in ============================================================================== --- freeswitch/trunk/Makefile.in (original) +++ freeswitch/trunk/Makefile.in Fri Mar 16 23:00:30 2007 @@ -299,6 +299,7 @@ BASE = $(switch_srcdir) OSARCH = `uname -s` LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) +TOUCH_TARGET = if test -f "$@" ; then touch "$@" ; fi ; libfreeswitch_la_SOURCES = \ src/switch_apr.c \ src/switch_buffer.c \ @@ -1085,8 +1086,6 @@ uninstall-libLTLIBRARIES uninstall-library_includeHEADERS -$(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(library_include_HEADERS) - install-data-local: @echo Installing $(NAME) @for x in conf mod db log log/xml_cdr bin scripts htdocs grammar ; do \ @@ -1133,16 +1132,35 @@ yesdepends: rm .nodepends -$(CORE_LIBS): - cd libs/sqlite && $(MAKE) +libs/apr/libapr-1.la: libs/apr libs/apr/.update cd libs/apr && $(MAKE) + $(TOUCH_TARGET) + +libs/apr-util/libaprutil-1.la: libs/apr-util libs/apr-util/.update cd libs/apr-util && $(MAKE) + $(TOUCH_TARGET) + +libs/sqlite/libsqlite3.la: libs/sqlite libs/sqlite/.update + cd libs/sqlite && $(MAKE) + $(TOUCH_TARGET) + +libs/pcre/libpcre.la: libs/pcre libs/pcre/.update cd libs/pcre && $(MAKE) + $(TOUCH_TARGET) + +libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update cd libs/srtp && $(MAKE) - cd libs/libresample && $(MAKE) + $(TOUCH_TARGET) + +libs/libteletone/libteletone.la: libs/libteletone libs/libteletone/.update cd libs/libteletone && $(MAKE) + $(TOUCH_TARGET) + +libs/libresample/libresample.la: libs/libresample libs/libresample/.update + cd libs/libresample && $(MAKE) + $(TOUCH_TARGET) -core: $(CORE_LIBS) libfreeswitch.la +core: libfreeswitch.la install_core: install-libLTLIBRARIES