diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-11-26 15:46:12 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-11-26 15:46:12 +0000 |
| commit | ee438548a33bafc438ec1d1904b6a24b3da20fcf (patch) | |
| tree | c13824025692c6677f354930bfc496d2eb703fc4 /nuttx/Makefile | |
| parent | bc1e4c68875adead6367143ca0ef662bf53eaeb8 (diff) | |
| download | px4-nuttx-ee438548a33bafc438ec1d1904b6a24b3da20fcf.tar.gz px4-nuttx-ee438548a33bafc438ec1d1904b6a24b3da20fcf.tar.bz2 px4-nuttx-ee438548a33bafc438ec1d1904b6a24b3da20fcf.zip | |
graphics dir now has its own makefile
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1308 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/Makefile')
| -rw-r--r-- | nuttx/Makefile | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/nuttx/Makefile b/nuttx/Makefile index de2dec084..eafdc5e01 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -55,14 +55,13 @@ BOARD_DIR = configs/$(CONFIG_ARCH_BOARD) # NuttX source tree (they must be specifically installed) PCODE_DIR := ${shell if [ -r pcode/Makefile ]; then echo "pcode"; fi} -NX_DIR := ${shell if [ -r graphics/nx/Makefile ]; then echo "graphics/nx"; fi} ADDON_DIRS := $(PCODE_DIR) $(NX_DIR) # FSDIRS depend on file descriptor support; NONFSDIRS do not # (except for parts of FSDIRS). We will exclude FSDIRS # from the build if file descriptor support is disabled -NONFSDIRS = sched lib $(ARCH_SRC) mm examples/$(CONFIG_EXAMPLE) $(ADDON_DIRS) graphics/nxglib +NONFSDIRS = sched lib $(ARCH_SRC) mm examples/$(CONFIG_EXAMPLE) $(ADDON_DIRS) graphics FSDIRS = fs drivers ifeq ($(CONFIG_NET),y) @@ -94,7 +93,7 @@ endif LINKLIBS = sched/libsched$(LIBEXT) $(ARCH_SRC)/libarch$(LIBEXT) mm/libmm$(LIBEXT) \ lib/liblib$(LIBEXT) examples/$(CONFIG_EXAMPLE)/lib$(CONFIG_EXAMPLE)$(LIBEXT) \ - graphics/nxglib/libnxglib$(LIBEXT) + graphics/libgraphics$(LIBEXT) ifeq ($(CONFIG_NET),y) LINKLIBS += net/libnet$(LIBEXT) netutils/libnetutils$(LIBEXT) @@ -203,11 +202,8 @@ drivers/libdrivers$(LIBEXT): context pcode/libpcode$(LIBEXT): context @$(MAKE) -C pcode TOPDIR="$(TOPDIR)" libpcode$(LIBEXT) -graphics/nxglib/libnxglib$(LIBEXT): context - @$(MAKE) -C graphics/nxglib TOPDIR="$(TOPDIR)" libnxglib$(LIBEXT) - -graphics/nx/libnx$(LIBEXT): context - @$(MAKE) -C graphics/nx TOPDIR="$(TOPDIR)" libnx$(LIBEXT) +graphics/libgraphics$(LIBEXT): context + @$(MAKE) -C graphics TOPDIR="$(TOPDIR)" libgraphics$(LIBEXT) examples/$(CONFIG_EXAMPLE)/lib$(CONFIG_EXAMPLE)$(LIBEXT): context @$(MAKE) -C examples/$(CONFIG_EXAMPLE) TOPDIR="$(TOPDIR)" lib$(CONFIG_EXAMPLE)$(LIBEXT) |