Changeset 5154 for pjproject/trunk/build/rules.mak

Timestamp:

Aug 7, 2015 12:52:09 PM (9 years ago)

Author:

nanang

Message:

Misc (re #1843): Fixed compile warnings of "command line option '-frtti' is valid for C++/ObjC++ but not for C" on "make depend" for Android targets.

File:

• pjproject/trunk/build/rules.mak (modified) (3 diffs)

pjproject/trunk/build/rules.mak

@@ -58 +58 @@
 # CFLAGS or CXXFLAGS (not both). But I just couldn't make if/ifeq to work.
 #
-DEPFLAGS = $($(APP)_CXXFLAGS) $($(APP)_CFLAGS)
+#DEPFLAGS = $($(APP)_CXXFLAGS) $($(APP)_CFLAGS)
+DEPCFLAGS =  $($(APP)_CFLAGS)
+DEPCXXFLAGS = $($(APP)_CXXFLAGS)
 
 # Dependency file
@@ -77 +79 @@
         @echo $(APP)_CXXFLAGS=$($(APP)_CXXFLAGS)
         @echo $(APP)_LDFLAGS=$($(APP)_LDFLAGS)
-        @echo DEPFLAGS=$(DEPFLAGS)
+#       @echo DEPFLAGS=$(DEPFLAGS)
         @echo CC=$(CC)
         @echo AR=$(AR)
@@ -217 +219 @@
            if test -f $$F; then \
              echo "$(OBJDIR)/" | tr -d '\n' >> $(DEP_FILE); \
-             if $(CC) -M $(DEPFLAGS) $$F | sed '/^#/d' >> $(DEP_FILE); then \
+             if echo $$F | grep -q .cpp$$; then \
+                dep="$(CC) -M $(DEPCXXFLAGS) $$F"; \
+             else \
+                dep="$(CC) -M $(DEPCFLAGS) $$F"; \
+             fi; \
+             if eval $$dep | sed '/^#/d' >> $(DEP_FILE); then \
                 true; \
              else \