[Asterisk-cvs] asterisk/funcs Makefile,1.10,1.11

[kpfleming]

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

Modified Files:
	Makefile 
Log Message:
correct cygwin detection (issue #5328)
handle parallel make better (issue #5328)


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/funcs/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile	30 Aug 2005 02:54:02 -0000	1.10
+++ Makefile	5 Oct 2005 00:17:57 -0000	1.11
@@ -29,11 +29,11 @@
 
 FUNCS+=$(STANDALONE_FUNCS:.o=.so)
 
-FUNC_STRUCTS=$(shell grep 'struct ast_custom_function' $(BUILTINS:.o=.c) | awk '{print $$3};')
+FUNC_SOURCES=$(BUILTINS:.o=.c)
 
-CFLAGS+=-fPIC
+FUNC_STRUCTS=$(shell grep 'struct ast_custom_function' $(FUNC_SOURCES) | awk '{print $$3};')
 
-FUNC_SOURCES=$(BUILTINS:.o=.c)
+CFLAGS+=-fPIC
 
 ifeq ($(findstring BSD,${OSARCH}),BSD)
   CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
@@ -49,13 +49,15 @@
 
 #$(BUILTINS) : CFLAGS += -DBUILTIN_FUNC
 
-pbx_functions.h: $(BUILTINS:.o=.c)
+pbx_functions.h: $(FUNC_SOURCES)
 	@echo "/* Automatically generated - do not edit */" > $@
 	@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.o: pbx_functions.h
+
 pbx_functions.so: pbx_functions.o #$(BUILTINS)
 	$(CC) $(SOLINK) -o $@ $<