r376 - in x86/trunk: . packages packages/vim

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Mon Jul 18 22:02:11 PDT 2005


Author: jhuntwork
Date: 2005-07-18 23:02:10 -0600 (Mon, 18 Jul 2005)
New Revision: 376

Added:
   x86/trunk/packages/gtk2/
   x86/trunk/packages/initramfs
Removed:
   x86/trunk/packages/gtk+2/
Modified:
   x86/trunk/Makefile
   x86/trunk/packages/vim/Makefile
Log:
Major simplification of main Makefile - changes to initramfs, vim and gtk+2 to ease transition

Modified: x86/trunk/Makefile
===================================================================
--- x86/trunk/Makefile	2005-07-19 03:18:36 UTC (rev 375)
+++ x86/trunk/Makefile	2005-07-19 05:02:10 UTC (rev 376)
@@ -168,15 +168,15 @@
 	@install -m 755 uname/uname ${WD}/bin/
 	@touch $@
 
-tools:  pre-which pre-wget lfs-binutils-pass1-scpt lfs-gcc-pass1-scpt \
-	lfs-linux-libc-headers-scpt lfs-glibc-scpt lfs-adjust-toolchain-scpt \
+tools:  pre-which pre-wget lfs-binutils-pass1 lfs-gcc-pass1 \
+	lfs-linux-libc-headers-scpt lfs-glibc-scpt lfs-adjust-toolchain \
 	lfs-tcl-scpt lfs-expect-scpt lfs-dejagnu-scpt lfs-gcc-pass2-scpt \
 	lfs-binutils-pass2-scpt lfs-gawk-scpt lfs-coreutils-scpt \
 	lfs-bzip2-scpt lfs-gzip-scpt lfs-diffutils-scpt lfs-findutils-scpt \
 	lfs-make-scpt lfs-grep-scpt lfs-sed-scpt lfs-gettext-scpt \
 	lfs-ncurses-scpt lfs-patch-scpt lfs-tar-scpt lfs-texinfo-scpt \
 	lfs-bash-scpt lfs-m4-scpt lfs-bison-scpt lfs-flex-scpt \
-	lfs-util-linux-scpt lfs-perl-scpt lfs-strip-scpt
+	lfs-util-linux-scpt lfs-perl-scpt lfs-strip
 	@cp /etc/resolv.conf $(WD)/etc
 
 prep-chroot:
@@ -189,7 +189,7 @@
 	@touch $@
 
 pre-bash: createdirs createfiles popdev ch-linux-libc-headers ch-man-pages \
-	ch-glibc ch-re-adjust-toolchain ch-binutils ch-gcc ch-coreutils \
+	ch-glibc re-adjust-toolchain ch-binutils ch-gcc ch-coreutils \
 	ch-zlib ch-mktemp ch-iana-etc ch-findutils ch-gawk ch-sharutils \
 	ch-gpm ch-ncurses ch-readline ch-vim ch-m4 ch-bison ch-less ch-groff \
 	ch-sed ch-flex ch-gettext ch-inetutils ch-iproute2 ch-perl ch-texinfo \
@@ -198,17 +198,17 @@
 post-bash: ch-file ch-libtool ch-bzip2 ch-diffutils ch-kbd ch-e2fsprogs \
 	ch-grep ch-grub ch-gzip ch-hotplug ch-man ch-make \
 	ch-module-init-tools ch-patch ch-procps ch-psmisc ch-shadow \
-	ch-sysklogd ch-sysvinit ch-tar ch-udev ch-util-linux ch-environment
+	ch-sysklogd ch-sysvinit ch-tar ch-udev ch-util-linux final-environment
 
 blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-slang ch-nano ch-joe \
 	ch-screen ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat \
 	ch-subversion ch-lfs-bootscripts ch-docbook-xml ch-libxslt \
 	ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng ch-freetype \
 	ch-fontconfig ch-Xorg ch-freefont ch-inputattach ch-fonts-dejavu \
-	ch-update-fontsdir ch-libjpeg ch-libtiff ch-links ch-openssh \
+	update-fontsdir ch-libjpeg ch-libtiff ch-links ch-openssh \
 	ch-pkgconfig ch-glib2 ch-libungif ch-imlib2 ch-pango ch-atk ch-gtk2 \
 	ch-cvs ch-popt ch-samba ch-libIDL ch-firefox ch-thunderbird \
-	ch-startup-notification ch-gvim ch-xfce ch-lua ch-ion ch-irssi \
+	ch-startup-notification chroot-gvim ch-xfce ch-lua ch-ion ch-irssi \
 	ch-xchat ch-tcpwrappers ch-portmap ch-nfs-utils ch-traceroute \
 	ch-dialog ch-ncftp ch-pciutils ch-nALFS ch-device-mapper ch-LVM2 \
 	ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs \
@@ -216,109 +216,41 @@
 	ch-linux ch-klibc ch-unionfs ch-initramfs ch-cdrtools \
 	ch-blfs-bootscripts ch-syslinux ch-nALFS-profile
 
-# Rules for building tools/stage1
-# These can be called individually, if necessary
+# Targets for building packages individually. Useful for troubleshooting.
+# These do not generally get used as part of the script. They're for manual
+# use only ie, 'make [target]'
+#==============================================================================
 
 lfs-wget: unamemod lfsuser
 	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) pre-wget'"
 
 lfs-rm-wget: unamemod lfsuser
 	@su - lfs -c "$(lfsenv) '$(lfsbash) &&rm $(WD)/bin/wget'"
-	
-lfs-binutils-pass1: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-binutils-pass1-scpt'"
 
-lfs-gcc-pass1: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-gcc-pass1-scpt'"
+# The following takes the form 'make lfs-[package name]-only'	
+lfs-%-only: unamemod lfsuser
+	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-$*-scpt'"
 
-lfs-linux-libc-headers: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-linux-libc-headers-scpt'"
+# The following two take the form 'make lfs-[package name]-only-pass#'	
+lfs-%-only-pass1: unamemod lfsuser
+	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-$*-pass1'"
 
-lfs-glibc: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-glibc-scpt'"
+lfs-%-only-pass2: unamemod lfsuser
+	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-$*-pass2'"
 
-lfs-adjust-toolchain: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-adjust-toolchain-scpt'"
+# The following takes the form 'make [package name]-only-ch'	
+%-only-ch: prep-chroot
+	make -C $(PKG)/$@ chroot
+	make unmount
 
-lfs-tcl: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-tcl-scpt'"
+gvim: prep-chroot
+	make -C $(PKG)/vim chroot3
+	make unmount
 
-lfs-expect: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-expect-scpt'"
+# The targets below can be called manually, but are also used by the
+# scripts internally.
+#==============================================================================
 
-lfs-dejagnu: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-dejagnu-scpt'"
-
-lfs-gcc-pass2: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-gcc-pass2-scpt'"
-
-lfs-binutils-pass2: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-binutils-pass2-scpt'"
-
-lfs-gawk: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-gawk-scpt'"
-
-lfs-coreutils: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-coreutils-scpt'"
-
-lfs-bzip2: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-bzip2-scpt'"
-
-lfs-gzip: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-gzip-scpt'"
-
-lfs-diffutils: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-diffutils-scpt'"
-
-lfs-findutils: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-findutils-scpt'"
-
-lfs-make: uanmemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-make-scpt'"
-
-lfs-grep: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-grep-scpt'"
-
-lfs-sed: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-sed-scpt'"
-
-lfs-gettext: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-gettext-scpt'"
-
-lfs-ncurses: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-ncurses-scpt'"
-
-lfs-patch: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-patch-scpt'"
-
-lfs-tar: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-tar-scpt'"
-
-lfs-texinfo: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-texinfo-scpt'"
-
-lfs-bash: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-bash-scpt'"
-
-lfs-m4: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-m4-scpt'"
-
-lfs-bison: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-bison-scpt'"
-
-lfs-flex: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-flex-scpt'"
-
-lfs-util-linux: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-util-linux-scpt'"
-
-lfs-perl: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-perl-scpt'"
-
-lfs-strip: unamemod lfsuser
-	@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-strip-scpt'"
-	@touch lfs-strip
-
 createdirs:
 	@-$(WD)/bin/install -d /{bin,boot,dev,etc/opt,home,lib,mnt}
 	@-$(WD)/bin/install -d /{sbin,srv,usr/local,var,opt}
@@ -389,815 +321,36 @@
 	 mount -t tmpfs none /dev/shm ; fi
 	@if [ -f /sbin/udevstart ] ; then /sbin/udevstart ; fi
 
-linux-libc-headers: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
 
-man-pages: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-	
-glibc: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
+# Do not call the targets below manually! They are used internally and must be
+# called by other targets.
+#==============================================================================
 
-re-adjust-toolchain: prep-chroot
-	make -C $(PKG)/binutils chroot-re-adjust-toolchain
-	make unmount
+lfs-%-scpt:
+	$(MAKE) -C $(PKG)/$* stage1
 
-binutils: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
+lfs-%-pass1:
+	$(MAKE) -C $(PKG)/$* pass1
 
-gcc: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
+lfs-%-pass2:
+	$(MAKE) -C $(PKG)/$* pass2
 
-coreutils: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-zlib: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-mktemp: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-iana-etc: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-findutils: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-gawk: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-sharutils: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-ncurses: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-readline: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-vim: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-m4: prep-chroot   
-	make -C $(PKG)/$@ chroot
-	make unmount
-	
-bison: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-less: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-groff: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-sed: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-flex: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-gettext: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-inetutils: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-iproute2: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-perl: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-texinfo: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-autoconf: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-automake: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-bash: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-file: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-libtool: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-bzip2: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-diffutils: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-kbd: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-e2fsprogs: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-grep: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-grub: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-gzip: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-hotplug: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-man: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-make: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-module-init-tools: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-patch: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-procps: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-psmisc: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-shadow: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-sysklogd: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-sysvinit: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-tar: prep-chroot 
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-udev: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-util-linux: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-
-lfs-bootscripts: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-wget: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-reiserfsprogs: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-xfsprogs: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-slang: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-nano: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-joe: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-screen: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-openssl: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-curl: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-gpm: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-zip: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-unzip: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-lynx: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-libxml2: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-expat: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-subversion: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-docbook-xml: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-libxslt: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-docbook-xsl: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-html_tidy: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-LFS-BOOK: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-libpng: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-freetype: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-fontconfig: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-Xorg: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-freefont: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-fonts-dejavu: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-libjpeg: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-libtiff: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-links: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-openssh: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-pkgconfig: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-glib2: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-libungif: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-imlib2: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-pango: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-atk: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-gtk2: prep-chroot
-	make -C $(PKG)/gtk+2 chroot
-	make unmount
-
-cvs: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-libIDL: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-firefox: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-thunderbird: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-startup-notification: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-gvim: prep-chroot
-	make -C $(PKG)/vim chroot3
-	make unmount
-
-xfce: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-lua: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-ion: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-irssi: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-xchat: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-samba: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-tcpwrappers: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-portmap: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-nfs-utils: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-traceroute: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-dialog: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-ncftp: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-pciutils: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-nALFS: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-device-mapper: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-LVM2: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-dhcpcd: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-distcc: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-popt: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-inputattach: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-ppp: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-rp-pppoe: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-libaal: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-reiser4progs: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-squashfs: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-cpio: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-mutt: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-msmtp: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-slrn: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-raidtools: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-eject: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-linux: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-cdrtools: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-blfs-bootscripts: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-syslinux: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-klibc: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-unionfs: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-nALFS-profile: prep-chroot
-	make -C $(PKG)/$@ chroot
-	make unmount
-
-initramfs: prep-chroot
-	make -C $@ chroot
-	make unmount
-
-strip: prep-chroot
-	@chroot $(MP) $(chenvstrip) 'cd $(ROOT) && make ch-strip'
-	make unmount
-
-# Do Not call the rules below manually!
-# They are used internally and must be called by
-# other rules.
-
-lfs-binutils-pass1-scpt:
-	$(MAKE) -C $(PKG)/binutils pass1
-
-lfs-gcc-pass1-scpt:
-	$(MAKE) -C $(PKG)/gcc pass1
-
-lfs-linux-libc-headers-scpt:
-	$(MAKE) -C $(PKG)/linux-libc-headers stage1
-
-lfs-glibc-scpt:
-	$(MAKE) -C $(PKG)/glibc stage1
-
-lfs-adjust-toolchain-scpt:
+lfs-adjust-toolchain:
 	$(MAKE) -C $(PKG)/binutils adjust-toolchain
 
-lfs-tcl-scpt:
-	$(MAKE) -C $(PKG)/tcl stage1
-
-lfs-expect-scpt:
-	$(MAKE) -C $(PKG)/expect stage1
-
-lfs-dejagnu-scpt:
-	$(MAKE) -C $(PKG)/dejagnu stage1
-
-lfs-gcc-pass2-scpt:
-	$(MAKE) -C $(PKG)/gcc pass2
-
-lfs-binutils-pass2-scpt:
-	$(MAKE) -C $(PKG)/binutils pass2
-
-lfs-gawk-scpt:
-	$(MAKE) -C $(PKG)/gawk stage1
-
-lfs-coreutils-scpt:
-	$(MAKE) -C $(PKG)/coreutils stage1
-
-lfs-bzip2-scpt:
-	$(MAKE) -C $(PKG)/bzip2 stage1
-
-lfs-gzip-scpt:
-	$(MAKE) -C $(PKG)/gzip stage1
-
-lfs-diffutils-scpt:
-	$(MAKE) -C $(PKG)/diffutils stage1
-
-lfs-findutils-scpt:
-	$(MAKE) -C $(PKG)/findutils stage1
-
-lfs-make-scpt:
-	$(MAKE) -C $(PKG)/make stage1
-
-lfs-grep-scpt:
-	$(MAKE) -C $(PKG)/grep stage1
-
-lfs-sed-scpt:
-	$(MAKE) -C $(PKG)/sed stage1
-
-lfs-gettext-scpt:
-	$(MAKE) -C $(PKG)/gettext stage1
-
-lfs-ncurses-scpt:
-	$(MAKE) -C $(PKG)/ncurses stage1
-
-lfs-patch-scpt:
-	$(MAKE) -C $(PKG)/patch stage1
-
-lfs-tar-scpt:
-	$(MAKE) -C $(PKG)/tar stage1
-
-lfs-texinfo-scpt:
-	$(MAKE) -C $(PKG)/texinfo stage1
-
-lfs-bash-scpt:
-	$(MAKE) -C $(PKG)/bash stage1
-
-lfs-m4-scpt:
-	$(MAKE) -C $(PKG)/m4 stage1
-
-lfs-bison-scpt:
-	$(MAKE) -C $(PKG)/bison stage1
-
-lfs-flex-scpt:
-	$(MAKE) -C $(PKG)/flex stage1
-
-lfs-util-linux-scpt:
-	$(MAKE) -C $(PKG)/util-linux stage1
-
-lfs-perl-scpt:
-	$(MAKE) -C $(PKG)/perl stage1
-
-lfs-strip-scpt:
+lfs-strip:
 	@-strip --strip-debug $(WD)/lib/*
 	@-strip --strip-unneeded $(WD)/{,s}bin/*
 	@-rm -rf $(WD)/{doc,info,man}
-	@touch lfs-strip-scpt
+	@touch $@
 
-ch-linux-libc-headers: popdev
-	make -C $(PKG)/linux-libc-headers stage2
+ch-%: popdev
+	make -C $(PKG)/$* stage2
 
-ch-man-pages: popdev
-	make -C $(PKG)/man-pages stage2
-
-ch-glibc: popdev
-	make -C $(PKG)/glibc stage2
-
-ch-re-adjust-toolchain: popdev
+re-adjust-toolchain: popdev
 	make -C $(PKG)/binutils re-adjust-toolchain
 
-ch-binutils: popdev
-	make -C $(PKG)/binutils stage2
-
-ch-gcc: popdev
-	make -C $(PKG)/gcc stage2
-
-ch-coreutils: popdev
-	make -C $(PKG)/coreutils stage2
-
-ch-zlib: popdev
-	make -C $(PKG)/zlib stage2
-
-ch-mktemp: popdev
-	make -C $(PKG)/mktemp stage2
-
-ch-iana-etc: popdev
-	make -C $(PKG)/iana-etc stage2
-
-ch-findutils: popdev
-	make -C $(PKG)/findutils stage2
-
-ch-gawk: popdev
-	make -C $(PKG)/gawk stage2
-
-ch-sharutils: popdev
-	make -C $(PKG)/sharutils stage2
-
-ch-ncurses: popdev
-	make -C $(PKG)/ncurses stage2
-
-ch-readline: popdev
-	make -C $(PKG)/readline stage2
-
-ch-vim: popdev
-	make -C $(PKG)/vim stage2
-
-ch-m4: popdev
-	make -C $(PKG)/m4 stage2
-
-ch-bison: popdev
-	make -C $(PKG)/bison stage2
-
-ch-less: popdev
-	make -C $(PKG)/less stage2
-
-ch-groff: popdev
-	make -C $(PKG)/groff stage2
-
-ch-sed: popdev
-	make -C $(PKG)/sed stage2
-
-ch-flex: popdev
-	make -C $(PKG)/flex stage2
-
-ch-gettext: popdev
-	make -C $(PKG)/gettext stage2
-
-ch-inetutils: popdev
-	make -C $(PKG)/inetutils stage2
-
-ch-iproute2: popdev
-	make -C $(PKG)/iproute2 stage2
-
-ch-perl: popdev
-	make -C $(PKG)/perl stage2
-
-ch-texinfo: popdev
-	make -C $(PKG)/texinfo stage2
-
-ch-autoconf: popdev
-	make -C $(PKG)/autoconf stage2
-
-ch-automake: popdev
-	make -C $(PKG)/automake stage2
-
-ch-bash: popdev
-	make -C $(PKG)/bash stage2
-
-ch-file: popdev
-	make -C $(PKG)/file stage2
-
-ch-libtool: popdev
-	make -C $(PKG)/libtool stage2
-
-ch-bzip2: popdev
-	make -C $(PKG)/bzip2 stage2
-
-ch-diffutils: popdev
-	make -C $(PKG)/diffutils stage2
-
-ch-kbd: popdev
-	make -C $(PKG)/kbd stage2
-
-ch-e2fsprogs: popdev
-	make -C $(PKG)/e2fsprogs stage2
-
-ch-grep: popdev
-	make -C $(PKG)/grep stage2
-
-ch-grub: popdev
-	make -C $(PKG)/grub stage2
-
-ch-gzip: popdev
-	make -C $(PKG)/gzip stage2
-
-ch-hotplug: popdev
-	make -C $(PKG)/hotplug stage2
-
-ch-man: popdev
-	make -C $(PKG)/man stage2
-
-ch-make: popdev
-	make -C $(PKG)/make stage2
-
-ch-module-init-tools: popdev
-	make -C $(PKG)/module-init-tools stage2
-
-ch-patch: popdev
-	make -C $(PKG)/patch stage2
-
-ch-procps: popdev
-	make -C $(PKG)/procps stage2
-
-ch-psmisc: popdev
-	make -C $(PKG)/psmisc stage2
-
-ch-shadow: popdev
-	make -C $(PKG)/shadow stage2
-
-ch-sysklogd: popdev
-	make -C $(PKG)/sysklogd stage2
-
-ch-sysvinit: popdev
-	make -C $(PKG)/sysvinit stage2
-
-ch-tar: popdev
-	make -C $(PKG)/tar stage2
-
-ch-udev: popdev
-	make -C $(PKG)/udev stage2
-
-ch-util-linux: popdev
-	make -C $(PKG)/util-linux stage2
-
-ch-lfs-bootscripts: popdev
-	make -C $(PKG)/lfs-bootscripts stage2
-
-ch-environment:
+final-environment:
 	@cp -ra $(ROOT)/etc/sysconfig /etc
 	@-cp $(ROOT)/etc/inputrc /etc
 	@-cp $(ROOT)/etc/bashrc /etc
@@ -1206,262 +359,13 @@
 	@-cp $(ROOT)/etc/hosts /etc
 	@-cp $(ROOT)/etc/fstab /etc
 
-ch-wget: popdev
-	make -C $(PKG)/wget stage2
+update-fontsdir: popdev
+	cd /usr/X11R6/lib/X11/fonts/TTF ; /usr/X11R6/bin/mkfontscale ; \
+	/usr/X11R6/bin/mkfontdir ; /usr/bin/fc-cache -f
 
-ch-reiserfsprogs: popdev
-	make -C $(PKG)/reiserfsprogs stage2
-
-ch-xfsprogs: popdev
-	make -C $(PKG)/xfsprogs stage2
-
-ch-slang: popdev
-	make -C $(PKG)/slang stage2
-
-ch-nano: popdev
-	make -C $(PKG)/nano stage2
-
-ch-joe: popdev
-	make -C $(PKG)/joe stage2
-
-ch-screen: popdev
-	make -C $(PKG)/screen stage2
-
-ch-openssl: popdev
-	make -C $(PKG)/openssl stage2
-
-ch-curl: popdev
-	make -C $(PKG)/curl stage2
-
-ch-gpm: popdev
-	make -C $(PKG)/gpm stage2
-
-ch-zip: popdev
-	make -C $(PKG)/zip stage2
-
-ch-unzip: popdev
-	make -C $(PKG)/unzip stage2
-
-ch-lynx: popdev
-	make -C $(PKG)/lynx stage2
-
-ch-libxml2: popdev
-	make -C $(PKG)/libxml2 stage2
-
-ch-expat: popdev
-	make -C $(PKG)/expat stage2
-
-ch-subversion: popdev
-	make -C $(PKG)/subversion stage2
-
-ch-docbook-xml: popdev
-	make -C $(PKG)/docbook-xml stage2
-
-ch-libxslt: popdev
-	make -C $(PKG)/libxslt stage2
-
-ch-docbook-xsl: popdev
-	make -C $(PKG)/docbook-xsl stage2
-
-ch-html_tidy: popdev
-	make -C $(PKG)/html_tidy stage2
-
-ch-LFS-BOOK: popdev
-	make -C $(PKG)/LFS-BOOK stage2
-
-ch-libpng: popdev
-	make -C $(PKG)/libpng stage2
-
-ch-freetype: popdev
-	make -C $(PKG)/freetype stage2
-
-ch-fontconfig: popdev
-	make -C $(PKG)/fontconfig stage2
-
-ch-Xorg: popdev
-	make -C $(PKG)/Xorg stage2
-
-ch-freefont: popdev
-	make -C $(PKG)/freefont stage2
-
-ch-fonts-dejavu: popdev
-	make -C $(PKG)/fonts-dejavu stage2
-
-ch-update-fontsdir: popdev
-	cd /usr/X11R6/lib/X11/fonts/TTF ; /usr/X11R6/bin/mkfontscale ; /usr/X11R6/bin/mkfontdir ; /usr/bin/fc-cache -f
-
-ch-libjpeg: popdev
-	make -C $(PKG)/libjpeg stage2
-
-ch-libtiff: popdev
-	make -C $(PKG)/libtiff stage2
-
-ch-links: popdev
-	make -C $(PKG)/links stage2
-
-ch-openssh: popdev
-	make -C $(PKG)/openssh stage2
-
-ch-pkgconfig: popdev
-	make -C $(PKG)/pkgconfig stage2
-
-ch-libungif: popdev
-	make -C $(PKG)/libungif stage2
-
-ch-imlib2: popdev
-	make -C $(PKG)/imlib2 stage2
-
-ch-libIDL: popdev
-	make -C $(PKG)/libIDL stage2
-
-ch-glib2: popdev
-	make -C $(PKG)/glib2 stage2
-
-ch-pango: popdev
-	make -C $(PKG)/pango stage2
-
-ch-atk: popdev
-	make -C $(PKG)/atk stage2
-
-ch-gtk2: popdev
-	make -C $(PKG)/gtk+2 stage2
-
-ch-cvs: popdev
-	make -C $(PKG)/cvs stage2
-
-ch-firefox: popdev
-	make -C $(PKG)/firefox stage2
-
-ch-thunderbird: popdev
-	make -C $(PKG)/thunderbird stage2
-
-ch-startup-notification: popdev
-	make -C $(PKG)/startup-notification stage2
-
-ch-gvim: popdev
+chroot-gvim: popdev
 	make -C $(PKG)/vim stage3
 
-ch-xfce: popdev
-	make -C $(PKG)/xfce stage2
-
-ch-lua: popdev
-	make -C $(PKG)/lua stage2
-
-ch-ion: popdev
-	make -C $(PKG)/ion stage2
-
-ch-irssi: popdev
-	make -C $(PKG)/irssi stage2
-
-ch-xchat: popdev
-	make -C $(PKG)/xchat stage2
-
-ch-samba: popdev
-	make -C $(PKG)/samba stage2
-
-ch-tcpwrappers: popdev
-	make -C $(PKG)/tcpwrappers stage2
-
-ch-portmap: popdev
-	make -C $(PKG)/portmap stage2
-
-ch-nfs-utils: popdev
-	make -C $(PKG)/nfs-utils stage2
-
-ch-traceroute: popdev
-	make -C $(PKG)/traceroute stage2
-
-ch-dialog: popdev
-	make -C $(PKG)/dialog stage2
-
-ch-ncftp: popdev
-	make -C $(PKG)/ncftp stage2
-
-ch-pciutils: popdev
-	make -C $(PKG)/pciutils stage2
-
-ch-nALFS: popdev
-	make -C $(PKG)/nALFS stage2
-
-ch-device-mapper: popdev
-	make -C $(PKG)/device-mapper stage2
-
-ch-LVM2: popdev
-	make -C $(PKG)/LVM2 stage2
-
-ch-dhcpcd: popdev
-	make -C $(PKG)/dhcpcd stage2
-
-ch-distcc: popdev
-	make -C $(PKG)/distcc stage2
-
-ch-popt: popdev
-	make -C $(PKG)/popt stage2
-
-ch-inputattach: popdev
-	make -C $(PKG)/inputattach stage2
-
-ch-ppp: popdev
-	make -C $(PKG)/ppp stage2
-
-ch-rp-pppoe: popdev
-	make -C $(PKG)/rp-pppoe stage2
-
-ch-libaal: popdev
-	make -C $(PKG)/libaal stage2
-
-ch-reiser4progs: popdev
-	make -C $(PKG)/reiser4progs stage2
-
-ch-squashfs: popdev
-	make -C $(PKG)/squashfs stage2
-
-ch-cpio: popdev
-	make -C $(PKG)/cpio stage2
-
-ch-mutt: popdev
-	make -C $(PKG)/mutt stage2
-
-ch-msmtp: popdev
-	make -C $(PKG)/msmtp stage2
-
-ch-slrn: popdev
-	make -C $(PKG)/slrn stage2
-
-ch-raidtools: popdev
-	make -C $(PKG)/raidtools stage2
-
-ch-eject: popdev
-	make -C $(PKG)/eject stage2
-
-ch-linux: popdev
-	make -C $(PKG)/linux stage2
-
-ch-cdrtools: popdev
-	make -C $(PKG)/cdrtools stage2
-
-ch-blfs-bootscripts: popdev
-	make -C $(PKG)/blfs-bootscripts stage2
-
-ch-syslinux: popdev
-	make -C $(PKG)/syslinux stage2
-
-ch-klibc: popdev
-	make -C $(PKG)/klibc stage2
-
-ch-initramfs: popdev
-	make -C initramfs
-
-ch-unionfs: popdev
-	make -C $(PKG)/unionfs stage2
-
-ch-nALFS-profile: popdev
-	make -C $(PKG)/nALFS-profile stage2
-
-ch-strip: popdev
-	@$(WD)/bin/find /{,usr/}{bin,lib,sbin} -type f \
-	 -exec $(WD)/bin/strip --strip-debug '{}' ';'
-
 # Targets to create the iso
 #==============================================================================
 
@@ -1496,17 +400,15 @@
 	cd $(MP)/iso ; $(WD)/bin/mkisofs -R -l -L -D -o $(MKTREE)/lfslivecd-$(VERSION).iso -b boot/isolinux/isolinux.bin \
 	-c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -V "LFS_CD" ./
 
-# Rules to clean your tree. 
-# "clean" removes package directories and
-# "scrub" also removes all sources and the uname modules - basically
-# returning the tree to the condition it was in when it was unpacked
+# Targets to clean your tree. 
+#==============================================================================
 
 clean: unmount
 	@-rm -rf $(WD) $(MP)$(WD)
 	@-userdel lfs
 	@-groupdel lfs
 	@-rm -rf /home/lfs
-	@-rm {prepiso,lfsuser,lfs-strip,lfs-strip-scpt,unamemod}
+	@-rm {prepiso,lfsuser,unamemod,prep-chroot,lfs-base,extend-lfs}
 	@-rm $(PKG)/binutils/{,re-}adjust-toolchain
 	@-for i in `ls $(PKG)` ; do $(MAKE) -C $(PKG)/$$i clean ; done
 	@-var=`find packages -name ".pass2"` && for i in $$var ; do rm -rf $$i ; done
@@ -1528,3 +430,9 @@
 	@-umount $(MP)/proc
 	@-umount $(MP)/sys
 	@rm -f $(ROOT)/prep-chroot
+
+.PHONY: unmount clean_sources scrub clean iso chroot-gvim update-fontsdir \
+	final-environment re-adjust-toolchain ch-% lfs-adjust-toolchain \
+	lfs-%-scpt lfs-%-pass1 lfs-%-pass2 popdev createfiles createdirs \
+	gvim %-only-ch lfs-%-only lfs-%-only-pass1 lfs-%-only-pass2 lfs-wget \
+	lfs-rm-wget blfs post-bash pre-bash tools pre-wget pre-which

Copied: x86/trunk/packages/gtk2 (from rev 372, x86/trunk/packages/gtk+2)

Added: x86/trunk/packages/initramfs
===================================================================
--- x86/trunk/packages/initramfs	2005-07-19 03:18:36 UTC (rev 375)
+++ x86/trunk/packages/initramfs	2005-07-19 05:02:10 UTC (rev 376)
@@ -0,0 +1 @@
+link ../initramfs
\ No newline at end of file


Property changes on: x86/trunk/packages/initramfs
___________________________________________________________________
Name: svn:special
   + *

Modified: x86/trunk/packages/vim/Makefile
===================================================================
--- x86/trunk/packages/vim/Makefile	2005-07-19 03:18:36 UTC (rev 375)
+++ x86/trunk/packages/vim/Makefile	2005-07-19 05:02:10 UTC (rev 376)
@@ -19,7 +19,7 @@
 	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 chroot3:
-	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-gvim $(chbash-post-bash)'
+	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make chroot-gvim $(chbash-post-bash)'
 
 stage2:
 	@echo ""




More information about the livecd mailing list