From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Thu, 28 Aug 2008 07:13:00 +0000 (+0000)
Subject: Fixed generation of sources-list
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/omk/sssa.git/commitdiff_plain/32a4a7730398571732a70474e8d65fcff140b340?hp=883fb455fc62e5e0b1809a6cdac54fb4b2646653

Fixed generation of sources-list

Formerly, the sources in the toplevel directory started with '/' by
mistake. Also there was some problematic place with
renamed_include_HEADERS. All this is now fixed.

darcs-hash:20080828071315-f2ef6-fee5e2e31c87f148dbdeca9345802abeff5a566a.gz
---

diff --git a/snippets/sources-list b/snippets/sources-list
index efae382..f913320 100644
--- a/snippets/sources-list
+++ b/snippets/sources-list
@@ -48,10 +48,10 @@ sources-list-pass-local:
 	  echo "$(RELATIVE_DIR:$(SOURCES_LIST_DIR)/%=%)/$(h)" >> "$(SOURCES_LIST).tmp";)
 	@$(foreach ch,$(config_include_HEADERS), \
 	  echo "$(USER_INCLUDE_DIR:$(OUTPUT_DIR)/$(addsuffix /,$(SOURCES_LIST_DIR))%=%)/$(ch)" >> "$(SOURCES_LIST).tmp";)
-	@$(foreach h,$(renamed_include_HEADERS),echo "$(RELATIVE_DIR:$(SOURCES_LIST_DIR)/%=%)/$(h)"|sed -e 's/\(.*\)->.*/\1/' >> "$(SOURCES_LIST).tmp";)
-	@$(foreach bin,$(lib_LIBRARIES) $(shared_LIBRARIES) $(bin_PROGRAMS) $(test_PROGRAMS) $(utils_PROGRAMS) \
+	@$(foreach h,$(renamed_include_HEADERS),echo '$(h)'|sed -e 's/\(.*\)->.*/$(RELATIVE_DIR:$(SOURCES_LIST_DIR)/%=%)\1/' >> "$(SOURCES_LIST).tmp";)
+	$(foreach bin,$(lib_LIBRARIES) $(shared_LIBRARIES) $(bin_PROGRAMS) $(test_PROGRAMS) $(utils_PROGRAMS) \
 	  $(kernel_LIBRARIES) $(rtlinux_LIBRARIES) $(kernel_MODULES),\
-	  $(foreach src,$(filter-out %.o,$($(bin)_SOURCES)),echo "$(RELATIVE_DIR:$(SOURCES_LIST_DIR)/%=%)/$(src)" >> "$(SOURCES_LIST).tmp";))
+	  $(foreach src,$(filter-out %.o,$($(bin)_SOURCES)),echo "$(addsuffix /,$(RELATIVE_DIR:$(SOURCES_LIST_DIR)/%=%))$(src)" >> "$(SOURCES_LIST).tmp";))
 
 ############ TAGS ###########