Netboot fixes:

[yaboot.git] / Makefile

diff --git a/Makefile b/Makefile
index 91fdf6263386dd0f0f83b071c50759f9e3fabf8b..13d101ce154780815300aae9cd81e9cfb2d1b900 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 include Config
 
 
 include Config
 

-VERSION = 1.3.5pre3
+VERSION = 1.3.13

 # Debug mode (spam/verbose)
 DEBUG = 0
 # make install vars
 # 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.
 #
 # 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.
 #
 
 # 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)
 YBCFLAGS += -DVERSION=\"${VERSION}\"   #"
 YBCFLAGS += -DTEXTADDR=$(TEXTADDR) -DDEBUG=$(DEBUG)
 YBCFLAGS += -DMALLOCADDR=$(MALLOCADDR) -DMALLOCSIZE=$(MALLOCSIZE)


@@ -59,11 +64,11 @@ endif
 
 # Link flags
 #
 
 # Link flags
 #

-LFLAGS = -Ttext $(TEXTADDR) -Bstatic 
+LFLAGS = -Ttext $(TEXTADDR) -Bstatic

 
 # Libraries
 #
 
 # Libraries
 #

-LLIBS = lib/libext2fs.a
+LLIBS = -lext2fs

 
 # For compiling userland utils
 #
 
 # For compiling userland utils
 #


@@ -93,11 +98,7 @@ ifeq ($(CONFIG_FS_REISERFS),y)
 OBJS += second/fs_reiserfs.o
 endif
 
 OBJS += second/fs_reiserfs.o
 endif
 

-CC = $(CROSS)gcc
-LD = $(CROSS)ld
-AS = $(CROSS)as
-OBJCOPY = $(CROSS)objcopy
-
+# compilation

 lgcc = `$(CC) -print-libgcc-file-name`
 
 all: yaboot addnote mkofboot
 lgcc = `$(CC) -print-libgcc-file-name`
 
 all: yaboot addnote mkofboot


@@ -110,7 +111,7 @@ addnote:
        $(CC) $(UCFLAGS) -o util/addnote util/addnote.c
 
 elfextract:
        $(CC) $(UCFLAGS) -o util/addnote util/addnote.c
 
 elfextract:

-       $(HOSTCC) $(HOSTCFLAGS) -o util/elfextract util/elfextract.c
+       $(CC) $(UCFLAGS) -o util/elfextract util/elfextract.c

 
 mkofboot:
        ln -sf ybin ybin/mkofboot
 
 mkofboot:
        ln -sf ybin ybin/mkofboot


@@ -128,28 +129,47 @@ mkofboot:
 dep:
        makedepend -Iinclude *.c lib/*.c util/*.c gui/*.c
 
 dep:
        makedepend -Iinclude *.c lib/*.c util/*.c gui/*.c
 

+docs:
+       make -C doc all
+

 bindist: all
        mkdir ../yaboot-binary-${VERSION}
 bindist: all
        mkdir ../yaboot-binary-${VERSION}

-       ${GETROOT} make ROOT=../yaboot-binary-${VERSION} install
+       $(GETROOT) make ROOT=../yaboot-binary-${VERSION} install

        mkdir -p -m 755 ../yaboot-binary-${VERSION}/usr/local/share/doc/yaboot
        cp -a COPYING ../yaboot-binary-${VERSION}/usr/local/share/doc/yaboot/COPYING
        cp -a README ../yaboot-binary-${VERSION}/usr/local/share/doc/yaboot/README
        mkdir -p -m 755 ../yaboot-binary-${VERSION}/usr/local/share/doc/yaboot
        cp -a COPYING ../yaboot-binary-${VERSION}/usr/local/share/doc/yaboot/COPYING
        cp -a README ../yaboot-binary-${VERSION}/usr/local/share/doc/yaboot/README

-       mv ../yaboot-binary-${VERSION}/etc/yaboot.conf ../yaboot-binary-${VERSION}/usr/local/share/doc/
+       cp -a doc/README.rs6000 ../yaboot-binary-${VERSION}/usr/local/share/doc/yaboot/README.rs6000
+       cp -a doc/yaboot-howto.html ../yaboot-binary-${VERSION}/usr/local/share/doc/yaboot/yaboot-howto.html
+       cp -a doc/yaboot-howto.sgml ../yaboot-binary-${VERSION}/usr/local/share/doc/yaboot/yaboot-howto.sgml
+       mv ../yaboot-binary-${VERSION}/etc/yaboot.conf ../yaboot-binary-${VERSION}/usr/local/share/doc/yaboot/

        rmdir ../yaboot-binary-${VERSION}/etc
        rmdir ../yaboot-binary-${VERSION}/etc

-       ${GETROOT} tar -C ../yaboot-binary-${VERSION} -zcvpf ../yaboot-binary-${VERSION}.tar.gz .
+       $(GETROOT) tar -C ../yaboot-binary-${VERSION} -zcvpf ../yaboot-binary-${VERSION}.tar.gz .

        rm -rf ../yaboot-binary-${VERSION}
 
 clean:
        rm -f second/yaboot util/addnote util/elfextract $(OBJS)
        rm -rf ../yaboot-binary-${VERSION}
 
 clean:
        rm -f second/yaboot util/addnote util/elfextract $(OBJS)

-       find . -name '#*' | xargs rm -f
-       find . -name '.#*' | xargs rm -f
-       find . -name '*~' | xargs rm -f
-       find . -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
        -gunzip man/*.gz
        rm -rf man.deb

-       chmod 755 ybin/ybin ybin/ofpath ybin/yabootconfig
-       chmod -R u+rwX,go=rX .
-       chmod a-w COPYING
+
+cleandocs:
+       make -C doc clean
+
+## removes arch revision control crap, only to be called for making
+## release tarballs.  arch should have a export command like cvs...
+
+archclean:
+       rm -rf '{arch}'
+       find . -type d -name .arch-ids | xargs rm -rf
+       rm -f 0arch-timestamps0
+
+maintclean: clean cleandocs
+
+release: docs bindist clean

 
 strip: all
        strip second/yaboot
 
 strip: all
        strip second/yaboot


@@ -190,7 +210,7 @@ install: all strip
        @echo
        @echo "Installation successful."
        @echo
        @echo
        @echo "Installation successful."
        @echo

-       @echo "An example /etc/yaboot.conf has been installed (unless /etc/yaboot.conf already existed"
+       @echo "An example /etc/yaboot.conf has been installed (unless /etc/yaboot.conf already existed)"

        @echo "You may either alter that file to match your system, or alternatively run yabootconfig"
        @echo "yabootconfig will generate a simple and valid /etc/yaboot.conf for your system"
        @echo
        @echo "You may either alter that file to match your system, or alternatively run yabootconfig"
        @echo "yabootconfig will generate a simple and valid /etc/yaboot.conf for your system"
        @echo