summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorgeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2006-10-15 15:49:54 +0000
committergeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2006-10-15 15:49:54 +0000
commit6e77a5d94d554398b2d6965597da9d94bdb3a8f5 (patch)
treec8aac2d7580e508013cec1b1b3a7d4031f974e7f /src
parent6f94f2bb57cd44136a30d5bd6e2ae91b373dab64 (diff)
BUILD : 1.7.16 (1174) BUGS : NOTES : Fixed src/mod_version.c to be compiled with module options and added an additional check to see if the values returned by mysql_config are valid
git-svn-id: svn://svn.anope.org/anope/trunk@1174 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@895 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src')
-rw-r--r--src/Makefile19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/Makefile b/src/Makefile
index 0da9c0192..739c91814 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,15 +1,15 @@
MYSQL_OBJ = $(MYSQL:.c=.o)
RDB_OBJ = $(RDB:.c=.o)
OBJS = actions.o base64.o botserv.o channels.o chanserv.o commands.o compat.o \
- config.o datafiles.o encrypt.o events.o helpserv.o hostserv.o init.o ircd.o language.o list.o log.o mail.o main.o \
- memory.o memoserv.o messages.o misc.o mod_version.o modules.o news.o nickserv.o operserv.o \
+ config.o datafiles.o encrypt.o events.o helpserv.o hostserv.o init.o ircd.o language.o list.o log.o mail.o main.o \
+ memory.o memoserv.o messages.o misc.o modules.o news.o nickserv.o operserv.o \
process.o send.o servers.o sessions.o slist.o sockutil.o timeout.o users.o \
$(RDB_OBJ) $(MYSQL_OBJ)
SRCS = actions.c base64.c botserv.c channels.c chanserv.c commands.c compat.c \
- config.c datafiles.c encrypt.c events.c helpserv.c hostserv.c init.c ircd.c language.c list.c log.c mail.c main.c \
- memory.c memoserv.c messages.c misc.c mod_version.c modules.c news.c nickserv.c operserv.c \
- process.c send.c servers.c sessions.c slist.c sockutil.c timeout.c users.c \
- $(RDB) $(MYSQL)
+ config.c datafiles.c encrypt.c events.c helpserv.c hostserv.c init.c ircd.c language.c list.c log.c mail.c main.c \
+ memory.c memoserv.c messages.c misc.c modules.c news.c nickserv.c operserv.c \
+ process.c send.c servers.c sessions.c slist.c sockutil.c timeout.c users.c \
+ $(RDB) $(MYSQL)
INCLUDES = ../include/commands.h ../include/defs.h ../include/language.h \
../include/pseudo.h ../include/sysconf.h ../include/config.h \
@@ -32,7 +32,7 @@ all: services
distclean: spotless
distclean_modules: clean_modules spotless
-services: $(OBJS)
+services: $(OBJS) mod_version
$(CC) $(CFLAGS) $(OBJS) $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS)
$(OBJS): Makefile
@@ -60,7 +60,6 @@ memory.o: memory.c $(INCLUDES)
memoserv.o: memoserv.c $(INCLUDES)
messages.o: messages.c $(INCLUDES)
modules.o: modules.c $(INCLUDES)
-mod_version.o: mod_version.c $(INCLUDES)
misc.o: misc.c $(INCLUDES)
news.o: news.c $(INCLUDES)
nickserv.o: nickserv.c $(INCLUDES)
@@ -77,6 +76,10 @@ vsnprintf.o: vsnprintf.c $(INCLUDES)
mysql.o: mysql.c $(INCLUDES)
rdb.o: rdb.c $(INCLUDES)
+mod_version: mod_version.c $(INCLUDES)
+ $(CC) $(CDEFS) $(CFLAGS) $(MODULEFLAGS) -I../include/ -c mod_version.c
+
+
modules: DUMMY
(cd modules ; ./configure ; ${MAKE} ${MAKEARGS} all)