Reorganize some directories

servers/hgfs/hgfs_server => servers/hgfs
servers/hgfs/libhgfs => lib/libhgfs
servers/rs/service => commands/service
drivers/memory/memory_driver => drivers/memory
drivers/memory/ramdisk => drivers/ramdisk

commands/Makefile

@@ -24,7 +24,7 @@ SUBDIR=	aal add_route adduser advent arp ash at autil awk \
 	profile progressbar proto pr_routes ps pwd pwdauth \
 	ramdisk rarpd rawspeed rcp rdate readall readclock \
 	readfs reboot remsync rev rget rlogin rlogind rmdir \
-	rotate rsh rshd sed setup shar size \
+	rotate rsh rshd sed service setup shar size \
 	sleep slip sort spell split srccrc stat strings strip \
 	stty su sum svclog swapfs swifi sync synctree sysenv \
 	syslogd tail talk talkd tcpd tcpdp tcpstat tee telnet \

commands/service/Makefile

@@ -1,11 +1,7 @@
 # Makefile for service
-.include <minix.own.mk>
-
 PROG=	service
-SRCS=	service.c
 
+BINDIR= /bin
 MAN=
 
-BINDIR?= /bin
-
 .include <minix.prog.mk>

drivers/Makefile

@@ -7,9 +7,9 @@
 SUBDIR=	amddev atl2 at_wini audio bios_wini dec21140A dp8390 dpeth \
 	e1000 filter floppy fxp hello lance log orinoco pci printer \
 	random readclock rtl8139 rtl8169 sb16 ti1225 tty \
-	.WAIT memory
+	.WAIT ramdisk .WAIT memory
 
 # memory driver must be last for ramdisk image
-IMAGE_SUBDIR=	at_wini bios_wini floppy log tty pci .WAIT memory
+IMAGE_SUBDIR=	at_wini bios_wini floppy log tty pci .WAIT ramdisk .WAIT memory
 
 .include <minix.subdir.mk>

drivers/memory/Makefile

@@ -1,7 +1,18 @@
-# Makefile for memory driver and ramdisk
-
+# Makefile for memory driver (MEMORY)
 .include <minix.own.mk>
 
-SUBDIR=	ramdisk .WAIT memory_driver
+PROG=	memory
+SRCS=	memory.c imgrd.c
 
-.include <minix.subdir.mk>
+DPADD+=	${LIBDRIVER} ${LIBSYS}
+LDADD+=	-ldriver -lsys
+
+MAN=
+
+BINDIR?= /usr/sbin
+INSTALLFLAGS+=	-S 8k
+
+CPPFLAGS.memory.c+=	-I${MINIXSRCDIR}
+CPPFLAGS.imgrd.c+=	-I${.CURDIR}/../ramdisk -T /usr/tmp
+
+.include <minix.prog.mk>

drivers/memory/memory_driver/Makefile

@@ -1,19 +0,0 @@
-# Makefile for memory driver (MEMORY)
-.include <minix.own.mk>
-
-PROG=	memory
-SRCS=	memory.c imgrd.c
-
-DPADD+=	${LIBDRIVER} ${LIBSYS}
-LDADD+=	-ldriver -lsys
-
-MAN=
-
-BINDIR?= /usr/sbin
-INSTALLFLAGS+=	-S 8k
-
-CPPFLAGS.memory.c+=	-I${MINIXSRCDIR}
-CPPFLAGS.imgrd.c+=	-I${.CURDIR}/../ramdisk -T /usr/tmp
-
-.include <minix.prog.mk>
-.include <minix.subdir.mk>

drivers/memory/ramdisk/Makefile

@@ -1,107 +0,0 @@
-# Makefile for ramdisk image
-
-PROGRAMS=at_wini bios_wini cdprobe dev2name floppy loadramdisk newroot \
-	pci sh service sysenv mfs
-EXTRA=system.conf passwd
-
-CPPFLAGS+= -I${MINIXSRCDIR}/servers
-MAKEDEV=/usr/bin/MAKEDEV
-
-all:	image.c
-
-clean:
-	rm -rf $(PROGRAMS) $(EXTRA) bintoc image image.c t proto.gen
-
-image.c:	bintoc image
-	./bintoc -o $@ image
-
-# Note for cross compilation: this executable has to be compiled for the
-# host system
-bintoc:	bintoc.c
-	$(CC) -o $@ bintoc.c
-
-image:	proto.gen mtab rc $(PROGRAMS) $(EXTRA)
-	mkfs image proto.gen || { rm -f image; false; }
-
-at_wini: ../../at_wini/at_wini
-	install -s ../../$@/$@ $@
-
-../../at_wini/at_wini:
-	cd ../../at_wini && make
-
-bios_wini: ../../bios_wini/bios_wini
-	install -s ../../$@/$@ $@
-
-../../bios_wini/bios_wini:
-	cd ../../bios_wini && make
-
-floppy: ../../floppy/floppy
-	install -s ../../$@/$@ $@
-
-../../floppy/floppy:
-	cd ../../floppy && make
-
-pci: ../../pci/pci
-	install -s ../../$@/$@ $@
-
-../../pci/pci:
-	cd ../../pci && make
-
-cdprobe:  ../../../commands/cdprobe/cdprobe
-	install -s ../../../commands/$@/$@ $@
-
-../../../commands/cdprobe:
-	cd ../../../commands/cdprobe && make
-
-dev2name:  ../../../commands/dev2name/dev2name
-	install -s ../../../commands/$@/$@ $@
-
-../../../commands/dev2name/dev2name:
-	cd ../../../commands/dev2name && make
-
-loadramdisk:  ../../../commands/loadramdisk/loadramdisk
-	install -s ../../../commands/$@/$@ $@
-
-../../../commands/loadramdisk/loadramdisk:
-	cd ../../../commands/loadramdisk && make
-
-newroot:  ../../../commands/newroot/newroot
-	install -s ../../../commands/$@/$@ $@
-
-../../../commands/newroot/newroot:
-	cd ../../../commands/newroot && make
-
-sysenv:  ../../../commands/sysenv/sysenv
-	install -s ../../../commands/$@/$@ $@
-
-../../../commands/sysenv:
-	cd ../../../commands/sysenv && make
-
-sh:	../../../commands/ash/sh
-	install -s ../../../commands/ash/$@ $@
-
-../../../commands/ash/sh: 
-	cd ../../../commands/ash && make sh
-
-service: ../../../servers/rs/service/service
-	install -s ../../../servers/rs/service/$@ $@
-
-../../../servers/rs/service: 
-	cd ../../../servers/rs && make service
-
-mfs: ../../../servers/mfs/mfs
-	install -s ../../../servers/mfs/$@ $@
-
-../../../servers/mfs/mfs: 
-	cd ../../../servers/mfs && make
-
-system.conf: ../../../etc/system.conf
-	install -s ../../../etc/$@ $@
-
-passwd: ../../../etc/passwd
-	install -s ../../../etc/$@ $@
-
-proto.gen: $(MAKEDEV) proto.sh proto
-	sh -e proto.sh >proto.gen
-
-.include <minix.prog.mk>

drivers/ramdisk/Makefile

@@ -0,0 +1,107 @@
+# Makefile for ramdisk image
+
+PROGRAMS=at_wini bios_wini cdprobe dev2name floppy loadramdisk newroot \
+	pci sh service sysenv mfs
+EXTRA=system.conf passwd
+
+CPPFLAGS+= -I${MINIXSRCDIR}/servers
+MAKEDEV=/usr/bin/MAKEDEV
+
+all:	image.c
+
+clean:
+	rm -rf $(PROGRAMS) $(EXTRA) bintoc image image.c t proto.gen
+
+image.c:	bintoc image
+	./bintoc -o $@ image
+
+# Note for cross compilation: this executable has to be compiled for the
+# host system
+bintoc:	bintoc.c
+	$(CC) -o $@ bintoc.c
+
+image:	proto.gen mtab rc $(PROGRAMS) $(EXTRA)
+	mkfs image proto.gen || { rm -f image; false; }
+
+at_wini: ../at_wini/at_wini
+	install -s ../$@/$@ $@
+
+../at_wini/at_wini:
+	cd ../at_wini && make
+
+bios_wini: ../bios_wini/bios_wini
+	install -s ../$@/$@ $@
+
+../bios_wini/bios_wini:
+	cd ../bios_wini && make
+
+floppy: ../floppy/floppy
+	install -s ../$@/$@ $@
+
+../floppy/floppy:
+	cd ../floppy && make
+
+pci: ../pci/pci
+	install -s ../$@/$@ $@
+
+../pci/pci:
+	cd ../pci && make
+
+cdprobe:  ../../commands/cdprobe/cdprobe
+	install -s ../../commands/$@/$@ $@
+
+../../commands/cdprobe:
+	cd ../../commands/cdprobe && make
+
+dev2name:  ../../commands/dev2name/dev2name
+	install -s ../../commands/$@/$@ $@
+
+../../commands/dev2name/dev2name:
+	cd ../../commands/dev2name && make
+
+loadramdisk:  ../../commands/loadramdisk/loadramdisk
+	install -s ../../commands/$@/$@ $@
+
+../../commands/loadramdisk/loadramdisk:
+	cd ../../commands/loadramdisk && make
+
+newroot:  ../../commands/newroot/newroot
+	install -s ../../commands/$@/$@ $@
+
+../../commands/newroot/newroot:
+	cd ../../commands/newroot && make
+
+sysenv:  ../../commands/sysenv/sysenv
+	install -s ../../commands/$@/$@ $@
+
+../../commands/sysenv:
+	cd ../../commands/sysenv && make
+
+sh:	../../commands/ash/sh
+	install -s ../../commands/ash/$@ $@
+
+../../commands/ash/sh:
+	cd ../../commands/ash && make sh
+
+service: ../../commands/service/service
+	install -s ../../commands/service/$@ $@
+
+../../commands/service:
+	cd ../../commands/service && make
+
+mfs: ../../servers/mfs/mfs
+	install -s ../../servers/mfs/$@ $@
+
+../../servers/mfs/mfs:
+	cd ../../servers/mfs && make
+
+system.conf: ../../etc/system.conf
+	install -s ../../etc/$@ $@
+
+passwd: ../../etc/passwd
+	install -s ../../etc/$@ $@
+
+proto.gen: $(MAKEDEV) proto.sh proto
+	sh -e proto.sh >proto.gen
+
+.include <minix.prog.mk>

etc/mk/minix.prog.mk

@@ -56,7 +56,7 @@ MKDEP_SUFFIXES?=	.o .ln
 # 	rumpfs_lfs rumpfs_msdosfs rumpfs_nfs rumpfs_ntfs rumpfs_syspuffs \
 # 	rumpfs_tmpfs rumpfs_udf rumpfs_ufs
 .for _lib in \
-	c curses driver edit end m sys timers util
+	c curses driver netdriver edit end m sys timers util bz2 l hgfs
 .ifndef LIB${_lib:tu}
 LIB${_lib:tu}=	${DESTDIR}/usr/lib/lib${_lib}.a
 .if ${COMPILER_TYPE} == "ack"

include/Makefile

@@ -8,7 +8,8 @@ INCS=	alloca.h ansi.h a.out.h ar.h assert.h configfile.h ctype.h \
 	regexp.h setjmp.h sgtty.h signal.h stdarg.h stddef.h \
 	stdint.h stdio.h stdlib.h string.h strings.h sysexits.h \
 	syslog.h tar.h termcap.h termios.h time.h timers.h tools.h \
-	ttyent.h ucontext.h unistd.h utime.h utmp.h wchar.h wctype.h
+	ttyent.h ucontext.h unistd.h utime.h utmp.h wchar.h wctype.h \
+	hgfs.h
 INCS+=	arpa/inet.h
 INCS+=	minix/a.out.h minix/bitmap.h minix/callnr.h minix/cdrom.h \
 	minix/com.h minix/config.h minix/const.h minix/cpufeature.h \

lib/Makefile

@@ -1,7 +1,7 @@
 .include <minix.own.mk>
 
 SUBDIR= csu libc libcurses libdriver libnetdriver libend libedit libm libsys \
-	libtimers libutil libbz2 libl
+	libtimers libutil libbz2 libl libhgfs
 
 .if ${COMPILER_TYPE} == "ack"
 SUBDIR+= ack/libd ack/libe ack/libfp ack/liby

lib/libhgfs/Makefile

@@ -1,7 +1,5 @@
 # Makefile for HGFS library
 
-LIBISPRIVATE=   yes
-
 LIB=    hgfs
 SRCS=	backdoor.S attr.c channel.c dir.c error.c file.c \
 	link.c misc.c path.c rpc.c time.c

servers/hgfs/Makefile

@@ -1,7 +1,14 @@
 # Makefile for VMware Host/Guest File System (HGFS) server
+PROG=	hgfs
+SRCS=	dentry.c handle.c inode.c link.c lookup.c main.c \
+	misc.c mount.c name.c optset.c path.c read.c \
+	stat.c table.c util.c verify.c write.c
 
-.include <minix.own.mk>
+DPADD+=	${LIBHGFS} ${LIBSYS}
+LDADD+=	-lhgfs -lsys
 
-SUBDIR=	libhgfs .WAIT hgfs_server
+MAN=
 
-.include <minix.subdir.mk>
+BINDIR?= /sbin
+
+.include <minix.prog.mk>

servers/hgfs/Makefile.inc

@@ -1,13 +0,0 @@
-.include <minix.own.mk>
-
-LIBHGFS != cd ${.CURDIR}/../libhgfs && ${PRINTOBJDIR}
-CPPFLAGS+=-I${.CURDIR}/../libhgfs
-DPADD+= ${LIBHGFS}/libhgfs.a
-LDADD+= -L${LIBHGFS} -lhgfs
-
-DPADD+=	${LIBSYS}
-LDADD+=	-lsys
-
-.if exists(${.CURDIR}/../../Makefile.inc)
-.include "${.CURDIR}/../../Makefile.inc"
-.endif

servers/hgfs/hgfs_server/Makefile

@@ -1,11 +0,0 @@
-# Makefile for VMware Host/Guest File System (HGFS) server
-PROG=	hgfs
-SRCS=	dentry.c handle.c inode.c link.c lookup.c main.c \
-	misc.c mount.c name.c optset.c path.c read.c \
-	stat.c table.c util.c verify.c write.c
-
-MAN=
-
-BINDIR?= /sbin
-
-.include <minix.prog.mk>

servers/rs/Makefile

@@ -14,7 +14,4 @@ INSTALLFLAGS+=	-S 1225k
 
 CPPFLAGS+=	-I${MINIXSRCDIR}
 
-SUBDIR= service
-
 .include <minix.prog.mk>
-.include <minix.subdir.mk>

tools/Makefile

@@ -12,7 +12,7 @@ PROGRAMS=	../kernel/kernel \
 	../servers/pm/pm \
 	../servers/sched/sched \
 	../servers/vfs/vfs \
-	../drivers/memory/memory_driver/memory \
+	../drivers/memory/memory \
 	../drivers/log/log \
 	../drivers/tty/tty \
 	../servers/mfs/mfs \