Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-31 12:23:23 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

Properly seperate cxx and cflags again (#2121)

Browse Source
This commit is contained in:
kevindehecker
2017-10-18 22:16:03 +02:00
committed by Gautier Hattenberger
parent 2a6ad556f1
commit 10972bd50f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.ac
+5 -1
View File
@@ -162,13 +162,17 @@ $(SRCS_LIST) : $(CONF_XML) $(AIRFRAME_H) $(MODULES_H) autopilot_h $(SETTINGS_H)
@echo -n "headers: " >> $(SRCS_LIST) @echo -n "headers: " >> $(SRCS_LIST)
@echo $(VPATH) > $(TMP_LIST) @echo $(VPATH) > $(TMP_LIST)
@echo $($(TARGET).srcs) >> $(TMP_LIST) @echo $($(TARGET).srcs) >> $(TMP_LIST)
ifeq (,$(findstring cpp,$($(TARGET).srcs)))
@echo $(CFLAGS) >> $(TMP_LIST) @echo $(CFLAGS) >> $(TMP_LIST)
@echo $(IINCDIR) >> $(TMP_LIST) @echo $(IINCDIR) >> $(TMP_LIST)
@echo $(TOPT)>> $(TMP_LIST) @echo $(TOPT)>> $(TMP_LIST)
@echo ../../sw/tools/find_vpaths.py $(CC) $(TMP_LIST) $(PAPARAZZI_SRC) @echo ../../sw/tools/find_vpaths.py $(CC) $(TMP_LIST) $(PAPARAZZI_SRC)
ifeq (,$(findstring cpp,$($(TARGET).srcs)))
$(Q)cd $(PAPARAZZI_SRC) ; ./sw/tools/find_vpaths.py $(CC) $(TMP_LIST) $(PAPARAZZI_SRC) >> $(SRCS_LIST) $(Q)cd $(PAPARAZZI_SRC) ; ./sw/tools/find_vpaths.py $(CC) $(TMP_LIST) $(PAPARAZZI_SRC) >> $(SRCS_LIST)
else else
@echo $(CXXFLAGS) >> $(TMP_LIST)
@echo $(IINCDIR) >> $(TMP_LIST)
@echo $(TOPT)>> $(TMP_LIST)
@echo ../../sw/tools/find_vpaths.py $(CXX) $(TMP_LIST) $(PAPARAZZI_SRC)
$(Q)cd $(PAPARAZZI_SRC) ; ./sw/tools/find_vpaths.py $(CXX) $(TMP_LIST) $(PAPARAZZI_SRC) >> $(SRCS_LIST) $(Q)cd $(PAPARAZZI_SRC) ; ./sw/tools/find_vpaths.py $(CXX) $(TMP_LIST) $(PAPARAZZI_SRC) >> $(SRCS_LIST)
endif endif