Move graphics/nxfonts to libnx/nxfonts

29 files changed, 212 insertions, 190 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 1590700a6..74978df50 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -6328,3 +6328,5 @@
 	  be moved to libc as well) (2013-12-27).
 	* Move libc/nx, nxmu, and nxglib to a new library, libnx.  The NX
 	  graphics is not properly a part of libc (2013-12-28).
+	* Move graphics/nxfonts to libnx/nxfonts (2013-12-28).
+
diff --git a/nuttx/graphics/Makefile b/nuttx/graphics/Makefile
index aa402bfa4..c3abfb0c6 100644
--- a/nuttx/graphics/Makefile
+++ b/nuttx/graphics/Makefile
@@ -63,20 +63,16 @@ include nxtk/Make.defs
 DEPPATH		+= --dep-path nxtk
 CFLAGS		+= ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxtk}
 
-include nxfonts/Make.defs
-DEPPATH		+= --dep-path nxfonts
-CFLAGS		+= ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxfonts}
-
 ifeq ($(CONFIG_NXCONSOLE),y)
 include nxconsole/Make.defs
 DEPPATH		+= --dep-path nxconsole
 CFLAGS		+= ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxconsole}
 endif
 
-ASRCS		= $(NXGLIB_ASRCS) $(NXBE_ASRCS) $(NX_ASRCS) $(NXTK_ASRCS) $(NXFONTS_ASRCS) $(NXCON_ASRCS)
+ASRCS		= $(NXGLIB_ASRCS) $(NXBE_ASRCS) $(NX_ASRCS) $(NXTK_ASRCS) $(NXCON_ASRCS)
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 
-CSRCS		= $(NXGLIB_CSRCS) $(NXBE_CSRCS) $(NX_CSRCS) $(NXTK_CSRCS) $(NXFONTS_CSRCS) $(NXCON_CSRCS)
+CSRCS		= $(NXGLIB_CSRCS) $(NXBE_CSRCS) $(NX_CSRCS) $(NXTK_CSRCS) $(NXCON_CSRCS)
 COBJS		= $(CSRCS:.c=$(OBJEXT))
 
 SRCS		= $(ASRCS) $(CSRCS)
@@ -85,101 +81,38 @@ OBJS		= $(AOBJS) $(COBJS)
 BIN		= libgraphics$(LIBEXT)
 
 ifeq ($(CONFIG_NX_MULTIUSER),y)
-VPATH		= nxglib:nxbe:nxmu:nxtk:nxfonts:nxconsole
+VPATH		= nxglib:nxbe:nxmu:nxtk:nxconsole
 else
-VPATH		= nxglib:nxbe:nxsu:nxtk:nxfonts:nxconsole
+VPATH		= nxglib:nxbe:nxsu:nxtk:nxconsole
 endif
 
 all:	mklibgraphics
 .PHONY : context depend clean distclean mklibgraphics gensources gen1bppsources \
 	 gen2bppsource gen4bppsource gen8bppsource gen16bppsource gen24bppsource \
-	 gen32bppsources genfontsources
+	 gen32bppsources
 
 gen1bppsources:
 	$(Q) $(MAKE) -C nxglib -f Makefile.sources TOPDIR=$(TOPDIR) NXGLIB_BITSPERPIXEL=1 EXTRADEFINES=$(EXTRADEFINES)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=1 EXTRADEFINES=$(EXTRADEFINES)
 
 gen2bppsource:
 	$(Q) $(MAKE) -C nxglib -f Makefile.sources TOPDIR=$(TOPDIR) NXGLIB_BITSPERPIXEL=2 EXTRADEFINES=$(EXTRADEFINES)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=2 EXTRADEFINES=$(EXTRADEFINES)
 
 gen4bppsource:
 	$(Q) $(MAKE) -C nxglib -f Makefile.sources TOPDIR=$(TOPDIR) NXGLIB_BITSPERPIXEL=4 EXTRADEFINES=$(EXTRADEFINES)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=4 EXTRADEFINES=$(EXTRADEFINES)
 
 gen8bppsource:
 	$(Q) $(MAKE) -C nxglib -f Makefile.sources TOPDIR=$(TOPDIR) NXGLIB_BITSPERPIXEL=8 EXTRADEFINES=$(EXTRADEFINES)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=8 EXTRADEFINES=$(EXTRADEFINES)
 
 gen16bppsource:
 	$(Q) $(MAKE) -C nxglib -f Makefile.sources TOPDIR=$(TOPDIR) NXGLIB_BITSPERPIXEL=16 EXTRADEFINES=$(EXTRADEFINES)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=16 EXTRADEFINES=$(EXTRADEFINES)
 
 gen24bppsource:
 	$(Q) $(MAKE) -C nxglib -f Makefile.sources TOPDIR=$(TOPDIR) NXGLIB_BITSPERPIXEL=24 EXTRADEFINES=$(EXTRADEFINES)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=24 EXTRADEFINES=$(EXTRADEFINES)
 
 gen32bppsources:
 	$(Q) $(MAKE) -C nxglib -f Makefile.sources TOPDIR=$(TOPDIR) NXGLIB_BITSPERPIXEL=32 EXTRADEFINES=$(EXTRADEFINES)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=32 EXTRADEFINES=$(EXTRADEFINES)
-
-genfontsources:
-ifeq ($(CONFIG_NXFONT_MONO5X8),y)
-	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=18 EXTRADEFINES=$(EXTRADEFINES)
-endif
-ifeq ($(CONFIG_NXFONT_SANS23X27),y)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=1 EXTRADEFINES=$(EXTRADEFINES)
-endif
-ifeq ($(CONFIG_NXFONT_SANS22X29),y)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=2 EXTRADEFINES=$(EXTRADEFINES)
-endif
-ifeq ($(CONFIG_NXFONT_SANS28X37),y)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=3 EXTRADEFINES=$(EXTRADEFINES)
-endif
-ifeq ($(CONFIG_NXFONT_SANS39X48),y)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=4 EXTRADEFINES=$(EXTRADEFINES)
-endif
-ifeq ($(CONFIG_NXFONT_SANS17X23B),y)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=16 EXTRADEFINES=$(EXTRADEFINES)
-endif
-ifeq ($(CONFIG_NXFONT_SANS20X27B),y)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=17 EXTRADEFINES=$(EXTRADEFINES)
-endif
-ifeq ($(CONFIG_NXFONT_SANS22X29B),y)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=5 EXTRADEFINES=$(EXTRADEFINES)
-endif
-ifeq ($(CONFIG_NXFONT_SANS28X37B),y)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=6 EXTRADEFINES=$(EXTRADEFINES)
-endif
-ifeq ($(CONFIG_NXFONT_SANS40X49B),y)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=7 EXTRADEFINES=$(EXTRADEFINES)
-endif
-ifeq ($(CONFIG_NXFONT_SERIF22X29),y)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=8 EXTRADEFINES=$(EXTRADEFINES)
-endif
-ifeq ($(CONFIG_NXFONT_SERIF29X37),y)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=9 EXTRADEFINES=$(EXTRADEFINES)
-endif
-ifeq ($(CONFIG_NXFONT_SERIF38X48),y)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=10 EXTRADEFINES=$(EXTRADEFINES)
-endif
-ifeq ($(CONFIG_NXFONT_SERIF22X28B),y)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=11 EXTRADEFINES=$(EXTRADEFINES)
-endif
-ifeq ($(CONFIG_NXFONT_SERIF27X38B),y)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=12 EXTRADEFINES=$(EXTRADEFINES)
-endif
-ifeq ($(CONFIG_NXFONT_SERIF38X49B),y)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=13 EXTRADEFINES=$(EXTRADEFINES)
-endif
-ifeq ($(CONFIG_NXFONT_SANS17X22),y)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=14 EXTRADEFINES=$(EXTRADEFINES)
-endif
-ifeq ($(CONFIG_NXFONT_SANS20X26),y)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=15 EXTRADEFINES=$(EXTRADEFINES)
-endif
 
-gensources: gen1bppsources gen2bppsource gen4bppsource gen8bppsource gen16bppsource gen24bppsource gen32bppsources genfontsources
+gensources: gen1bppsources gen2bppsource gen4bppsource gen8bppsource gen16bppsource gen24bppsource gen32bppsources
 
 $(AOBJS): %$(OBJEXT): %.S
 	$(call ASSEMBLE, $<, $@)
@@ -190,7 +123,7 @@ $(COBJS): %$(OBJEXT): %.c
 $(BIN): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
-mklibgraphics: gensources $(BIN)
+mklibgraphics: $(BIN)
 
 .depend: gensources Makefile $(SRCS)
 	$(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
@@ -202,13 +135,11 @@ context: gensources
 
 clean:
 	$(Q) $(MAKE) -C nxglib -f Makefile.sources clean TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources clean TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES)
 	$(call DELFILE, $(BIN))
 	$(call CLEAN)
 
 distclean: clean
 	$(Q) $(MAKE) -C nxglib -f Makefile.sources distclean TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES)
-	$(Q) $(MAKE) -C nxfonts -f Makefile.sources distclean TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES)
 	$(call DELFILE, Make.dep)
 	$(call DELFILE, .depend)
 
diff --git a/nuttx/libnx/Makefile b/nuttx/libnx/Makefile
index 2c3e78939..75b19aade 100644
--- a/nuttx/libnx/Makefile
+++ b/nuttx/libnx/Makefile
@@ -56,6 +56,7 @@ VPATH := .
 include nxglib/Make.defs
 include nx/Make.defs
 include nxmu/Make.defs
+include nxfonts/Make.defs
 
 BINDIR ?= bin
 
@@ -71,6 +72,87 @@ BIN ?= libnx$(LIBEXT)
 
 all: $(BIN)
 .PHONY: clean distclean
+.PHONY : context depend clean distclean gensources gen1bppsources gen2bppsource \
+	 gen4bppsource gen8bppsource gen16bppsource gen24bppsource gen32bppsources genfontsources
+
+gen1bppsources:
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=1 EXTRADEFINES=$(EXTRADEFINES)
+
+gen2bppsource:
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=2 EXTRADEFINES=$(EXTRADEFINES)
+
+gen4bppsource:
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=4 EXTRADEFINES=$(EXTRADEFINES)
+
+gen8bppsource:
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=8 EXTRADEFINES=$(EXTRADEFINES)
+
+gen16bppsource:
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=16 EXTRADEFINES=$(EXTRADEFINES)
+
+gen24bppsource:
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=24 EXTRADEFINES=$(EXTRADEFINES)
+
+gen32bppsources:
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=32 EXTRADEFINES=$(EXTRADEFINES)
+
+genfontsources:
+ifeq ($(CONFIG_NXFONT_MONO5X8),y)
+	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=18 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SANS23X27),y)
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=1 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SANS22X29),y)
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=2 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SANS28X37),y)
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=3 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SANS39X48),y)
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=4 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SANS17X23B),y)
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=16 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SANS20X27B),y)
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=17 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SANS22X29B),y)
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=5 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SANS28X37B),y)
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=6 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SANS40X49B),y)
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=7 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SERIF22X29),y)
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=8 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SERIF29X37),y)
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=9 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SERIF38X48),y)
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=10 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SERIF22X28B),y)
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=11 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SERIF27X38B),y)
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=12 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SERIF38X49B),y)
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=13 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SANS17X22),y)
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=14 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SANS20X26),y)
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=15 EXTRADEFINES=$(EXTRADEFINES)
+endif
+
+gensources: gen1bppsources gen2bppsource gen4bppsource gen8bppsource gen16bppsource gen24bppsource gen32bppsources genfontsources
 
 $(AOBJS): $(BINDIR)$(DELIM)%$(OBJEXT): %.S
 	$(call ASSEMBLE, $<, $@)
@@ -101,7 +183,7 @@ endif
 
 # Dependencies
 
-.depend: Makefile $(SRCS)
+.depend: Makefile gensources $(SRCS)
 ifeq ($(CONFIG_NUTTX_KERNEL),y)
 	$(Q) $(MKDEP) --obj-path ubin --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make_ubin.dep
 	$(Q) $(MKDEP) --obj-path kbin --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) $(KDEFINE) -- $(SRCS) >Make_kbin.dep
@@ -114,7 +196,7 @@ depend: .depend
 
 # Generate configuration context
 
-context:
+context: gensources
 
 # Clean most derived files, retaining the configuration
 
@@ -122,6 +204,7 @@ clean:
 	$(Q) $(MAKE) -C bin  clean TOPDIR=$(TOPDIR)
 	$(Q) $(MAKE) -C ubin clean TOPDIR=$(TOPDIR)
 	$(Q) $(MAKE) -C kbin clean TOPDIR=$(TOPDIR)
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources clean TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES)
 	$(call DELFILE, $(BIN))
 	$(call DELFILE, $(UBIN))
 	$(call DELFILE, $(KBIN))
@@ -133,6 +216,7 @@ distclean: clean
 	$(Q) $(MAKE) -C bin  distclean TOPDIR=$(TOPDIR)
 	$(Q) $(MAKE) -C ubin distclean TOPDIR=$(TOPDIR)
 	$(Q) $(MAKE) -C kbin distclean TOPDIR=$(TOPDIR)
+	$(Q) $(MAKE) -C nxfonts -f Makefile.sources distclean TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES)
 	$(call DELFILE, Make_bin.dep)
 	$(call DELFILE, Make_ubin.dep)
 	$(call DELFILE, Make_kbin.dep)
diff --git a/nuttx/graphics/nxfonts/.gitignore b/nuttx/libnx/nxfonts/.gitignore
index 707a097d9..707a097d9 100644
--- a/nuttx/graphics/nxfonts/.gitignore
+++ b/nuttx/libnx/nxfonts/.gitignore
diff --git a/nuttx/graphics/nxfonts/Make.defs b/nuttx/libnx/nxfonts/Make.defs
index def092825..258dc1522 100644
--- a/nuttx/graphics/nxfonts/Make.defs
+++ b/nuttx/libnx/nxfonts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# graphics/nxfonts/Make.defs
+# libnx/nxfonts/Make.defs
 #
-#   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2008, 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -33,96 +33,101 @@
 #
 ############################################################################
 
-NXFCONV_ASRCS	=
-NXFCONV_CSRCS	= nxfonts_convert_1bpp.c nxfonts_convert_2bpp.c \
-		  nxfonts_convert_4bpp.c nxfonts_convert_8bpp.c \
-		  nxfonts_convert_16bpp.c nxfonts_convert_24bpp.c \
-		  nxfonts_convert_32bpp.c
+# Expose NXFONT interfaces to applications
 
-NXFSET_ASRCS	=
-NXFSET_CSRCS	=
+ifeq ($(CONFIG_NX),y)
+
+CSRCS += nxfonts_getfont.c
+CSRCS += nxfonts_convert_1bpp.c nxfonts_convert_2bpp.c
+CSRCS += nxfonts_convert_4bpp.c nxfonts_convert_8bpp.c
+CSRCS += nxfonts_convert_16bpp.c nxfonts_convert_24bpp.c
+CSRCS += nxfonts_convert_32bpp.c
 
 # Monospace fonts
 
 ifeq ($(CONFIG_NXFONT_MONO5X8),y)
-NXFSET_CSRCS    += nxfonts_bitmaps_mono5x8.c
+CSRCS += nxfonts_bitmaps_mono5x8.c
 endif
 
 # Sans serif fonts
 
 ifeq ($(CONFIG_NXFONT_SANS17X22),y)
-NXFSET_CSRCS	+= nxfonts_bitmaps_sans17x22.c
+CSRCS += nxfonts_bitmaps_sans17x22.c
 endif
 
 ifeq ($(CONFIG_NXFONT_SANS20X26),y)
-NXFSET_CSRCS	+= nxfonts_bitmaps_sans20x26.c
+CSRCS += nxfonts_bitmaps_sans20x26.c
 endif
 
 ifeq ($(CONFIG_NXFONT_SANS23X27),y)
-NXFSET_CSRCS	+= nxfonts_bitmaps_sans23x27.c
+CSRCS += nxfonts_bitmaps_sans23x27.c
 endif
 
 ifeq ($(CONFIG_NXFONT_SANS22X29),y)
-NXFSET_CSRCS	+= nxfonts_bitmaps_sans22x29.c
+CSRCS += nxfonts_bitmaps_sans22x29.c
 endif
 
 ifeq ($(CONFIG_NXFONT_SANS28X37),y)
-NXFSET_CSRCS	+= nxfonts_bitmaps_sans28x37.c
+CSRCS += nxfonts_bitmaps_sans28x37.c
 endif
 
 ifeq ($(CONFIG_NXFONT_SANS39X48),y)
-NXFSET_CSRCS	+= nxfonts_bitmaps_sans39x48.c
+CSRCS += nxfonts_bitmaps_sans39x48.c
 endif
 
 # Sans serif bold fonts
 
 ifeq ($(CONFIG_NXFONT_SANS17X23B),y)
-NXFSET_CSRCS	+= nxfonts_bitmaps_sans17x23b.c
+CSRCS += nxfonts_bitmaps_sans17x23b.c
 endif
 
 ifeq ($(CONFIG_NXFONT_SANS20X27B),y)
-NXFSET_CSRCS	+= nxfonts_bitmaps_sans20x27b.c
+CSRCS += nxfonts_bitmaps_sans20x27b.c
 endif
 
 ifeq ($(CONFIG_NXFONT_SANS22X29B),y)
-NXFSET_CSRCS	+= nxfonts_bitmaps_sans22x29b.c
+CSRCS += nxfonts_bitmaps_sans22x29b.c
 endif
 
 ifeq ($(CONFIG_NXFONT_SANS28X37B),y)
-NXFSET_CSRCS	+= nxfonts_bitmaps_sans28x37b.c
+CSRCS += nxfonts_bitmaps_sans28x37b.c
 endif
 
 ifeq ($(CONFIG_NXFONT_SANS40X49B),y)
-NXFSET_CSRCS	+= nxfonts_bitmaps_sans40x49b.c
+CSRCS += nxfonts_bitmaps_sans40x49b.c
 endif
 
 # Serif fonts
 
 ifeq ($(CONFIG_NXFONT_SERIF22X29),y)
-NXFSET_CSRCS	+= nxfonts_bitmaps_serif22x29.c
+CSRCS += nxfonts_bitmaps_serif22x29.c
 endif
 
 ifeq ($(CONFIG_NXFONT_SERIF29X37),y)
-NXFSET_CSRCS	+= nxfonts_bitmaps_serif29x37.c
+CSRCS += nxfonts_bitmaps_serif29x37.c
 endif
 
 ifeq ($(CONFIG_NXFONT_SERIF38X48),y)
-NXFSET_CSRCS	+= nxfonts_bitmaps_serif38x48.c
+CSRCS += nxfonts_bitmaps_serif38x48.c
 endif
 
 # Serif bold fonts
 
 ifeq ($(CONFIG_NXFONT_SERIF22X28B),y)
-NXFSET_CSRCS	+= nxfonts_bitmaps_serif22x28b.c
+CSRCS += nxfonts_bitmaps_serif22x28b.c
 endif
 
 ifeq ($(CONFIG_NXFONT_SERIF27X38B),y)
-NXFSET_CSRCS	+= nxfonts_bitmaps_serif27x38b.c
+CSRCS += nxfonts_bitmaps_serif27x38b.c
 endif
 
 ifeq ($(CONFIG_NXFONT_SERIF38X49B),y)
-NXFSET_CSRCS	+= nxfonts_bitmaps_serif38x49b.c
+CSRCS += nxfonts_bitmaps_serif38x49b.c
 endif
 
-NXFONTS_ASRCS	= $(NXFCONV_ASRCS) $(NXFSET_ASRCS)
-NXFONTS_CSRCS	= nxfonts_getfont.c $(NXFCONV_CSRCS) $(NXFSET_CSRCS)
+# Add the nxfont/ directory to the build
+
+DEPPATH += --dep-path nxfonts
+VPATH += :nxfonts
+
+endif
diff --git a/nuttx/graphics/nxfonts/Makefile.sources b/nuttx/libnx/nxfonts/Makefile.sources
index 2e41fc704..198af6b4d 100644
--- a/nuttx/graphics/nxfonts/Makefile.sources
+++ b/nuttx/libnx/nxfonts/Makefile.sources
@@ -1,7 +1,7 @@
 ############################################################################
-# graphics/nxfonts/Makefile.sources
+# libnx/nxfonts/Makefile.sources
 #
-#   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2008, 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,37 +37,37 @@
 
 ifdef NXFONTS_BITSPERPIXEL
 ifeq ($(NXFONTS_BITSPERPIXEL),1)
-NXFONTS_SUFFIX	:= _1bpp
-GEN_CSRC	:= nxfonts_convert_1bpp.c
+NXFONTS_SUFFIX := _1bpp
+GEN_CSRC := nxfonts_convert_1bpp.c
 endif
 ifeq ($(NXFONTS_BITSPERPIXEL),2)
-NXFONTS_SUFFIX	:= _2bpp
-GEN_CSRC	:= nxfonts_convert_2bpp.c
+NXFONTS_SUFFIX := _2bpp
+GEN_CSRC := nxfonts_convert_2bpp.c
 endif
 ifeq ($(NXFONTS_BITSPERPIXEL),4)
-NXFONTS_SUFFIX	:= _4bpp
-GEN_CSRC	:= nxfonts_convert_4bpp.c
+NXFONTS_SUFFIX := _4bpp
+GEN_CSRC := nxfonts_convert_4bpp.c
 endif
 ifeq ($(NXFONTS_BITSPERPIXEL),8)
-NXFONTS_SUFFIX	:= _8bpp
-GEN_CSRC	:= nxfonts_convert_8bpp.c
+NXFONTS_SUFFIX := _8bpp
+GEN_CSRC := nxfonts_convert_8bpp.c
 endif
 ifeq ($(NXFONTS_BITSPERPIXEL),16)
-NXFONTS_SUFFIX	:= _16bpp
-GEN_CSRC	:= nxfonts_convert_16bpp.c
+NXFONTS_SUFFIX := _16bpp
+GEN_CSRC := nxfonts_convert_16bpp.c
 endif
 ifeq ($(NXFONTS_BITSPERPIXEL),24)
-NXFONTS_SUFFIX	:= _24bpp
-GEN_CSRC	:= nxfonts_convert_24bpp.c
+NXFONTS_SUFFIX := _24bpp
+GEN_CSRC := nxfonts_convert_24bpp.c
 endif
 ifeq ($(NXFONTS_BITSPERPIXEL),32)
-NXFONTS_SUFFIX	:= _32bpp
-GEN_CSRC	:= nxfonts_convert_32bpp.c
+NXFONTS_SUFFIX := _32bpp
+GEN_CSRC := nxfonts_convert_32bpp.c
 endif
 
-DEPENDENCY	:= nxfonts_convert.c
-CPPFLAGS	+= -DNXFONTS_BITSPERPIXEL=$(NXFONTS_BITSPERPIXEL)
-CPPFLAGS	+= -DNXFONTS_SUFFIX=$(NXFONTS_SUFFIX)
+DEPENDENCY := nxfonts_convert.c
+CPPFLAGS += -DNXFONTS_BITSPERPIXEL=$(NXFONTS_BITSPERPIXEL)
+CPPFLAGS += -DNXFONTS_SUFFIX=$(NXFONTS_SUFFIX)
 endif
 
 ifdef NXFONTS_FONTID
@@ -75,111 +75,111 @@ ifdef NXFONTS_FONTID
 # MONO
 
 ifeq ($(NXFONTS_FONTID),18)
-NXFONTS_PREFIX	:= g_mono5x8_
-GEN_CSRC	= nxfonts_bitmaps_mono5x8.c
+NXFONTS_PREFIX := g_mono5x8_
+GEN_CSRC = nxfonts_bitmaps_mono5x8.c
 endif
 
 # SANS
 
 ifeq ($(NXFONTS_FONTID),14)
-NXFONTS_PREFIX	:= g_sans17x22_
-GEN_CSRC	= nxfonts_bitmaps_sans17x22.c
+NXFONTS_PREFIX := g_sans17x22_
+GEN_CSRC = nxfonts_bitmaps_sans17x22.c
 endif
 
 ifeq ($(NXFONTS_FONTID),15)
-NXFONTS_PREFIX	:= g_sans20x26_
-GEN_CSRC	= nxfonts_bitmaps_sans20x26.c
+NXFONTS_PREFIX := g_sans20x26_
+GEN_CSRC = nxfonts_bitmaps_sans20x26.c
 endif
 
 ifeq ($(NXFONTS_FONTID),1)
-NXFONTS_PREFIX	:= g_sans23x27_
-GEN_CSRC	= nxfonts_bitmaps_sans23x27.c
+NXFONTS_PREFIX := g_sans23x27_
+GEN_CSRC = nxfonts_bitmaps_sans23x27.c
 endif
 
 ifeq ($(NXFONTS_FONTID),2)
-NXFONTS_PREFIX	:= g_sans22x29_
-GEN_CSRC	= nxfonts_bitmaps_sans22x29.c
+NXFONTS_PREFIX := g_sans22x29_
+GEN_CSRC = nxfonts_bitmaps_sans22x29.c
 endif
 
 ifeq ($(NXFONTS_FONTID),3)
-NXFONTS_PREFIX	:= g_sans28x37_
-GEN_CSRC	= nxfonts_bitmaps_sans28x37.c
+NXFONTS_PREFIX := g_sans28x37_
+GEN_CSRC = nxfonts_bitmaps_sans28x37.c
 endif
 
 ifeq ($(NXFONTS_FONTID),4)
-NXFONTS_PREFIX	:= g_sans39x48_
-GEN_CSRC	= nxfonts_bitmaps_sans39x48.c
+NXFONTS_PREFIX := g_sans39x48_
+GEN_CSRC = nxfonts_bitmaps_sans39x48.c
 endif
 
 # SANS-BOLD
 
 ifeq ($(NXFONTS_FONTID),16)
-NXFONTS_PREFIX	:= g_sans17x23b_
-GEN_CSRC	= nxfonts_bitmaps_sans17x23b.c
+NXFONTS_PREFIX := g_sans17x23b_
+GEN_CSRC = nxfonts_bitmaps_sans17x23b.c
 endif
 
 ifeq ($(NXFONTS_FONTID),17)
-NXFONTS_PREFIX	:= g_sans20x27b_
-GEN_CSRC	= nxfonts_bitmaps_sans20x27b.c
+NXFONTS_PREFIX := g_sans20x27b_
+GEN_CSRC = nxfonts_bitmaps_sans20x27b.c
 endif
 
 ifeq ($(NXFONTS_FONTID),5)
-NXFONTS_PREFIX	:= g_sans22x29b_
-GEN_CSRC	= nxfonts_bitmaps_sans22x29b.c
+NXFONTS_PREFIX := g_sans22x29b_
+GEN_CSRC = nxfonts_bitmaps_sans22x29b.c
 endif
 
 ifeq ($(NXFONTS_FONTID),6)
-NXFONTS_PREFIX	:= g_sans28x37b_
-GEN_CSRC	= nxfonts_bitmaps_sans28x37b.c
+NXFONTS_PREFIX := g_sans28x37b_
+GEN_CSRC = nxfonts_bitmaps_sans28x37b.c
 endif
 
 ifeq ($(NXFONTS_FONTID),7)
-NXFONTS_PREFIX	:= g_sans40x49b_
-GEN_CSRC	= nxfonts_bitmaps_sans40x49b.c
+NXFONTS_PREFIX := g_sans40x49b_
+GEN_CSRC = nxfonts_bitmaps_sans40x49b.c
 endif
 
 # SERIF
 
 ifeq ($(NXFONTS_FONTID),8)
-NXFONTS_PREFIX	:= g_serif22x29_
-GEN_CSRC	= nxfonts_bitmaps_serif22x29.c
+NXFONTS_PREFIX := g_serif22x29_
+GEN_CSRC = nxfonts_bitmaps_serif22x29.c
 endif
 
 ifeq ($(NXFONTS_FONTID),9)
-NXFONTS_PREFIX	:= g_serif29x37_
-GEN_CSRC	= nxfonts_bitmaps_serif29x37.c
+NXFONTS_PREFIX := g_serif29x37_
+GEN_CSRC = nxfonts_bitmaps_serif29x37.c
 endif
 
 ifeq ($(NXFONTS_FONTID),10)
-NXFONTS_PREFIX	:= g_serif38x48_
-GEN_CSRC	= nxfonts_bitmaps_serif38x48.c
+NXFONTS_PREFIX := g_serif38x48_
+GEN_CSRC = nxfonts_bitmaps_serif38x48.c
 endif
 
 # SERIF-BOLD
 
 ifeq ($(NXFONTS_FONTID),11)
-NXFONTS_PREFIX	:= g_serif22x28b_
-GEN_CSRC	= nxfonts_bitmaps_serif22x28b.c
+NXFONTS_PREFIX := g_serif22x28b_
+GEN_CSRC = nxfonts_bitmaps_serif22x28b.c
 endif
 
 ifeq ($(NXFONTS_FONTID),12)
-NXFONTS_PREFIX	:= g_serif27x38b_
-GEN_CSRC	= nxfonts_bitmaps_serif27x38b.c
+NXFONTS_PREFIX := g_serif27x38b_
+GEN_CSRC = nxfonts_bitmaps_serif27x38b.c
 endif
 
 ifeq ($(NXFONTS_FONTID),13)
-NXFONTS_PREFIX	:= g_serif38x49b_
-GEN_CSRC	= nxfonts_bitmaps_serif38x49b.c
+NXFONTS_PREFIX := g_serif38x49b_
+GEN_CSRC = nxfonts_bitmaps_serif38x49b.c
 endif
 
-DEPENDENCY	:= nxfonts_bitmaps.c
-CPPFLAGS	+= -DNXFONTS_FONTID=$(NXFONTS_FONTID)
-CPPFLAGS	+= -DNXFONTS_PREFIX=$(NXFONTS_PREFIX)
+DEPENDENCY := nxfonts_bitmaps.c
+CPPFLAGS += -DNXFONTS_FONTID=$(NXFONTS_FONTID)
+CPPFLAGS += -DNXFONTS_PREFIX=$(NXFONTS_PREFIX)
 endif
 
-GEN_TMP	= $(GEN_CSRC:.c=.i)
+GEN_TMP = $(GEN_CSRC:.c=.i)
 
-all:	$(GEN_CSRC)
+all: $(GEN_CSRC)
 .PHONY : clean distclean
 
 $(GEN_CSRC) : $(DEPENDENCY)
diff --git a/nuttx/graphics/nxfonts/nxfonts_bitmaps.c b/nuttx/libnx/nxfonts/nxfonts_bitmaps.c
index b089ec038..da6759f32 100644
--- a/nuttx/graphics/nxfonts/nxfonts_bitmaps.c
+++ b/nuttx/libnx/nxfonts/nxfonts_bitmaps.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_bitmaps.c
+ * libnx/nxfonts/nxfonts_bitmaps.c
  *
  *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/graphics/nxfonts/nxfonts_convert.c b/nuttx/libnx/nxfonts/nxfonts_convert.c
index a3c319964..7f61f8cc8 100644
--- a/nuttx/graphics/nxfonts/nxfonts_convert.c
+++ b/nuttx/libnx/nxfonts/nxfonts_convert.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_convert.c
+ * libnx/nxfonts/nxfonts_convert.c
  *
  *   Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/graphics/nxfonts/nxfonts_getfont.c b/nuttx/libnx/nxfonts/nxfonts_getfont.c
index 0eb48e9df..f0b65fd91 100644
--- a/nuttx/graphics/nxfonts/nxfonts_getfont.c
+++ b/nuttx/libnx/nxfonts/nxfonts_getfont.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_getfont.c
+ * libnx/nxfonts/nxfonts_getfont.c
  *
  *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/graphics/nxfonts/nxfonts_internal.h b/nuttx/libnx/nxfonts/nxfonts_internal.h
index 057200cd5..ea12db4f6 100644
--- a/nuttx/graphics/nxfonts/nxfonts_internal.h
+++ b/nuttx/libnx/nxfonts/nxfonts_internal.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_internal.h
+ * libnx/nxfonts/nxfonts_internal.h
  *
  *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/graphics/nxfonts/nxfonts_mono5x8.h b/nuttx/libnx/nxfonts/nxfonts_mono5x8.h
index 739437e62..e2fa23b39 100644
--- a/nuttx/graphics/nxfonts/nxfonts_mono5x8.h
+++ b/nuttx/libnx/nxfonts/nxfonts_mono5x8.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_mono5x8.h
+ * libnx/nxfonts/nxfonts_mono5x8.h
  *
  *   Copyright (C) 2011-2012 NX Engineering, S.A., All rights reserved.
  *   Author: Petteri Aimonen <jpa@nx.mail.kapsi.fi>
diff --git a/nuttx/graphics/nxfonts/nxfonts_sans17x22.h b/nuttx/libnx/nxfonts/nxfonts_sans17x22.h
index 12eeb8fc9..712cf4a13 100644
--- a/nuttx/graphics/nxfonts/nxfonts_sans17x22.h
+++ b/nuttx/libnx/nxfonts/nxfonts_sans17x22.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_serif30x26.h
+ * libnx/nxfonts/nxfonts_serif30x26.h
  *
  *   Copyright (C) 2011-2012 NX Engineering, S.A., All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/graphics/nxfonts/nxfonts_sans17x23b.h b/nuttx/libnx/nxfonts/nxfonts_sans17x23b.h
index 007986399..709e7f9e5 100644
--- a/nuttx/graphics/nxfonts/nxfonts_sans17x23b.h
+++ b/nuttx/libnx/nxfonts/nxfonts_sans17x23b.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_serif17x23b.h
+ * libnx/nxfonts/nxfonts_serif17x23b.h
  *
  *   Copyright (C) 2011-2012 NX Engineering, S.A., All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/graphics/nxfonts/nxfonts_sans20x26.h b/nuttx/libnx/nxfonts/nxfonts_sans20x26.h
index c887da5e5..fa1b2f8a9 100644
--- a/nuttx/graphics/nxfonts/nxfonts_sans20x26.h
+++ b/nuttx/libnx/nxfonts/nxfonts_sans20x26.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_serif30x26.h
+ * libnx/nxfonts/nxfonts_serif30x26.h
  *
  *   Copyright (C) 2011-2012 NX Engineering, S.A., All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/graphics/nxfonts/nxfonts_sans20x27b.h b/nuttx/libnx/nxfonts/nxfonts_sans20x27b.h
index b9a8ea65d..b904b29c1 100644
--- a/nuttx/graphics/nxfonts/nxfonts_sans20x27b.h
+++ b/nuttx/libnx/nxfonts/nxfonts_sans20x27b.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_serif20x27b.h
+ * libnx/nxfonts/nxfonts_serif20x27b.h
  *
  *   Copyright (C) 2011-2012 NX Engineering, S.A., All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/graphics/nxfonts/nxfonts_sans22x29.h b/nuttx/libnx/nxfonts/nxfonts_sans22x29.h
index e47020bbd..a60145c6c 100644
--- a/nuttx/graphics/nxfonts/nxfonts_sans22x29.h
+++ b/nuttx/libnx/nxfonts/nxfonts_sans22x29.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_sans22x29.h
+ * libnx/nxfonts/nxfonts_sans22x29.h
  *
  *   Copyright (C) 2011-2012 NX Engineering, S.A., All rights reserved.
  *   Author: Jose Pablo Carballo Gomez <jcarballo@nx-engineering.com>
diff --git a/nuttx/graphics/nxfonts/nxfonts_sans22x29b.h b/nuttx/libnx/nxfonts/nxfonts_sans22x29b.h
index c2e29bff0..5e836773c 100644
--- a/nuttx/graphics/nxfonts/nxfonts_sans22x29b.h
+++ b/nuttx/libnx/nxfonts/nxfonts_sans22x29b.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_sans22x29b.h
+ * libnx/nxfonts/nxfonts_sans22x29b.h
  *
  *   Copyright (C) 2011-2012 NX Engineering, S.A., All rights reserved.
  *   Author: Jose Pablo Carballo Gomez <jcarballo@nx-engineering.com>
diff --git a/nuttx/graphics/nxfonts/nxfonts_sans23x27.h b/nuttx/libnx/nxfonts/nxfonts_sans23x27.h
index 5feb39d9c..5ce9f5ac0 100644
--- a/nuttx/graphics/nxfonts/nxfonts_sans23x27.h
+++ b/nuttx/libnx/nxfonts/nxfonts_sans23x27.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_sans23x27.h
+ * libnx/nxfonts/nxfonts_sans23x27.h
  *
  *   Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/graphics/nxfonts/nxfonts_sans28x37.h b/nuttx/libnx/nxfonts/nxfonts_sans28x37.h
index f41ff30cf..85408b8c7 100644
--- a/nuttx/graphics/nxfonts/nxfonts_sans28x37.h
+++ b/nuttx/libnx/nxfonts/nxfonts_sans28x37.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_sans28x37.h
+ * libnx/nxfonts/nxfonts_sans28x37.h
  *
  *   Copyright (C) 2011-2012 NX Engineering, S.A., All rights reserved.
  *   Author: Jose Pablo Carballo Gomez <jcarballo@nx-engineering.com>
diff --git a/nuttx/graphics/nxfonts/nxfonts_sans28x37b.h b/nuttx/libnx/nxfonts/nxfonts_sans28x37b.h
index 6f368056d..a2e101618 100644
--- a/nuttx/graphics/nxfonts/nxfonts_sans28x37b.h
+++ b/nuttx/libnx/nxfonts/nxfonts_sans28x37b.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_sans28x37b.h
+ * libnx/nxfonts/nxfonts_sans28x37b.h
  *
  *   Copyright (C) 2011-2012 NX Engineering, S.A., All rights reserved.
  *   Author: Jose Pablo Carballo Gomez <jcarballo@nx-engineering.com>
diff --git a/nuttx/graphics/nxfonts/nxfonts_sans39x48.h b/nuttx/libnx/nxfonts/nxfonts_sans39x48.h
index 62aaf1eb3..6a0f749ca 100644
--- a/nuttx/graphics/nxfonts/nxfonts_sans39x48.h
+++ b/nuttx/libnx/nxfonts/nxfonts_sans39x48.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_serif39x48.h
+ * libnx/nxfonts/nxfonts_serif39x48.h
  *
  *   Copyright (C) 2011-2012 NX Engineering, S.A., All rights reserved.
  *   Author: Jose Pablo Carballo Gomez <jcarballo@nx-engineering.com>
diff --git a/nuttx/graphics/nxfonts/nxfonts_sans40x49b.h b/nuttx/libnx/nxfonts/nxfonts_sans40x49b.h
index d7a5e19ab..cc20a0b82 100644
--- a/nuttx/graphics/nxfonts/nxfonts_sans40x49b.h
+++ b/nuttx/libnx/nxfonts/nxfonts_sans40x49b.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_sans40x49b.h
+ * libnx/nxfonts/nxfonts_sans40x49b.h
  *
  *   Copyright (C) 2011-2012 NX Engineering, S.A., All rights reserved.
  *   Author: Jose Pablo Carballo Gomez <jcarballo@nx-engineering.com>
diff --git a/nuttx/graphics/nxfonts/nxfonts_serif22x28b.h b/nuttx/libnx/nxfonts/nxfonts_serif22x28b.h
index 8f01ccf8c..8dac8d2aa 100644
--- a/nuttx/graphics/nxfonts/nxfonts_serif22x28b.h
+++ b/nuttx/libnx/nxfonts/nxfonts_serif22x28b.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_serif22x28b.h
+ * libnx/nxfonts/nxfonts_serif22x28b.h
  *
  *   Copyright (C) 2011-2012 NX Engineering, S.A., All rights reserved.
  *   Author: Jose Pablo Carballo Gomez <jcarballo@nx-engineering.com>
diff --git a/nuttx/graphics/nxfonts/nxfonts_serif22x29.h b/nuttx/libnx/nxfonts/nxfonts_serif22x29.h
index 35d61ebe8..eec8ec338 100644
--- a/nuttx/graphics/nxfonts/nxfonts_serif22x29.h
+++ b/nuttx/libnx/nxfonts/nxfonts_serif22x29.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_serif22x29.h
+ * libnx/nxfonts/nxfonts_serif22x29.h
  *
  *   Copyright (C) 2011-2012 NX Engineering, S.A., All rights reserved.
  *   Author: Jose Pablo Carballo Gomez <jcarballo@nx-engineering.com>
diff --git a/nuttx/graphics/nxfonts/nxfonts_serif27x38b.h b/nuttx/libnx/nxfonts/nxfonts_serif27x38b.h
index e6ecf1969..8d1a34441 100644
--- a/nuttx/graphics/nxfonts/nxfonts_serif27x38b.h
+++ b/nuttx/libnx/nxfonts/nxfonts_serif27x38b.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_serif27x38b.h
+ * libnx/nxfonts/nxfonts_serif27x38b.h
  *
  *   Copyright (C) 2011-2012 NX Engineering, S.A., All rights reserved.
  *   Author: Jose Pablo Carballo Gomez <jcarballo@nx-engineering.com>
diff --git a/nuttx/graphics/nxfonts/nxfonts_serif29x37.h b/nuttx/libnx/nxfonts/nxfonts_serif29x37.h
index 11215e44e..f6648fa44 100644
--- a/nuttx/graphics/nxfonts/nxfonts_serif29x37.h
+++ b/nuttx/libnx/nxfonts/nxfonts_serif29x37.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_serif29x37.h
+ * libnx/nxfonts/nxfonts_serif29x37.h
  *
  *   Copyright (C) 2011-2012 NX Engineering, S.A., All rights reserved.
  *   Author: Jose Pablo Carballo Gomez <jcarballo@nx-engineering.com>
diff --git a/nuttx/graphics/nxfonts/nxfonts_serif38x48.h b/nuttx/libnx/nxfonts/nxfonts_serif38x48.h
index 68a9d723e..7603e3091 100644
--- a/nuttx/graphics/nxfonts/nxfonts_serif38x48.h
+++ b/nuttx/libnx/nxfonts/nxfonts_serif38x48.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_serif38x48.h
+ * libnx/nxfonts/nxfonts_serif38x48.h
  *
  *   Copyright (C) 2011-2012 NX Engineering, S.A., All rights reserved.
  *   Author: Jose Pablo Carballo Gomez <jcarballo@nx-engineering.com>
diff --git a/nuttx/graphics/nxfonts/nxfonts_serif38x49b.h b/nuttx/libnx/nxfonts/nxfonts_serif38x49b.h
index 70291a045..9d9ae4679 100644
--- a/nuttx/graphics/nxfonts/nxfonts_serif38x49b.h
+++ b/nuttx/libnx/nxfonts/nxfonts_serif38x49b.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * graphics/nxfonts/nxfonts_serif38x49.h
+ * libnx/nxfonts/nxfonts_serif38x49.h
  *
  *   Copyright (C) 2011-2012 NX Engineering, S.A., All rights reserved.
  *   Author: Jose Pablo Carballo Gomez <jcarballo@nx-engineering.com>
diff --git a/nuttx/libnx/nxmu/nxmu_sendwindow.c b/nuttx/libnx/nxmu/nxmu_sendwindow.c
index 71909e089..f240c5614 100644
--- a/nuttx/libnx/nxmu/nxmu_sendwindow.c
+++ b/nuttx/libnx/nxmu/nxmu_sendwindow.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libnx/nxmu/nxmu_sendserver.c
+ * libnx/nxmu/nxmu_sendwindow.c
  *
  *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>