From: Arun Thomas Date: Wed, 26 May 2010 22:49:57 +0000 (+0000) Subject: Reorganize some directories X-Git-Tag: v3.1.7~30 X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=b48b037fbe4f85ef7f6293a3b41ec15935157277;p=minix.git 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 --- diff --git a/commands/Makefile b/commands/Makefile index 58c705ada..b0307a8c1 100644 --- a/commands/Makefile +++ b/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 \ diff --git a/servers/rs/service/Makefile b/commands/service/Makefile similarity index 55% rename from servers/rs/service/Makefile rename to commands/service/Makefile index 03e23fc8c..637f02e1c 100644 --- a/servers/rs/service/Makefile +++ b/commands/service/Makefile @@ -1,11 +1,7 @@ # Makefile for service -.include - PROG= service -SRCS= service.c +BINDIR= /bin MAN= -BINDIR?= /bin - .include diff --git a/servers/rs/service/service.c b/commands/service/service.c similarity index 100% rename from servers/rs/service/service.c rename to commands/service/service.c diff --git a/drivers/Makefile b/drivers/Makefile index fdcd2dce9..7b515fe9a 100644 --- a/drivers/Makefile +++ b/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 diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile index df986f13e..bf776f900 100644 --- a/drivers/memory/Makefile +++ b/drivers/memory/Makefile @@ -1,7 +1,18 @@ -# Makefile for memory driver and ramdisk - +# Makefile for memory driver (MEMORY) .include -SUBDIR= ramdisk .WAIT memory_driver +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 +.include diff --git a/drivers/memory/memory_driver/imgrd.c b/drivers/memory/imgrd.c similarity index 100% rename from drivers/memory/memory_driver/imgrd.c rename to drivers/memory/imgrd.c diff --git a/drivers/memory/memory_driver/local.h b/drivers/memory/local.h similarity index 100% rename from drivers/memory/memory_driver/local.h rename to drivers/memory/local.h diff --git a/drivers/memory/memory_driver/memory.c b/drivers/memory/memory.c similarity index 100% rename from drivers/memory/memory_driver/memory.c rename to drivers/memory/memory.c diff --git a/drivers/memory/memory_driver/Makefile b/drivers/memory/memory_driver/Makefile deleted file mode 100644 index ee5310209..000000000 --- a/drivers/memory/memory_driver/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# Makefile for memory driver (MEMORY) -.include - -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 -.include diff --git a/drivers/memory/ramdisk/Makefile b/drivers/memory/ramdisk/Makefile deleted file mode 100644 index 0b2e7e2fd..000000000 --- a/drivers/memory/ramdisk/Makefile +++ /dev/null @@ -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 diff --git a/drivers/ramdisk/Makefile b/drivers/ramdisk/Makefile new file mode 100644 index 000000000..d6a9ff78b --- /dev/null +++ b/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 diff --git a/drivers/memory/ramdisk/bintoc.c b/drivers/ramdisk/bintoc.c similarity index 100% rename from drivers/memory/ramdisk/bintoc.c rename to drivers/ramdisk/bintoc.c diff --git a/drivers/memory/ramdisk/mtab b/drivers/ramdisk/mtab similarity index 100% rename from drivers/memory/ramdisk/mtab rename to drivers/ramdisk/mtab diff --git a/drivers/memory/ramdisk/proto b/drivers/ramdisk/proto similarity index 100% rename from drivers/memory/ramdisk/proto rename to drivers/ramdisk/proto diff --git a/drivers/memory/ramdisk/proto.sh b/drivers/ramdisk/proto.sh similarity index 100% rename from drivers/memory/ramdisk/proto.sh rename to drivers/ramdisk/proto.sh diff --git a/drivers/memory/ramdisk/rc b/drivers/ramdisk/rc similarity index 100% rename from drivers/memory/ramdisk/rc rename to drivers/ramdisk/rc diff --git a/etc/mk/minix.prog.mk b/etc/mk/minix.prog.mk index 49ce433dc..eaef1f23c 100644 --- a/etc/mk/minix.prog.mk +++ b/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" diff --git a/include/Makefile b/include/Makefile index 3ba9e2b76..c74569275 100644 --- a/include/Makefile +++ b/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 \ diff --git a/servers/hgfs/libhgfs/hgfs.h b/include/hgfs.h similarity index 100% rename from servers/hgfs/libhgfs/hgfs.h rename to include/hgfs.h diff --git a/lib/Makefile b/lib/Makefile index 24204c21e..f05e9c80b 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,7 +1,7 @@ .include 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 diff --git a/servers/hgfs/libhgfs/Makefile b/lib/libhgfs/Makefile similarity index 88% rename from servers/hgfs/libhgfs/Makefile rename to lib/libhgfs/Makefile index d7947cdfd..07c52d7a4 100644 --- a/servers/hgfs/libhgfs/Makefile +++ b/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 diff --git a/servers/hgfs/libhgfs/attr.c b/lib/libhgfs/attr.c similarity index 100% rename from servers/hgfs/libhgfs/attr.c rename to lib/libhgfs/attr.c diff --git a/servers/hgfs/libhgfs/backdoor.S b/lib/libhgfs/backdoor.S similarity index 100% rename from servers/hgfs/libhgfs/backdoor.S rename to lib/libhgfs/backdoor.S diff --git a/servers/hgfs/libhgfs/channel.c b/lib/libhgfs/channel.c similarity index 100% rename from servers/hgfs/libhgfs/channel.c rename to lib/libhgfs/channel.c diff --git a/servers/hgfs/libhgfs/const.h b/lib/libhgfs/const.h similarity index 100% rename from servers/hgfs/libhgfs/const.h rename to lib/libhgfs/const.h diff --git a/servers/hgfs/libhgfs/dir.c b/lib/libhgfs/dir.c similarity index 100% rename from servers/hgfs/libhgfs/dir.c rename to lib/libhgfs/dir.c diff --git a/servers/hgfs/libhgfs/error.c b/lib/libhgfs/error.c similarity index 100% rename from servers/hgfs/libhgfs/error.c rename to lib/libhgfs/error.c diff --git a/servers/hgfs/libhgfs/file.c b/lib/libhgfs/file.c similarity index 100% rename from servers/hgfs/libhgfs/file.c rename to lib/libhgfs/file.c diff --git a/servers/hgfs/libhgfs/glo.h b/lib/libhgfs/glo.h similarity index 100% rename from servers/hgfs/libhgfs/glo.h rename to lib/libhgfs/glo.h diff --git a/servers/hgfs/libhgfs/inc.h b/lib/libhgfs/inc.h similarity index 100% rename from servers/hgfs/libhgfs/inc.h rename to lib/libhgfs/inc.h diff --git a/servers/hgfs/libhgfs/link.c b/lib/libhgfs/link.c similarity index 100% rename from servers/hgfs/libhgfs/link.c rename to lib/libhgfs/link.c diff --git a/servers/hgfs/libhgfs/misc.c b/lib/libhgfs/misc.c similarity index 100% rename from servers/hgfs/libhgfs/misc.c rename to lib/libhgfs/misc.c diff --git a/servers/hgfs/libhgfs/path.c b/lib/libhgfs/path.c similarity index 100% rename from servers/hgfs/libhgfs/path.c rename to lib/libhgfs/path.c diff --git a/servers/hgfs/libhgfs/proto.h b/lib/libhgfs/proto.h similarity index 100% rename from servers/hgfs/libhgfs/proto.h rename to lib/libhgfs/proto.h diff --git a/servers/hgfs/libhgfs/rpc.c b/lib/libhgfs/rpc.c similarity index 100% rename from servers/hgfs/libhgfs/rpc.c rename to lib/libhgfs/rpc.c diff --git a/servers/hgfs/libhgfs/time.c b/lib/libhgfs/time.c similarity index 100% rename from servers/hgfs/libhgfs/time.c rename to lib/libhgfs/time.c diff --git a/servers/hgfs/libhgfs/type.h b/lib/libhgfs/type.h similarity index 100% rename from servers/hgfs/libhgfs/type.h rename to lib/libhgfs/type.h diff --git a/servers/hgfs/Makefile b/servers/hgfs/Makefile index 483c9b51e..f8c75f6e2 100644 --- a/servers/hgfs/Makefile +++ b/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 +DPADD+= ${LIBHGFS} ${LIBSYS} +LDADD+= -lhgfs -lsys -SUBDIR= libhgfs .WAIT hgfs_server +MAN= -.include +BINDIR?= /sbin + +.include diff --git a/servers/hgfs/Makefile.inc b/servers/hgfs/Makefile.inc deleted file mode 100644 index 4229a0154..000000000 --- a/servers/hgfs/Makefile.inc +++ /dev/null @@ -1,13 +0,0 @@ -.include - -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 diff --git a/servers/hgfs/hgfs_server/const.h b/servers/hgfs/const.h similarity index 100% rename from servers/hgfs/hgfs_server/const.h rename to servers/hgfs/const.h diff --git a/servers/hgfs/hgfs_server/dentry.c b/servers/hgfs/dentry.c similarity index 100% rename from servers/hgfs/hgfs_server/dentry.c rename to servers/hgfs/dentry.c diff --git a/servers/hgfs/hgfs_server/glo.h b/servers/hgfs/glo.h similarity index 100% rename from servers/hgfs/hgfs_server/glo.h rename to servers/hgfs/glo.h diff --git a/servers/hgfs/hgfs_server/handle.c b/servers/hgfs/handle.c similarity index 100% rename from servers/hgfs/hgfs_server/handle.c rename to servers/hgfs/handle.c diff --git a/servers/hgfs/hgfs_server/Makefile b/servers/hgfs/hgfs_server/Makefile deleted file mode 100644 index ce98eb49b..000000000 --- a/servers/hgfs/hgfs_server/Makefile +++ /dev/null @@ -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 diff --git a/servers/hgfs/hgfs_server/inc.h b/servers/hgfs/inc.h similarity index 100% rename from servers/hgfs/hgfs_server/inc.h rename to servers/hgfs/inc.h diff --git a/servers/hgfs/hgfs_server/inode.c b/servers/hgfs/inode.c similarity index 100% rename from servers/hgfs/hgfs_server/inode.c rename to servers/hgfs/inode.c diff --git a/servers/hgfs/hgfs_server/inode.h b/servers/hgfs/inode.h similarity index 100% rename from servers/hgfs/hgfs_server/inode.h rename to servers/hgfs/inode.h diff --git a/servers/hgfs/hgfs_server/link.c b/servers/hgfs/link.c similarity index 100% rename from servers/hgfs/hgfs_server/link.c rename to servers/hgfs/link.c diff --git a/servers/hgfs/hgfs_server/lookup.c b/servers/hgfs/lookup.c similarity index 100% rename from servers/hgfs/hgfs_server/lookup.c rename to servers/hgfs/lookup.c diff --git a/servers/hgfs/hgfs_server/main.c b/servers/hgfs/main.c similarity index 100% rename from servers/hgfs/hgfs_server/main.c rename to servers/hgfs/main.c diff --git a/servers/hgfs/hgfs_server/misc.c b/servers/hgfs/misc.c similarity index 100% rename from servers/hgfs/hgfs_server/misc.c rename to servers/hgfs/misc.c diff --git a/servers/hgfs/hgfs_server/mount.c b/servers/hgfs/mount.c similarity index 100% rename from servers/hgfs/hgfs_server/mount.c rename to servers/hgfs/mount.c diff --git a/servers/hgfs/hgfs_server/name.c b/servers/hgfs/name.c similarity index 100% rename from servers/hgfs/hgfs_server/name.c rename to servers/hgfs/name.c diff --git a/servers/hgfs/hgfs_server/optset.c b/servers/hgfs/optset.c similarity index 100% rename from servers/hgfs/hgfs_server/optset.c rename to servers/hgfs/optset.c diff --git a/servers/hgfs/hgfs_server/optset.h b/servers/hgfs/optset.h similarity index 100% rename from servers/hgfs/hgfs_server/optset.h rename to servers/hgfs/optset.h diff --git a/servers/hgfs/hgfs_server/path.c b/servers/hgfs/path.c similarity index 100% rename from servers/hgfs/hgfs_server/path.c rename to servers/hgfs/path.c diff --git a/servers/hgfs/hgfs_server/proto.h b/servers/hgfs/proto.h similarity index 100% rename from servers/hgfs/hgfs_server/proto.h rename to servers/hgfs/proto.h diff --git a/servers/hgfs/hgfs_server/read.c b/servers/hgfs/read.c similarity index 100% rename from servers/hgfs/hgfs_server/read.c rename to servers/hgfs/read.c diff --git a/servers/hgfs/hgfs_server/stat.c b/servers/hgfs/stat.c similarity index 100% rename from servers/hgfs/hgfs_server/stat.c rename to servers/hgfs/stat.c diff --git a/servers/hgfs/hgfs_server/table.c b/servers/hgfs/table.c similarity index 100% rename from servers/hgfs/hgfs_server/table.c rename to servers/hgfs/table.c diff --git a/servers/hgfs/hgfs_server/type.h b/servers/hgfs/type.h similarity index 100% rename from servers/hgfs/hgfs_server/type.h rename to servers/hgfs/type.h diff --git a/servers/hgfs/hgfs_server/util.c b/servers/hgfs/util.c similarity index 100% rename from servers/hgfs/hgfs_server/util.c rename to servers/hgfs/util.c diff --git a/servers/hgfs/hgfs_server/verify.c b/servers/hgfs/verify.c similarity index 100% rename from servers/hgfs/hgfs_server/verify.c rename to servers/hgfs/verify.c diff --git a/servers/hgfs/hgfs_server/write.c b/servers/hgfs/write.c similarity index 100% rename from servers/hgfs/hgfs_server/write.c rename to servers/hgfs/write.c diff --git a/servers/rs/Makefile b/servers/rs/Makefile index 7fd5f23e3..c3ab60372 100644 --- a/servers/rs/Makefile +++ b/servers/rs/Makefile @@ -14,7 +14,4 @@ INSTALLFLAGS+= -S 1225k CPPFLAGS+= -I${MINIXSRCDIR} -SUBDIR= service - .include -.include diff --git a/tools/Makefile b/tools/Makefile index 2f770e00c..a53eec943 100644 --- a/tools/Makefile +++ b/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 \