From 10972bd50f232687663bcbd27a2ba270bfdeb8ce Mon Sep 17 00:00:00 2001 From: kevindehecker Date: Wed, 18 Oct 2017 22:16:03 +0200 Subject: [PATCH] Properly seperate cxx and cflags again (#2121) --- Makefile.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.ac b/Makefile.ac index d2bf035292..053d8471e6 100644 --- a/Makefile.ac +++ b/Makefile.ac @@ -162,13 +162,17 @@ $(SRCS_LIST) : $(CONF_XML) $(AIRFRAME_H) $(MODULES_H) autopilot_h $(SETTINGS_H) @echo -n "headers: " >> $(SRCS_LIST) @echo $(VPATH) > $(TMP_LIST) @echo $($(TARGET).srcs) >> $(TMP_LIST) +ifeq (,$(findstring cpp,$($(TARGET).srcs))) @echo $(CFLAGS) >> $(TMP_LIST) @echo $(IINCDIR) >> $(TMP_LIST) @echo $(TOPT)>> $(TMP_LIST) @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) 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) endif