dslinux/user/pixil Makefile config
amadeus
dslinux_amadeus at user.in-berlin.de
Sat Oct 7 22:33:43 CEST 2006
Update of /cvsroot/dslinux/dslinux/user/pixil
In directory antilope:/tmp/cvs-serv4052/user/pixil
Modified Files:
Makefile config
Log Message:
start pixil integration in DSLINUX
Index: Makefile
===================================================================
RCS file: /cvsroot/dslinux/dslinux/user/pixil/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 3 Oct 2006 11:24:19 -0000 1.1
+++ Makefile 7 Oct 2006 20:33:40 -0000 1.2
@@ -17,6 +17,15 @@
IMAGES_DIR = $(BASE_DIR)/data/images
MCONFIG_DIR = $(BASE_DIR)/scripts/config
SYSDEP_DIR = $(BASE_DIR)/scripts/sysdep
+EN_SHARED = --enable-shared
+EN_STATIC = --enable-static
+
+ifdef CONFIG_PLATFORM_DSLINUX
+MW_PREFIX = $(BASE_DIR)/../microwin/src
+INSTALL_PREFIX = $(BASE_DIR)/../romfs/usr/pixil/
+EN_SHARED = --disable-shared
+CXXFLAGS += -Wno-deprecated
+endif
# The base directory for installing
ROOT_DIR = $(strip $(subst ",, $(INSTALL_PREFIX)))
@@ -51,12 +60,15 @@
ifeq ($(CONFIG_TARGET_I386_UCLIBC),y)
SYS=i386-uclibc-linux
endif
+ifdef CONFIG_PLATFORM_DSLINUX
+SYS=????
+endif
else
SYS=$(BUILD_SYS)
endif
export TARGET_CROSS BASE_DIR STAGE_DIR INCLUDE_DIR PAR_DB PAR_CONFIG
-export TOOL_DIR INSTALL_DIR ROOT_DIR SYS BUILD_SYS
+export TOOL_DIR INSTALL_DIR ROOT_DIR SYS BUILD_SYS EN_SHARED EN_STATIC MW_PREFIX
# Set up the list of directories based on the configuration
ifdef SUBDIRS
@@ -80,6 +92,7 @@
##### Toplevel targets #####
+.PHONY: all install clean distclean
all: local-build
install: local-install
clean: local-clean
@@ -87,8 +100,13 @@
distclean: local-clean packages-clean
@ rm -rf config
+# uCLinux builds: add PIXIL to the rom file system
+.PHONY: romfs
+romfs:
+
##### Local targets #####
+.PHONY: local-build local-install local-clean dostrip
local-build: $(STAGE_DIR) $(INCLUDE_DIR)/pixil_config.h $(subdir-build) platform-build
local-install: $(INSTALL_DIR) $(subdir-install) $(STRIP_TARGET) platform-install
@@ -108,6 +126,7 @@
fi; \
done
+.PHONY: $(subdir-build) $(subdir-clean) $(subdir-install)
$(subdir-build): dummy
@ $(MAKE) -C $(patsubst _subdir_%,%,$@)
@@ -117,6 +136,7 @@
$(subdir-install): dummy
@ $(MAKE) -C $(patsubst _install_%,%,$@) install
+.PHONY: platform-build platform-clean platform-install packages-clean
platform-build:
@ make -C scripts/platforms/
@@ -168,6 +188,7 @@
$(BASE_DIR)/config:
@ cp $(SYSDEP_DIR)/defconfig $(BASE_DIR)/config
+.PHONY: defconfig_ipaq defconfig_zaurus defconfig_tuxscreen defconfig_dslinux
defconfig_ipaq:
@ cp $(SYSDEP_DIR)/defconfig.ipaq $(BASE_DIR)/config
@@ -177,6 +198,9 @@
defconfig_tuxscreen:
@ cp $(SYSDEP_DIR)/defconfig.tuxscreen $(BASE_DIR)/config
+defconfig_dslinux:
+ @ cp $(SYSDEP_DIR)/defconfig.dslinux $(BASE_DIR)/config
+
dummy:
.PHONY: menuconfig textconfig oldconfig defconfig dummy packages
Index: config
===================================================================
RCS file: /cvsroot/dslinux/dslinux/user/pixil/config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- config 3 Oct 2006 11:24:19 -0000 1.1
+++ config 7 Oct 2006 20:33:41 -0000 1.2
@@ -15,16 +15,18 @@
# CONFIG_PLATFORM_IPAQ is not set
# CONFIG_PLATFORM_ZAURUS is not set
# CONFIG_PLATFORM_TUXSCREEN is not set
-CONFIG_PLATFORM_X86DEMO=y
-CONFIG_CPU_INTEL=y
+# CONFIG_PLATFORM_X86DEMO is not set
+# CONFIG_CPU_INTEL is not set
+CONFIG_PLATFORM_DSLINUX=y
#
# Build Options
#
-# CROSS_COMPILE is not set
+CROSS_COMPILE=y
# CONFIG_TARGET_ARM is not set
# CONFIG_TARGET_I386_UCLIBC is not set
-MW_PREFIX="/usr2/microwin/src/"
+CROSS_COMPILER_PREFIX="arm-linux-elf-"
+# MW_PREFIX="/usr2/microwin/src/"
CONFIG_FLNX=y
CONFIG_FLNX_PDA=y
CONFIG_FLEK=y
@@ -33,7 +35,7 @@
#
# Installation Options
#
-INSTALL_PREFIX="/usr/local/pixil"
+# INSTALL_PREFIX="/usr/local/pixil"
CONFIG_SAMPLES=y
#
@@ -114,20 +116,20 @@
#
# Nano-X Applications
#
-CONFIG_NXFLASH=y
+# CONFIG_NXFLASH is not set
# CONFIG_NXFLASH_RGB555 is not set
-CONFIG_VIEWML=y
-LIBWWW_PREFIX="/usr/"
-CONFIG_DVDVIEW=y
+# CONFIG_VIEWML is not set
+# LIBWWW_PREFIX="/usr/"
+# CONFIG_DVDVIEW is not set
#
# Nano-X Games
#
-CONFIG_NXDOOM=y
+# CONFIG_NXDOOM is not set
#
# Pixil Desktop
#
-CONFIG_PIXILDT=y
-CONFIG_PIXILDT_FLTK=y
-CONFIG_PIXILDT_FLTKDIR="/usr2/fltk-1.0.11"
+# CONFIG_PIXILDT is not set
+# CONFIG_PIXILDT_FLTK is not set
+# CONFIG_PIXILDT_FLTKDIR="/usr2/fltk-1.0.11"
More information about the dslinux-commit
mailing list