From 6956b4543e79ff3c7cf18b2c4f2a68700015bf75 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Thu, 4 Dec 2008 23:01:43 +0000
Subject: [PATCH] Remove preprocessor info from generated files so that you can
 use GDB

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1414 42af7a65-404d-4744-a932-0658087f49c3
---
 graphics/nxfonts/Makefile.sources |  8 ++++++--
 graphics/nxglib/Makefile.sources  | 23 ++++++++++++++++++-----
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/graphics/nxfonts/Makefile.sources b/graphics/nxfonts/Makefile.sources
index e3c0694eb0..adcc7b7c35 100644
--- a/graphics/nxfonts/Makefile.sources
+++ b/graphics/nxfonts/Makefile.sources
@@ -64,6 +64,8 @@ endif
 CPPFLAGS	+= -DNXFONTS_BITSPERPIXEL=$(NXFONTS_BITSPERPIXEL)
 CPPFLAGS	+= -DNXFONTS_SUFFIX=$(NXFONTS_SUFFIX)
 
+CONV_TMP	= $(CONV_CSRC:.c=.i)
+
 GEN_CSRCS	= $(CONV_CSRC)
 
 all:	$(GEN_CSRCS)
@@ -71,11 +73,13 @@ all:	$(GEN_CSRCS)
 
 $(CONV_CSRC) : nxfonts_convert.c
 ifneq ($(NXFONTS_BITSPERPIXEL),)
-	$(call PREPROCESS, nxfonts_convert.c, $@)
+	@$(call PREPROCESS, $<, $(CONV_TMP))
+	@cat $(CONV_TMP) | sed -e "/^#/d" >$@
+	@rm -f  $(CONV_TMP)
 endif
 
 clean:
-	@rm -f *~ .*.swp
+	@rm -f *~ .*.swp *.i
 
 distclean: clean
 	@rm -f nxfonts_convert_*bpp.c
diff --git a/graphics/nxglib/Makefile.sources b/graphics/nxglib/Makefile.sources
index e3dfd883b5..7e83b8e34b 100644
--- a/graphics/nxglib/Makefile.sources
+++ b/graphics/nxglib/Makefile.sources
@@ -89,6 +89,11 @@ endif
 CPPFLAGS	+= -DNXGLIB_BITSPERPIXEL=$(NXGLIB_BITSPERPIXEL)
 CPPFLAGS	+= -DNXGLIB_SUFFIX=$(NXGLIB_SUFFIX)
 
+RFILL_TMP	= $(RFILL_CSRC:.c=.i)
+TFILL_TMP	= $(TFILL_CSRC:.c=.i)
+RMOVE_TMP	= $(RMOVE_CSRC:.c=.i)
+RCOPY_TMP	= $(RCOPY_CSRC:.c=.i)
+
 GEN_CSRCS	= $(RFILL_CSRC) $(TFILL_CSRC) $(RMOVE_CSRC) $(RCOPY_CSRC)
 
 all:	$(GEN_CSRCS)
@@ -96,26 +101,34 @@ all:	$(GEN_CSRCS)
 
 $(RFILL_CSRC) : nxglib_fillrectangle.c nxglib_bitblit.h
 ifneq ($(NXGLIB_BITSPERPIXEL),)
-	$(call PREPROCESS, nxglib_fillrectangle.c, $@)
+	@$(call PREPROCESS, nxglib_fillrectangle.c, $(RFILL_TMP))
+	@cat $(RFILL_TMP) | sed -e "/^#/d" >$@
+	@rm -f  $(RFILL_TMP)
 endif
 
 $(TFILL_CSRC) : nxglib_filltrapezoid.c nxglib_bitblit.h
 ifneq ($(NXGLIB_BITSPERPIXEL),)
-	$(call PREPROCESS, nxglib_filltrapezoid.c, $@)
+	@$(call PREPROCESS, nxglib_filltrapezoid.c, $(TFILL_TMP))
+	@cat $(TFILL_TMP) | sed -e "/^#/d" >$@
+	@rm -f  $(TFILL_TMP)
 endif
 
 $(RMOVE_CSRC) : nxglib_moverectangle.c nxglib_bitblit.h
 ifneq ($(NXGLIB_BITSPERPIXEL),)
-	$(call PREPROCESS, nxglib_moverectangle.c, $@)
+	@$(call PREPROCESS, nxglib_moverectangle.c, $(RMOVE_TMP))
+	@cat $(RMOVE_TMP) | sed -e "/^#/d" >$@
+	@rm -f  $(RMOVE_TMP)
 endif
 
 $(RCOPY_CSRC) : nxglib_copyrectangle.c nxglib_bitblit.h
 ifneq ($(NXGLIB_BITSPERPIXEL),)
-	$(call PREPROCESS, nxglib_copyrectangle.c, $@)
+	@$(call PREPROCESS, nxglib_copyrectangle.c, $(RCOPY_TMP))
+	@cat $(RCOPY_TMP) | sed -e "/^#/d" >$@
+	@rm -f  $(RCOPY_TMP)
 endif
 
 clean:
-	@rm -f *~ .*.swp
+	@rm -f *~ .*.swp *.i
 
 distclean: clean
 	@rm -f nxglib_fillrectangle_*bpp.c nxglib_filltrapezoid_*bpp.c