glines: Only use CIDR masks when necessary.

[irc/quakenet/newserv.git] / chanserv / Makefile

diff --git a/chanserv/Makefile b/chanserv/Makefile
index a016e8d18706cdc52aedc2cfb8a7d5ffbdb5376d..6aa97abac91357d269286d7881fdb8fddd6b2ac3 100644 (file)
--- a/chanserv/Makefile
+++ b/chanserv/Makefile
@@ -1,30 +1,33 @@
-CFLAGS+=${INCPGSQL} ${INCPCRE}
+include ../build.mk
+include build.mk
 
-CSDIRS=database chancmds usercmds authcmds authtracker newsearch
+CSDIRS=database chancmds usercmds authcmds authtracker newsearch achievements achcmds
 
-.PHONY: all dirs clean
-all: chanserv.so chanserv_protect.so chanserv_grep.so chanserv_chansearch.so chanserv_relay.so dirs
+.PHONY: all dirs $(CSDIRS) clean distclean
+all: chanserv.so chanserv_protect.so chanserv_grep.so chanserv_relay.so chanserv_flags.so chanserv_cleanupdb.so dirs
 
-dirs:
-       for i in $(CSDIRS) ; do $(MAKE) -C $$i all ; done
+dirs: $(CSDIRS)
        ln -sf */*.so .
 
+$(CSDIRS):
+       cd $@ && $(MAKE) $(MFLAGS) all
+
 clean:
-       rm -f */*.o */*.so
+       rm -f */*.o */*.so *.o *.so
+       rm -rf */.deps .deps
+
+distclean:
+       rm -f */.autobuild.mk .autobuild.mk
 
 chanserv.so: chanservdb_updates.o chanserv.o chanservuser.o chanservnetevents.o chanservprivs.o chanservlog.o chanservstdcmds.o \
                chanservdump.o chanservschedule.o chanservcrypto.o authlib.o q9snprintf.o
-       ld -shared -Bdynamic ${LIBPGSQL} -o $@ $^
 
 chanserv_protect.so: chanserv_protect.o
-       ld -shared -Bdynamic -o $@ $^
 
-chanserv_grep.so: chanservgrep.o
-       ld -shared -Bdynamic ${LIBPCRE} -o $@ $^
-
-chanserv_chansearch.so: chanserv-chansearch.o
-       ld -shared -Bdynamic -o $@ $^
+chanserv_grep.so: chanserv_grep.o
 
 chanserv_relay.so: chanserv_relay.o
-       ld -shared -Bdynamic -o $@ $^
 
+chanserv_flags.so: chanserv_flags.o
+
+chanserv_cleanupdb.so: chanserv_cleanupdb.o