[Freeswitch-svn] [commit] r4559 - in freeswitch/trunk/src/mod: directories/mod_ldap languages/mod_spidermonkey languages/mod_spidermonkey_teletone

[Freeswitch SVN]

Author: mikej
Date: Sun Mar 11 12:24:34 2007
New Revision: 4559

Modified:
   freeswitch/trunk/src/mod/directories/mod_ldap/Makefile
   freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak
   freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile

Log:
fix include paths and makefiles

Modified: freeswitch/trunk/src/mod/directories/mod_ldap/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/directories/mod_ldap/Makefile	(original)
+++ freeswitch/trunk/src/mod/directories/mod_ldap/Makefile	Sun Mar 11 12:24:34 2007
@@ -10,11 +10,11 @@
 	MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install openldap-2.3.19.tgz --prefix=$(PREFIX) --disable-bdb --disable-hdb
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
-	$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o 
-	$(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN)  $(MODNAME).o $(LDFLAGS)
+	$(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o 
+	$(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) 
 
 clean:
-	rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
+	rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
 
 install:
-	cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+	$(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod

Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak	(original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak	Sun Mar 11 12:24:34 2007
@@ -1,2 +1,2 @@
-CFLAGS += -I$(BASE)/libs/js/src -I$(BASE)/libs/js/nsprpub/include -DXP_UNIX -I../mod_spidermonkey  -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1
+CFLAGS += -I$(BASE)/libs/js/src -I$(BASE)/libs/js/nsprpub/dist/include/nspr  -DXP_UNIX -I../mod_spidermonkey  -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1
 LDFLAGS += -L$(BASE)/libs/js/nsprpub/pr/src -L$(BASE)/libs/js/nsprpub/dist/lib -lnspr4 $(BASE)/libs/js/libjs.la

Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile	(original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile	Sun Mar 11 12:24:34 2007
@@ -1,4 +1,5 @@
 include ../mod_spidermonkey/sm.mak
+CFLAGS+=-I$(BASE)/libs/libteletone/src
 LDFLAGS+=$(BASE)/libs/libteletone/libteletone.la
 
 all:	depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)