From fe9d92c84e2888c470a72d903b78f74288c84a9b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sun, 7 Nov 1999 13:51:08 +0000
Subject: no_comment

---
 Makefile | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 86b3f77cd..ff30ac19b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,38 @@
 BOOT_IMG = gi_hd.img gi_cdrom.img gi_network.img gi_network_ks.img gi_pcmcia.img gi_pcmcia_ks.img
 BINS = install/install install/local-install install/installinit/init
-DIRS = install install/installinit mouseconfig perl-install ddcprobe
+DIRS = install install/installinit mouseconfig perl-install ddcprobe lnx4win
 
 
-.PHONY: $(DIRS) $(BOOT_IMG) $(FLOPPY_IMG) $(BINS) update_kernel
+.PHONY: dirs $(FLOPPY_IMG)
 
-all: $(DIRS) $(BOOT_IMG)
+install: build
 	mkdir /export/images 2>/dev/null ; true
 	cp -f $(BOOT_IMG) /export/images
+	make -C perl-install full_stage2
 
-clean:
-	rm -rf $(BOOT_IMG) $(BINS) modules install_pcmcia_modules vmlinuz System.map
-	rm -rf install/*/sbin/install install/*/sbin/init
-	for i in $(DIRS); do make -C $$i clean; done
-	find . -name "*~" -o -name ".#*" | xargs rm -f
+build: dirs $(BOOT_IMG)
 
-$(DIRS):
-	make -C $@
+dirs:
+	for i in $(DIRS); do make -C $$i; done
 
-$(BOOT_IMG): $(BINS)
-	if [ ! -e modules ]; then $(MAKE) update_kernel; fi
+$(BOOT_IMG): modules
+	make dirs
 	./make_boot_img $@ $(@:gi_%.img=%)
 
-$(BINS):
-	$(MAKE) -C `dirname $@`
-
 tar: clean
 	cd .. ; tar cfy gi.tar.bz2 gi
 
-update_kernel:
-	cd install ; ln -sf ../kernel/cardmgr/* .
+modules: kernel/lib/modules
 	./update_kernel
 
 $(BOOT_IMG:%=%f): %f: %
 	dd if=$< of=/dev/fd0
 	xmessage "Floppy done"
 
+clean:
+	rm -rf $(BOOT_IMG) $(BINS) modules install_pcmcia_modules vmlinuz System.map
+	rm -rf install/*/sbin/install install/*/sbin/init
+	for i in $(DIRS); do make -C $$i clean; done
+	find . -name "*~" -o -name ".#*" | xargs rm -f
+
 # mkisofs -R -b images/gi_cdrom.img -c images/.catalog /tmp/r /mnt/disk/ | cdrecord -v -eject speed=6 dev=1,0 -
-- 
cgit v1.2.1