Add .gitignore and clean up the makefile.

We should probably convert the build system to CMake or whatever.

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..a73f8d5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,42 @@
+fortune-mod/datfiles/*.dat
+fortune-mod/datfiles/*.u8
+fortune-mod/datfiles/cookies-stamp
+fortune-mod/datfiles/off/ocookies-stamp
+fortune-mod/datfiles/off/rotated-stamp
+fortune-mod/datfiles/off/rotated/*.dat
+fortune-mod/datfiles/off/rotated/*.u8
+fortune-mod/datfiles/off/rotated/art
+fortune-mod/datfiles/off/rotated/astrology
+fortune-mod/datfiles/off/rotated/atheism
+fortune-mod/datfiles/off/rotated/black-humor
+fortune-mod/datfiles/off/rotated/cookie
+fortune-mod/datfiles/off/rotated/debian
+fortune-mod/datfiles/off/rotated/definitions
+fortune-mod/datfiles/off/rotated/drugs
+fortune-mod/datfiles/off/rotated/ethnic
+fortune-mod/datfiles/off/rotated/fortunes
+fortune-mod/datfiles/off/rotated/hphobia
+fortune-mod/datfiles/off/rotated/limerick
+fortune-mod/datfiles/off/rotated/linux
+fortune-mod/datfiles/off/rotated/misandry
+fortune-mod/datfiles/off/rotated/miscellaneous
+fortune-mod/datfiles/off/rotated/misogyny
+fortune-mod/datfiles/off/rotated/politics
+fortune-mod/datfiles/off/rotated/privates
+fortune-mod/datfiles/off/rotated/racism
+fortune-mod/datfiles/off/rotated/religion
+fortune-mod/datfiles/off/rotated/riddles
+fortune-mod/datfiles/off/rotated/sex
+fortune-mod/datfiles/off/rotated/songs-poems
+fortune-mod/datfiles/off/rotated/vulgarity
+fortune-mod/datfiles/off/rotated/zippy
+fortune-mod/datfiles/off/unrotated/*.dat
+fortune-mod/datfiles/off/unrotated/*.u8
+fortune-mod/fortune/fortune
+fortune-mod/fortune/fortune.o
+fortune-mod/util/rot
+fortune-mod/util/rot.o
+fortune-mod/util/strfile
+fortune-mod/util/strfile.o
+fortune-mod/util/unstr
+fortune-mod/util/unstr.o

diff --git a/fortune-mod/datfiles/off/Makefile b/fortune-mod/datfiles/off/Makefile
index 3a78738034fd2cc0030814ef0f181ea99bc452ee..53fe418e2ac6d4644f797e096dc5192111452abb 100644 (file)
--- a/fortune-mod/datfiles/off/Makefile
+++ b/fortune-mod/datfiles/off/Makefile
@@ -16,37 +16,21 @@ all:        ocookies-stamp
 
 ocookies-stamp:        rotated-stamp
        rm -f *.dat
-       for i in $(OCOOKIES) ; do $(STRFILE) -x $$i || exit $$? ; done
+       for i in $(OCOOKIES) ; do $(STRFILE) -x rotated/$$i || exit $$? ; done
        touch ocookies-stamp
 
-rotated-stamp: recoded-stamp
+rotated-stamp:
        for i in $(OCOOKIES_UNROTATED) ; \
-           do $(ROT) < unrotated/$$i > $$i || exit $$? ; ln -s $$i $$i.u8; done
+           do $(ROT) < unrotated/$$i > rotated/$$i || exit $$? ; (cd rotated && ln -s $$i $$i.u8) ; done
        touch rotated-stamp
 
-recoded-stamp:
-       for i in $(OCOOKIES_UNROTATED) ; \
-           do \
-               if [ ! -f unrotated/$$i.old ]; then \
-                   cp unrotated/$$i unrotated/$$i.old ; \
-               fi; \
-               recode latin1..u8 unrotated/$$i; \
-           done
-       touch recoded-stamp
-           
 install:
        install -m 0755 -d $(OCOOKIEDIR)
        for i in $(OCOOKIES) ; \
-           do install -m 0644 $$i $$i.dat $(OCOOKIEDIR) || exit $$? ; \
+           do install -m 0644 rotated/$$i rotated/$$i.dat $(OCOOKIEDIR) || exit $$? ; \
            cp -d $$i.u8 $(OCOOKIEDIR) ; \
        done
 
 clean:
-       rm -f ocookies-stamp rotated-stamp recoded-stamp *.dat $(OCOOKIES_UNROTATED)
-       rm -f *u8
-       for i in $(OCOOKIES_UNROTATED) ; do \
-               if [ -f unrotated/$$i.old ] ; then \
-                       mv unrotated/$$i.old unrotated/$$i; \
-               fi; \
-       done
-                                                                             
+       rm -f ocookies-stamp rotated-stamp recoded-stamp rotated/*
+       touch rotated/PLACEHOLDER

diff --git a/fortune-mod/datfiles/off/rotated/PLACEHOLDER b/fortune-mod/datfiles/off/rotated/PLACEHOLDER
new file mode 100644 (file)
index 0000000..e69de29