dslinux/user/pixil Makefile Rules.make

amadeus dslinux_amadeus at user.in-berlin.de
Tue Oct 10 07:53:29 CEST 2006


Update of /cvsroot/dslinux/dslinux/user/pixil
In directory antilope:/tmp/cvs-serv17746/user/pixil

Modified Files:
	Makefile Rules.make 
Log Message:
fix PIXIL install problems


Index: Rules.make
===================================================================
RCS file: /cvsroot/dslinux/dslinux/user/pixil/Rules.make,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Rules.make	8 Oct 2006 21:17:07 -0000	1.3
+++ Rules.make	10 Oct 2006 05:53:27 -0000	1.4
@@ -154,7 +154,11 @@
 
 	@ rm -rf $(PAR_CONFIG) $(LOCAL_DB)
 
-install: install-libs install-bin install-so $(INSTALL_EXTRAS)
+INSTALL_TARGETS = install-bin $(INSTALL_EXTRAS)
+ifeq ($(EN_SHARED),--enable-shared)
+INSTALL_TARGETS += install-libs install-so
+endif
+install: $(INSTALL_TARGETS)
 
 install-libs: $(INSTALL_DIR)/lib
 	@ if [ -n "$(LIB_SHARED)" ]; then \

Index: Makefile
===================================================================
RCS file: /cvsroot/dslinux/dslinux/user/pixil/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	8 Oct 2006 21:17:06 -0000	1.4
+++ Makefile	10 Oct 2006 05:53:27 -0000	1.5
@@ -22,7 +22,7 @@
 
 ifdef CONFIG_PLATFORM_DSLINUX
 MW_PREFIX       = $(BASE_DIR)/../microwin/src
-INSTALL_PREFIX  = $(BASE_DIR)/../romfs/usr/pixil/
+INSTALL_PREFIX  = $(BASE_DIR)/../../romfs/usr/pixil/
 EN_SHARED	= --disable-shared
 #CFLAGS         += -D_GNU_SOURCE
 CFLAGS	       += -fno-exceptions
@@ -104,7 +104,7 @@
 
 # uCLinux builds: add PIXIL to the rom file system
 .PHONY: romfs
-romfs:
+romfs:	install
 
 ##### Local targets #####
 




More information about the dslinux-commit mailing list