X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=Makefile;h=13d101ce154780815300aae9cd81e9cfb2d1b900;hp=7c5c1bc852476cc7393c01c8d1702f9736507b51;hb=6166753b1295119cfd8f7a5973b0b523098ef263;hpb=3ce60078293dd1b2cdf46841fe41afd80913c698

diff --git a/Makefile b/Makefile
index 7c5c1bc..13d101c 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 include Config
 
-VERSION = 1.3.6
+VERSION = 1.3.13
 # Debug mode (spam/verbose)
 DEBUG = 0
 # make install vars
@@ -26,11 +26,16 @@ KERNELADDR	= 0x01400000
 # Set this to the prefix of your cross-compiler, if you have one.
 # Else leave it empty.
 #
-CROSS = 
+CROSS =
+
+CC		:= $(CROSS)gcc
+LD		:= $(CROSS)ld
+AS		:= $(CROSS)as
+OBJCOPY		:= $(CROSS)objcopy
 
 # The flags for the yaboot binary.
 #
-YBCFLAGS = -Os $(CFLAGS) -nostdinc -Wall -isystem `gcc -print-file-name=include` -fsigned-char
+YBCFLAGS = -Os $(CFLAGS) -nostdinc -Wall -isystem `$(CC) -print-file-name=include` -fsigned-char
 YBCFLAGS += -DVERSION=\"${VERSION}\"	#"
 YBCFLAGS += -DTEXTADDR=$(TEXTADDR) -DDEBUG=$(DEBUG)
 YBCFLAGS += -DMALLOCADDR=$(MALLOCADDR) -DMALLOCSIZE=$(MALLOCSIZE)
@@ -59,11 +64,11 @@ endif
 
 # Link flags
 #
-LFLAGS = -Ttext $(TEXTADDR) -Bstatic 
+LFLAGS = -Ttext $(TEXTADDR) -Bstatic
 
 # Libraries
 #
-LLIBS = lib/libext2fs.a
+LLIBS = -lext2fs
 
 # For compiling userland utils
 #
@@ -94,11 +99,6 @@ OBJS += second/fs_reiserfs.o
 endif
 
 # compilation
-CC		:= $(CROSS)gcc
-LD		:= $(CROSS)ld
-AS		:= $(CROSS)as
-OBJCOPY		:= $(CROSS)objcopy
-
 lgcc = `$(CC) -print-libgcc-file-name`
 
 all: yaboot addnote mkofboot
@@ -148,10 +148,11 @@ bindist: all
 
 clean:
 	rm -f second/yaboot util/addnote util/elfextract $(OBJS)
-	find . -path './{arch}' -prune -o -name '#*' | xargs rm -f
-	find . -path './{arch}' -prune -o -name '.#*' | xargs rm -f
-	find . -path './{arch}' -prune -o -name '*~' | xargs rm -f
-	find . -path './{arch}' -prune -o -name '*.swp' | xargs rm -f
+	find . -not -path './\{arch\}*' -name '#*' | xargs rm -f
+	find . -not -path './\{arch\}*' -name '.#*' | xargs rm -f
+	find . -not -path './\{arch\}*' -name '*~' | xargs rm -f
+	find . -not -path './\{arch\}*' -name '*.swp' | xargs rm -f
+	find . -not -path './\{arch\}*' -name ',,*' | xargs rm -rf
 	-gunzip man/*.gz
 	rm -rf man.deb
 
@@ -164,6 +165,7 @@ cleandocs:
 archclean:
 	rm -rf '{arch}'
 	find . -type d -name .arch-ids | xargs rm -rf
+	rm -f 0arch-timestamps0
 
 maintclean: clean cleandocs