Make builds work on FreeBSD and OpenBSD (#58)

* make Makefile more portable

tbamud doesn't build on FreeBSD or OpenBSD.  This series of commits are meant to make those builds work by making the Makefile more portable.
I should mention that I've never used tbamud before today, so please read my pull request carefully.

This commit itself fixes the first issue encountered.  I assume wildcard and patsubst are gmake-only.

* Update Makefile.in

It turns out using the backslash to escape newlines in this situation is not portable.

* Delete Makefile.in

Will re-add.  There are problems with this file.  It's marked executable when it shouldn't be, and has ^M characters which prevent builds on OpenBSD.

* re-add Makefile.in
This commit is contained in:
Cat 2019-04-30 07:57:21 -04:00 committed by wyld-sw
parent 674fbfddf1
commit 43bf0e8f84
2 changed files with 86 additions and 95 deletions

177
src/util/Makefile.in Executable file → Normal file
View file

@ -1,93 +1,84 @@
# CircleMUD Makefile.in - Makefile template used by 'configure'
# for the 'util' directory
# C compiler to use
CC = @CC@
# Any special flags you want to pass to the compiler
MYFLAGS = @MYFLAGS@ -DCIRCLE_UTIL
#flags for profiling (see hacker.doc for more information)
PROFILE =
##############################################################################
# Do Not Modify Anything Below This Line (unless you know what you're doing) #
##############################################################################
# binary destination directory
BINDIR = ../../bin
# location of Circle include files
INCDIR = ..
CFLAGS = @CFLAGS@ $(MYFLAGS) $(PROFILE) -I$(INCDIR)
default: all
all: $(BINDIR)/asciipasswd \
$(BINDIR)/autowiz \
$(BINDIR)/plrtoascii \
$(BINDIR)/rebuildIndex \
$(BINDIR)/rebuildMailIndex \
$(BINDIR)/shopconv \
$(BINDIR)/sign \
$(BINDIR)/split \
$(BINDIR)/wld2html \
$(BINDIR)/webster
asciipasswd: $(BINDIR)/asciipasswd
autowiz: $(BINDIR)/autowiz
plrtoascii: $(BINDIR)/plrtoascii
rebuildIndex: $(BINDIR)/rebuildIndex
rebuildMailIndex: $(BINDIR)/rebuildMailIndex
shopconv: $(BINDIR)/shopconv
sign: $(BINDIR)/sign
split: $(BINDIR)/split
wld2html: $(BINDIR)/wld2html
webster: $(BINDIR)/webster
$(BINDIR)/asciipasswd: asciipasswd.c
$(CC) $(CFLAGS) -o $(BINDIR)/asciipasswd asciipasswd.c @CRYPTLIB@
$(BINDIR)/autowiz: autowiz.c
$(CC) $(CFLAGS) -o $(BINDIR)/autowiz autowiz.c
$(BINDIR)/plrtoascii: plrtoascii.c
$(CC) $(CFLAGS) -o $(BINDIR)/plrtoascii plrtoascii.c
$(BINDIR)/rebuildIndex: rebuildAsciiIndex.c
$(CC) $(CFLAGS) -o $(BINDIR)/rebuildIndex rebuildAsciiIndex.c
$(BINDIR)/rebuildMailIndex: rebuildMailIndex.c
$(CC) $(CFLAGS) -o $(BINDIR)/rebuildMailIndex rebuildMailIndex.c
$(BINDIR)/shopconv: shopconv.c
$(CC) $(CFLAGS) -o $(BINDIR)/shopconv shopconv.c
$(BINDIR)/sign: sign.c
$(CC) $(CFLAGS) -o $(BINDIR)/sign sign.c @NETLIB@
$(BINDIR)/split: split.c
$(CC) $(CFLAGS) -o $(BINDIR)/split split.c
$(BINDIR)/wld2html: wld2html.c
$(CC) $(CFLAGS) -o $(BINDIR)/wld2html wld2html.c
$(BINDIR)/webster: webster.c
$(CC) $(CFLAGS) -o $(BINDIR)/webster webster.c
# Dependencies for the object files (automagically generated with
# gcc -MM)
depend:
$(CC) -I$(INCDIR) -MM *.c > depend
-include depend
# CircleMUD Makefile.in - Makefile template used by 'configure'
# for the 'util' directory
# C compiler to use
CC = @CC@
# Any special flags you want to pass to the compiler
MYFLAGS = @MYFLAGS@ -DCIRCLE_UTIL
#flags for profiling (see hacker.doc for more information)
PROFILE =
##############################################################################
# Do Not Modify Anything Below This Line (unless you know what you're doing) #
##############################################################################
# binary destination directory
BINDIR = ../../bin
# location of Circle include files
INCDIR = ..
CFLAGS = @CFLAGS@ $(MYFLAGS) $(PROFILE) -I$(INCDIR)
default: all
all: $(BINDIR)/asciipasswd $(BINDIR)/autowiz $(BINDIR)/plrtoascii $(BINDIR)/rebuildIndex $(BINDIR)/rebuildMailIndex $(BINDIR)/shopconv $(BINDIR)/sign $(BINDIR)/split $(BINDIR)/wld2html $(BINDIR)/webster
asciipasswd: $(BINDIR)/asciipasswd
autowiz: $(BINDIR)/autowiz
plrtoascii: $(BINDIR)/plrtoascii
rebuildIndex: $(BINDIR)/rebuildIndex
rebuildMailIndex: $(BINDIR)/rebuildMailIndex
shopconv: $(BINDIR)/shopconv
sign: $(BINDIR)/sign
split: $(BINDIR)/split
wld2html: $(BINDIR)/wld2html
webster: $(BINDIR)/webster
$(BINDIR)/asciipasswd: asciipasswd.c
$(CC) $(CFLAGS) -o $(BINDIR)/asciipasswd asciipasswd.c @CRYPTLIB@
$(BINDIR)/autowiz: autowiz.c
$(CC) $(CFLAGS) -o $(BINDIR)/autowiz autowiz.c
$(BINDIR)/plrtoascii: plrtoascii.c
$(CC) $(CFLAGS) -o $(BINDIR)/plrtoascii plrtoascii.c
$(BINDIR)/rebuildIndex: rebuildAsciiIndex.c
$(CC) $(CFLAGS) -o $(BINDIR)/rebuildIndex rebuildAsciiIndex.c
$(BINDIR)/rebuildMailIndex: rebuildMailIndex.c
$(CC) $(CFLAGS) -o $(BINDIR)/rebuildMailIndex rebuildMailIndex.c
$(BINDIR)/shopconv: shopconv.c
$(CC) $(CFLAGS) -o $(BINDIR)/shopconv shopconv.c
$(BINDIR)/sign: sign.c
$(CC) $(CFLAGS) -o $(BINDIR)/sign sign.c @NETLIB@
$(BINDIR)/split: split.c
$(CC) $(CFLAGS) -o $(BINDIR)/split split.c
$(BINDIR)/wld2html: wld2html.c
$(CC) $(CFLAGS) -o $(BINDIR)/wld2html wld2html.c
$(BINDIR)/webster: webster.c
$(CC) $(CFLAGS) -o $(BINDIR)/webster webster.c
# Dependencies for the object files (automagically generated with
# gcc -MM)
depend:
$(CC) -I$(INCDIR) -MM *.c > depend
-include depend