Update of /usr/cvsroot/asterisk/funcs
In directory mongoose.digium.com:/tmp/cvs-serv23169/funcs

Modified Files:
        Makefile 
Log Message:
Build as a single executable, work around Makefile issue


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/funcs/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile    5 May 2005 12:43:04 -0000       1.2
+++ Makefile    5 May 2005 17:39:18 -0000       1.3
@@ -23,25 +23,27 @@
 
 CFLAGS+=-fPIC
 
+FUNC_SOURCES=$(BUILTINS:.o=.c)
+
 all: $(FUNCS)
 
 clean:
-       rm -f *.so *.o .depend
+       rm -f *.so *.o .depend pbx_functions.h
 
 %.so : %.o
        $(CC) $(SOLINK) -o $@ $<
 
-$(BUILTINS) : CFLAGS += -DBUILTIN_FUNC
+#$(BUILTINS) : CFLAGS += -DBUILTIN_FUNC
 
 pbx_functions.h: $(BUILTINS:.o=.c)
        @echo "/* Automatically generated - do not edit */" > $@
-       @for f in $(FUNC_STRUCTS); do echo "extern struct ast_custom_function 
$$f;" >> $@; done
+       @for f in $(FUNC_SOURCES); do echo "#include \"$$f\"" >> $@; done
        @echo "static struct ast_custom_function *builtins[] = {" >> $@
        @for f in $(FUNC_STRUCTS); do echo "&$$f," >> $@; done
        @echo "};" >> $@
 
-pbx_functions.so: pbx_functions.o $(BUILTINS)
-       $(CC) $(SOLINK) -o $@ $(BUILTINS) $<
+pbx_functions.so: pbx_functions.o #$(BUILTINS)
+       $(CC) $(SOLINK) -o $@ $<
        strip $(foreach f,$(FUNC_STRUCTS),-N $(f)) $@
 
 install: all

_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs

Reply via email to