[asterisk-commits] build tools: Update Makefile.product rules (repotools[master])

[SVN commits to the Asterisk project]

George Joseph has submitted this change and it was merged.

Change subject: build_tools:  Update Makefile.product_rules
......................................................................


build_tools:  Update Makefile.product_rules

Tweaked with a few changes noticed during testing

Change-Id: Ia59ab89ae489d615b9859eb879e7a0dd385b624e
---
M build_tools/Makefile.product_rules
1 file changed, 7 insertions(+), 7 deletions(-)

Approvals:
  George Joseph: Looks good to me, approved; Verified



diff --git a/build_tools/Makefile.product_rules b/build_tools/Makefile.product_rules
index ab8491b..2b4ce11 100644
--- a/build_tools/Makefile.product_rules
+++ b/build_tools/Makefile.product_rules
@@ -99,25 +99,25 @@
 	@rm -f $@.tmp
 
 asterisk/include/asterisk/buildopts.h: | asterisk/configure
-	@echo "Initializing asterisk source directory.  This may take a minute... $(MAKE)"
+	@echo "Initializing asterisk source directory.  This may take a minute..."
 	@(cd asterisk && $(MAKE) distclean 2>/dev/null ; ./configure && $(MAKE) include/asterisk/buildopts.h) >/dev/null
 	@sed -i -e /GCC_ATOMICS/d asterisk/include/asterisk/autoconfig.h
 
 include repotools/build_tools/Makefile.dependencies
 
 CFLAGS+=$(MODULE_SDK_CFLAGS)
-MODULE_OBJS=$(MODULE_NAME).o
+MODULE_OBJS=$(MODULE_NAME).o $(MODULE_EXTRA_OBJS)
 
-$(MODULE_NAME).o:: CFLAGS+=-DAST_MODULE=\"$(MODULE_NAME)\" -I$(ASTINCDIR)
+$(MODULE_NAME).o:: CFLAGS+=-DAST_MODULE=\"$(MODULE_NAME)\" -DAST_MODULE_SYM=\"$(MODULE_NAME)\" -I$(ASTINCDIR)
 
 .c.o::
 	$(CC) $(FLAVOR_MODE) -c $< -o $@ $(CFLAGS) $(OPT) $(DEBUG) $(WARN) $(MAKE_DEPS)
 
-$(MODULE_NAME).o: $(MODULE_NAME).c optarch.h version.h asterisk/include/asterisk/buildopts.h
+$(MODULE_OBJS): %.o :%.c optarch.h version.h asterisk/include/asterisk/buildopts.h
 	$(CC) $(FLAVOR_MODE) -c $< -o $@ $(CFLAGS) $(OPT) $(DEBUG) $(WARN) $(MAKE_DEPS)
-	
+
 $(MODULE_NAME).so: $(MODULE_OBJS) $(MODULE_SDK_LIB) $(MODULE_SDK_OBJS) $(LIBCP)
-	$(LD) -m $(FLAVOR_LDEMUL) -r -o $(MODULE_NAME)_complete.o $^ $(STATIC) $(LDFLAGS) $(LIBS) 
+	$(LD) -m $(FLAVOR_LDEMUL) -r -o $(MODULE_NAME)_complete.o $^ $(STATIC) $(LDFLAGS) $(LIBS)
 	$(CC) $(FLAVOR_MODE) $(DEBUG) $(SOLINK) -o $@ $(MODULE_NAME)_complete.o $(WHOLE_OPT) $(OPT)
 
 clean::
@@ -128,7 +128,7 @@
 	if [ -d libcp ] ; then $(MAKE) -C libcp clean ; fi
 	$(MAKE) -C asterisk distclean
 	rm -f optarch.h version.h
-	
+
 install: all
 	$(INSTALL) -m 755 $(MODULE_NAME).so $(ASTLIBDIR)/modules/$(MODULE_NAME).so
 

-- 
To view, visit https://gerrit.asterisk.org/3319
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia59ab89ae489d615b9859eb879e7a0dd385b624e
Gerrit-PatchSet: 2
Gerrit-Project: repotools
Gerrit-Branch: master
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>