diff options
| author |  Bram Matthys | 2016-12-05 10:11:26 +0100 |
|---|---|---|
| committer | Bram Matthys | 2016-12-05 10:11:26 +0100 |
| commit | b1aae19ed552cd4a80259eadde355869fedf8781 (patch) | |
| tree | 7f3f9db4a22bbdf362c5868f614f78268125381e | |
| parent | Cleanup src/Makefile as per ohnobinki's suggestion in #3979. (diff) | |
| download | unrealircd-master.tar.gz unrealircd-master.tar.bz2 unrealircd-master.zip | |
Huh? Guess this 'branch protection' thing from GitHub isn't working. master
| -rw-r--r-- | src/Makefile | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 89d8430f0..c2d33494b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -32,6 +32,17 @@ OBJS=timesynch.o res.o s_bsd.o auth.o aln.o channel.o cloak.o crule.o dbuf.o \ SRC=$(OBJS:%.o=%.c) +MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'IRCDLIBS=${IRCDLIBS}' \ + 'LDFLAGS=${LDFLAGS}' 'IRCDMODE=${IRCDMODE}' \ + 'BINDIR=${BINDIR}' 'INSTALL=${INSTALL}' \ + 'INCLUDEDIR=${INCLUDEDIR}' 'IRCDDIR=${IRCDDIR}' \ + 'MANDIR=${MANDIR}' 'RM=${RM}' 'CP=${CP}' 'TOUCH=${TOUCH}' \ + 'RES=${RES}' 'SHELL=${SHELL}' 'STRTOUL=${STRTOUL}' \ + 'CRYPTOLIB=${CRYPTOLIB}' \ + 'CRYPTOINCLUDES=${CRYPTOINCLUDES}' 'URL=${URL}' \ + +MY_MAKE = $(MAKE) $(MAKEARGS) + INCLUDES = ../include/auth.h ../include/badwords.h ../include/channel.h \ ../include/class.h ../include/common.h ../include/config.h ../include/dbuf.h \ ../include/dynconf.h ../include/events.h ../include/fdlist.h ../include/h.h \ @@ -49,7 +60,7 @@ all: build build: ircd mods custommodule: - +cd modules; $(MAKE) MODULEFILE=$(MODULEFILE) 'EXLIBS=$(EXLIBS)' custommodule + +cd modules; $(MY_MAKE) MODULEFILE=$(MODULEFILE) 'EXLIBS=$(EXLIBS)' custommodule ircd: $(OBJS) $(CC) $(CFLAGS) $(CRYPTOLIB) -o ircd $(OBJS) $(LDFLAGS) $(IRCDLIBS) $(CRYPTOLIB) @@ -72,7 +83,7 @@ mods: @if [ ! -r modules ] ; then \ echo "You havent done cvs update -P -d"; \ fi - +cd modules; $(MAKE) all + +cd modules; $(MY_MAKE) all version.c: version.c.SH ../Changes $(SHELL) version.c.SH |