-VERSION=0.0.8pre17-dev
+VERSION=0.0.8pre18
# main target
all: betaftpd
prefix = @prefix@
CFLAGS = @CFLAGS@
-REAL_CFLAGS = $(CFLAGS) @DEFS@ -I@srcdir@ -I. -DVERSION=\"$(VERSION)\"
+CPPFLAGS = @DEFS@ -I@srcdir@ -I. -DVERSION=\"$(VERSION)\"
LIBS = @LIBS@
-OBJS = disp.o ftpd.o cmds.o nonroot.o ascii.o
-ASSMS = disp.s ftpd.s cmds.s nonroot.s ascii.s
-CPPS = disp.i ftpd.i cmds.i nonroot.i ascii.i
+OBJS = disp.o ftpd.o cmds.o nonroot.o ascii.o dcache.o
+ASSMS = ${OBJS:.o=.s}
+CPPS = ${OBJS:.o=.i}
# Since we use VPATH, override .c.o rule
.c.o: $*.c config.h
- $(CC) $(REAL_CFLAGS) -c @srcdir@/$*.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/$*.c
.c.s: $*.c config.h
- $(CC) $(REAL_CFLAGS) -S @srcdir@/$*.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -S @srcdir@/$*.c
# deps
-cmds.o: @srcdir@/cmds.c @srcdir@/ftpd.h @srcdir@/cmds.h @srcdir@/nonroot.h config.h
-ftpd.o: @srcdir@/ftpd.c @srcdir@/ftpd.h @srcdir@/cmds.h config.h
+cmds.o: @srcdir@/cmds.c @srcdir@/ftpd.h @srcdir@/cmds.h @srcdir@/nonroot.h @srcdir@/dcache.h config.h
+ftpd.o: @srcdir@/ftpd.c @srcdir@/ftpd.h @srcdir@/cmds.h @srcdir@/dcache.h config.h
disp.o: @srcdir@/disp.c @srcdir@/ftpd.h config.h
nonroot.o: @srcdir@/nonroot.c @srcdir@/nonroot.h config.h
-ascii.o: @srcdir@/ascii.c config.h
+ascii.o: @srcdir@/ascii.c @srcdir@/ascii.h config.h
+dcache.o: @srcdir@/dcache.c @srcdir@/dcache.h config.h
betaftpd: $(OBJS)
- $(CC) $(REAL_CFLAGS) $(LIBS) -o betaftpd $(OBJS)
+ $(CC) $(CFLAGS) -o betaftpd $(OBJS) $(LIBS)
assembly-files: $(ASSMS)
betaftpd-from-assembly-files: $(ASSMS)
$(CC) $(LIBS) -o betaftpd -Wl,--sort-common $(ASSMS)
-cvs2cl.pl -U users
cp ChangeLog README Makefile.in acconfig.h cmds.c cmds.h betaftpd-$(VERSION)
cp config.h.in configure configure.in disp.c ftpd.c betaftpd-$(VERSION)
- cp nonroot.c ascii.c ascii.h nonroot.h ftpd.h strip-exec betaftpd.lsm betaftpd-$(VERSION)
+ cp nonroot.c ascii.c ascii.h nonroot.h ftpd.h betaftpd-$(VERSION)
+ cp dcache.c dcache.h strip-exec betaftpd.lsm betaftpd-$(VERSION)
cp doc/CREDITS doc/CHANGES doc/CHANGES-0.0.8 doc/COPYING betaftpd-$(VERSION)/doc
cp doc/KNOWN-BUGS doc/RFC-COMPLIANCE doc/README.nonroot betaftpd-$(VERSION)/doc
cp doc/README.rights doc/README.platforms betaftpd-$(VERSION)/doc
cp debian/README.debian debian/betaftpd.7 debian/changelog betaftpd-$(VERSION)/debian
- cp debian/control debian/copyright debian/dirs debian/files betaftpd-$(VERSION)/debian
- cp debian/init.d debian/rules debian/substvars debian/watch.ex betaftpd-$(VERSION)/debian
+ cp debian/control debian/copyright debian/dirs betaftpd-$(VERSION)/debian
+ cp debian/init.d debian/rules debian/watch.ex betaftpd-$(VERSION)/debian
tar cf - betaftpd-$(VERSION)/ | gzip -9vv > betaftpd-$(VERSION).tar.gz
- tar cf - betaftpd-$(VERSION)/ | bzip2 -3vv > betaftpd-$(VERSION).tar.bz2
+ tar cf - betaftpd-$(VERSION)/ | bzip2 -4vv > betaftpd-$(VERSION).tar.bz2