From be687d65958e18a098eb162ca6cac75d02db292f Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Tue, 26 Dec 2017 20:26:30 +0200 Subject: [PATCH] Remove the old build-sys. use cmake from now on. --- fortune-mod/Makefile | 229 ----------------------------- fortune-mod/datfiles/Makefile | 61 -------- fortune-mod/datfiles/html/Makefile | 20 --- fortune-mod/datfiles/off/Makefile | 44 ------ fortune-mod/fortune/Makefile | 16 -- fortune-mod/util/Makefile | 23 --- 6 files changed, 393 deletions(-) delete mode 100644 fortune-mod/Makefile delete mode 100644 fortune-mod/datfiles/Makefile delete mode 100644 fortune-mod/datfiles/html/Makefile delete mode 100644 fortune-mod/datfiles/off/Makefile delete mode 100644 fortune-mod/fortune/Makefile delete mode 100644 fortune-mod/util/Makefile diff --git a/fortune-mod/Makefile b/fortune-mod/Makefile deleted file mode 100644 index c187dd8..0000000 --- a/fortune-mod/Makefile +++ /dev/null @@ -1,229 +0,0 @@ -# -# Makefile for fortune-mod -# - -# Where does the fortune program go? -FORTDIR=$(prefix)/usr/games -# Where do the data files (fortunes, or cookies) go? -COOKIEDIR=$(prefix)/usr/share/games/fortunes -# Offensive ones? -OCOOKIEDIR=$(COOKIEDIR)/off -# The ones with html tags? -WCOOKIEDIR=$(COOKIEDIR)/html -# Where do local data files go? -LOCALDIR=$(prefix)/usr/local/share/games/fortunes -# Offensive ones? -LOCALODIR=$(LOCALDIR)/off -# With HTML tags? -LOCALWDIR=$(LOCALDIR)/html -# Where do strfile and unstr go? -BINDIR=$(prefix)/usr/bin -# What is the proper mode for strfile and unstr? 755= everyone, 700= root only -BINMODE=0755 -#BINMODE=0700 -# Where do the man pages for strfile and unstr go? -BINMANDIR=$(prefix)/usr/share/man/man1 -# What is their proper extension? -BINMANEXT=1 -# And the same for the fortune man page -FORTMANDIR=$(prefix)/usr/share/man/man6 -FORTMANEXT=6 -# Do we want to install the offensive files? (0 no, 1 yes) -OFFENSIVE=1 -# Do we want to install files with html tags? (0 no, 1 yes) -# (Note: These files are not yet available) -WEB=0 - -# -# Include whichever of the following defines that are appropriate -# for your system into REGEXDEFS: -# -# -DHAVE_REGEX_H -# For systems that declare their regex functions in -# -DHAVE_REGEXP_H -# For systems that declare their regex functions in -# -DHAVE_RX_H -# For systems that declare their regex functions in -# -DBSD_REGEX -# For systems with BSD-compatible regex functions -# -DPOSIX_REGEX -# For systems with POSIX-compatible regex functions -# -DHAVE_STDBOOL -# For GNU system that declare bool type in -# -# NB. Under Linux, the BSD regex functions are _MUCH_ faster -# than the POSIX ones, but your mileage may vary. -# -REGEXDEFS=-DHAVE_REGEX_H -DBSD_REGEX -DHAVE_STDBOOL - -# -# If your system's regex functions are not in its standard C library, -# include the appropriate link flags into REGEXLIBS -# -REGEXLIBS= - -RECODELIBS=-lrecode - -DEFINES=-DFORTDIR="\"$(COOKIEDIR)\"" -DOFFDIR="\"$(OCOOKIEDIR)\"" -DLOCFORTDIR="\"$(LOCALDIR)\"" -DLOCOFFDIR="\"$(LOCALODIR)\"" -CFLAGS=-O2 $(DEFINES) -Wall -fomit-frame-pointer -pipe -fsigned-char -LDFLAGS=-s - -# The above flags are used by default; the debug flags are used when make -# is called with a debug target, such as 'make debug' - -# to get a list of the possible targets, try 'make help' - -# All targets are available at the top level, which exports the -# variables to sub-makes. Avoid makes in subdirectories; cd .. and -# make instead. - -DEBUGCFLAGS=-g -DDEBUG $(DEFINES) -Wall -DEBUGLDFLAGS= - -# Only ANSI-compatible C compilers are currently supported -CC=gcc - -# ---------------------------------------- -# Nothing below this line should have to be changed - -SUBDIRS=fortune util datfiles - -DATFILES_MAKE = $(MAKE) COOKIEDIR=$(COOKIEDIR) \ - OCOOKIEDIR=$(OCOOKIEDIR) WCOOKIEDIR=$(WCOOKIEDIR) \ - OFFENSIVE=$(OFFENSIVE) WEB=$(WEB) - -.PHONY: all debug fortune-bin fortune-debug util-bin randstr rot \ - util-debug cookies cookies-z install install-fortune \ - install-util install-man install-fman install-uman \ - clean love help - -# By default, compile optimized versions -all: fortune-bin util-bin cookies-z - -# Create debugging versions -debug: fortune-debug util-debug cookies-z - -# Just create the fortune binary -fortune-bin: - cd fortune && $(MAKE) CC='$(CC)' \ - CFLAGS='$(CFLAGS) $(REGEXDEFS) -I../util' \ - LDFLAGS='$(LDFLAGS)' LIBS='$(REGEXLIBS) $(RECODELIBS)' - -fortune-debug: - cd fortune && $(MAKE) CC='$(CC)' \ - CFLAGS='$(DEBUGCFLAGS) $(REGEXDEFS) -I../util' \ - LDFLAGS='$(DEBUGLDFLAGS)' LIBS='$(REGEXLIBS) $(RECODELIBS)' - -util-bin: - cd util && $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' \ - LDFLAGS='$(LDFLAGS)' - -# Not listed in help -randstr: - cd util && $(MAKE) CC='$(CC)' CFLAGS='$(CFLAGS)' \ - LDFLAGS='$(LDFLAGS)' randstr - -util-debug: - cd util && $(MAKE) CC='$(CC)' CFLAGS='$(DEBUGCFLAGS)' \ - LDFLAGS='$(DEBUGLDFLAGS)' - -cookies: - @echo "Try the kitchen, silly!" ; sleep 3 - @echo "Sorry, just joking." - $(MAKE) cookies-z - -cookies-z: util-bin - cd datfiles && $(DATFILES_MAKE) - -# Install everything -install: install-fortune install-util install-man install-cookie - -# Install just the fortune program -install-fortune: fortune-bin - install -m 0755 -d $(FORTDIR) - install -m 0755 fortune/fortune $(FORTDIR) - -# Install just the utilities strfile and unstr -install-util: util-bin - install -m 0755 -d $(BINDIR) - install -m $(BINMODE) util/strfile $(BINDIR) - install -m $(BINMODE) util/unstr $(BINDIR) - -# Install all the man pages -install-man: install-fman install-uman - -# Note: this rule concatenates the parts of the man page with the locally -# defined pathnames (which should reduce confusion). -fortune/fortune.man: fortune/fortune-man.part1 fortune/fortune-man.part2 - @echo -n "Building fortune/fortune.man ... " - @cat fortune/fortune-man.part1 >fortune/fortune.man - @echo ".I $(COOKIEDIR)" >>fortune/fortune.man - @echo "Directory for innoffensive fortunes." >>fortune/fortune.man - @echo ".TP" >>fortune/fortune.man - @echo ".I $(OCOOKIEDIR)" >>fortune/fortune.man - @echo "Directory for offensive fortunes." >>fortune/fortune.man - @cat fortune/fortune-man.part2 >>fortune/fortune.man - @echo done. - -# Install the fortune man pages -install-fman: fortune/fortune.man - install -m 0755 -d $(FORTMANDIR) - install -m 0644 fortune/fortune.man $(FORTMANDIR)/fortune.$(FORTMANEXT) - -# Install the utilities man pages -install-uman: - install -m 0755 -d $(BINMANDIR) - install -m 0644 util/strfile.man $(BINMANDIR)/strfile.$(BINMANEXT) - rm -f $(BINMANDIR)/unstr.$(BINMANEXT) - (cd $(BINMANDIR) && ln -sf strfile.$(BINMANEXT).gz $(BINMANDIR)/unstr.$(BINMANEXT).gz) - -# Install the fortune cookie files -install-cookie: cookies-z - cd datfiles && $(DATFILES_MAKE) install - -datfiles-check: cookies-z - cd datfiles && $(DATFILES_MAKE) check - -root-check: - SRC_DIR=. perl tests/trailing-space-and-CRs.pl - -tap-check: - prove tests/t/*.t - -check-deps: all - -check: check-deps datfiles-check root-check tap-check - -clean: - for i in $(SUBDIRS) ; do (cd $$i && $(MAKE) clean); done - -love: - @echo "Not war?" ; sleep 3 - @echo "Look, I'm not equipped for that, okay?" ; sleep 2 - @echo "Contact your hardware vendor for appropriate mods." - -help: - @echo "Targets:" - @echo - @echo "all: make all the binaries and data files (the default target)" - @echo " fortune-bin: make the fortune binary" - @echo " util-bin: make the strfile and unstr binaries" - @echo " cookies: make the fortune-cookie data files" - @echo - @echo "debug: make debugging versions of the binaries" - @echo " fortune-debug: Just the fortune program" - @echo " util-debug: Just strfile and unstr" - @echo - @echo "install: install the files in locations specified in Makefile" - @echo " install-fortune: Just the fortune program" - @echo " install-util: Just strfile and unstr" - @echo " install-cookie: Just the fortune string and data files" - @echo " install-man: Just the man pages" - @echo " install-fman: Just the fortune man page" - @echo " install-uman: Just the strfile/unstr man page" - @echo - @echo "clean: Remove object files and binaries" - @echo - @echo "help: This screen" - @echo - @echo "love: What a *good* idea! Let's!" diff --git a/fortune-mod/datfiles/Makefile b/fortune-mod/datfiles/Makefile deleted file mode 100644 index 2f03b89..0000000 --- a/fortune-mod/datfiles/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -TOP = .. - -COOKIES=art ascii-art computers cookie definitions drugs education ethnic \ - food fortunes goedel humorists kids law linuxcookie literature \ - love magic medicine men-women miscellaneous news people pets \ - platitudes politics riddles science songs-poems sports \ - startrek translate-me wisdom work linux perl knghtbrd \ - paradoxum zippy debian - -STRFILE=../util/strfile - -.PHONY: all cookies o-cookies w-cookies install clean - -all: cookies o-cookies w-cookies - -check: local-check o-check - -local-check: - for i in $(COOKIES) ; \ - do \ - if ! sh $(TOP)/tests/scripts/check-fortune-file.sh "$$i" ; then \ - exit 1; \ - fi ; \ - done; - -o-check: - cd off && $(MAKE) OCOOKIEDIR=$(OCOOKIEDIR) check - -cookies: cookies-stamp - -o-cookies: - if [ $(OFFENSIVE) = 1 ] ; then \ - cd off && $(MAKE) OCOOKIEDIR=$(OCOOKIEDIR) ; fi - -w-cookies: - if [ $(WEB) = 1 ] ; then \ - cd html && $(MAKE) WCOOKIEDIR=$(WCOOKIEDIR); fi - -cookies-stamp: - rm -f *.dat - for i in $(COOKIES) ; \ - do \ - $(STRFILE) $$i ; \ - ln -sf $$i $$i.u8 || exit $? ; \ - done - touch cookies-stamp - -install: cookies-stamp - install -m 0755 -d $(COOKIEDIR) - if [ $(OFFENSIVE) = 1 ] ; then cd off && $(MAKE) install ; fi - if [ $(WEB) = 1 ] ; then cd html && $(MAKE) install ; fi - for i in $(COOKIES) ; do \ - install -m 0644 $$i $$i.dat $(COOKIEDIR) || exit $? ; \ - cp -P $$i.u8 $(COOKIEDIR) ; \ - done - -clean: - rm -f cookies-stamp *.dat - rm -f *.u8 - cd off && $(MAKE) clean - cd html && $(MAKE) clean diff --git a/fortune-mod/datfiles/html/Makefile b/fortune-mod/datfiles/html/Makefile deleted file mode 100644 index 04c9408..0000000 --- a/fortune-mod/datfiles/html/Makefile +++ /dev/null @@ -1,20 +0,0 @@ - -WCOOKIES= - -STRFILE=../util/strfile - - -all: wcookies-stamp - -wcookies-stamp: - rm -f *.dat - for i in $(WCOOKIES) ; do $(STRFILE) $$i || exit $$? ; done - touch cookies-stamp - -install: wcookies-stamp - install -m 0755 -d $(WCOOKIEDIR) - for i in $(WCOOKIES) ; do \ - install -m 0644 $$i $$i.dat $(WCOOKIEDIR) || exit $$? ; done - -clean: - rm -f wcookies-stamp *.dat diff --git a/fortune-mod/datfiles/off/Makefile b/fortune-mod/datfiles/off/Makefile deleted file mode 100644 index 75c757d..0000000 --- a/fortune-mod/datfiles/off/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -TOP = ../.. - -OCOOKIES_UNROTATED=drugs misandry privates sex astrology ethnic \ - miscellaneous racism songs-poems black-humor hphobia misogyny \ - religion vulgarity definitions limerick politics riddles zippy \ - cookie fortunes linux art atheism debian - -OCOOKIES_ROTATED= - -OCOOKIES=$(OCOOKIES_UNROTATED) $(OCOOKIES_ROTATED) - -STRFILE=$(TOP)/util/strfile -ROT=$(TOP)/util/rot - - -all: ocookies-stamp - -ocookies-stamp: rotated-stamp - rm -f *.dat - for i in $(OCOOKIES) ; do $(STRFILE) -x rotated/$$i || exit $$? ; done - touch ocookies-stamp - -rotated-stamp: - for i in $(OCOOKIES_UNROTATED) ; \ - do $(ROT) < unrotated/$$i > rotated/$$i || exit $$? ; (cd rotated && ln -sf $$i $$i.u8) ; done - touch rotated-stamp - -check: all - for i in $(OCOOKIES) ; \ - do \ - if ! sh $(TOP)/tests/scripts/check-fortune-file.sh "unrotated/$$i" ; then \ - exit 1; \ - fi ; \ - done; -install: - install -m 0755 -d $(OCOOKIEDIR) - for i in $(OCOOKIES) ; \ - do install -m 0644 rotated/$$i rotated/$$i.dat $(OCOOKIEDIR) || exit $$? ; \ - cp -P rotated/$$i.u8 $(OCOOKIEDIR) ; \ - done - -clean: - rm -f ocookies-stamp rotated-stamp recoded-stamp rotated/* - touch rotated/PLACEHOLDER diff --git a/fortune-mod/fortune/Makefile b/fortune-mod/fortune/Makefile deleted file mode 100644 index c2cf2a7..0000000 --- a/fortune-mod/fortune/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Note: this makefile should be called by the makefile in the parent -# directory, which will pass it a number of variables. Better to call -# make fortune-bin or make fortune-debug from there. make install -# *only* works at the top level--do make install-fortune and make -# install-fman. Make clean is an acceptable target called directly -# in this directory, though. - -all: fortune - -fortune: fortune.o - $(CC) $(LDFLAGS) -o fortune fortune.o $(LIBS) - -clean: - rm -f fortune.o fortune fortune.man - - diff --git a/fortune-mod/util/Makefile b/fortune-mod/util/Makefile deleted file mode 100644 index 6356e4f..0000000 --- a/fortune-mod/util/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# Note: this makefile should be called by the makefile in the parent -# directory, which will pass it a number of variables defined there. -# To make the files here properly, try make util-bin or make util-debug -# from there. Install *only* works at the top level; do make install-util -# and make install-uman. make clean will work properly if called in -# this directory. - -all: strfile unstr rot - -strfile: strfile.o - $(CC) $(LDFLAGS) -o strfile strfile.o - -unstr: unstr.o - $(CC) $(LDFLAGS) -o unstr unstr.o - -randstr: randstr.o - $(CC) $(LDFLAGS) -o randstr randstr.o - -rot: rot.o - $(CC) -fsigned-char $(LDFLAGS) -o rot rot.o - -clean: - rm -f *.o unstr strfile randstr rot ansify -- 2.40.0