summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrob rob@31f1291d-b8d6-0310-a050-a5561fc1590b <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2005-02-27 16:12:22 +0000
committerrob rob@31f1291d-b8d6-0310-a050-a5561fc1590b <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2005-02-27 16:12:22 +0000
commitab7325c56f4a018d479274001979fc961cbd74cc (patch)
tree4fdeeec7d7d4640c4c2baf7b1e2f9aec2af166a9
parentd6711043b473c9bcaca99be572093ff22d8cc0fa (diff)
BUILD : 1.7.8 (583) BUGS : N/A NOTES : Added multifile module support for nix, win32 will follow
git-svn-id: svn://svn.anope.org/anope/trunk@583 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@433 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--Changes1
-rw-r--r--src/modules/Makefile7
-rw-r--r--src/modules/Makefile.sub30
-rwxr-xr-xsrc/modules/configure16
-rw-r--r--version.log6
5 files changed, 58 insertions, 2 deletions
diff --git a/Changes b/Changes
index 6c7c71282..7ec8efeff 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
Anope Version S V N
-------------------
Provided by Anope Dev. <dev@anope.org> - 2005
+02/27 A Added multi-file module support for nix, win32 will follow. [ #00]
02/13 A Internal Event support, see EVENTS in the doc folder for help [ #00]
02/05 A Support for Unreal 3.2 +I channel mode. [ #00]
02/03 A Merged anope-win32 branch into the main, now Win32 ready. [ #00]
diff --git a/src/modules/Makefile b/src/modules/Makefile
index 54b126b11..49d118c59 100644
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -12,7 +12,7 @@ SO_FILES=$(OBJECTS:.o=.s)
CDEFS= -g -rdynamic -Wall
CFLAGS=$(CFLAGS) $(CDEFS)
-all: modules
+all: modules subs
modules: $(OBJECTS) $(SO_FILES)
@@ -27,6 +27,11 @@ distclean: clean spotless
.o.s:
$(CC) ${SHARED} $< -o $*.so ${PROFILE}
+subs:
+ @for i in $(SUBS); do \
+ echo "make all in $$i..."; \
+ (cd $$i; $(MAKE) $(MAKEARGS) $(MYMAKEFLAGS) all); done
+
clean:
rm -f *.o *.so *.c~ core
diff --git a/src/modules/Makefile.sub b/src/modules/Makefile.sub
new file mode 100644
index 000000000..b060ca5b6
--- /dev/null
+++ b/src/modules/Makefile.sub
@@ -0,0 +1,30 @@
+MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
+ 'LDFLAGS=${LDFLAGS}' 'BINDEST=${BINDEST}' 'INSTALL=${INSTALL}' \
+ 'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
+ 'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
+ 'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
+ 'PROFILE=${PROFILE}' 'SHARED=${SHARED}'
+
+OBJECTS= $(SRCS:.c=.o)
+SO_FILES=$(OBJECTS:.o=.s)
+CDEFS= -g -rdynamic -Wall
+CFLAGS=$(CFLAGS) $(CDEFS)
+
+all: module
+
+module: $(OBJECTS) so
+
+distclean: clean spotless
+
+.c.o:
+ $(CC) $(CFLAGS) -I../ -I../../${INCLUDEDIR} -c $<
+
+so:
+ $(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE}
+
+clean:
+ rm -f *.o *.so *.c~ core
+
+spotless: clean
+ rm -f *~
+
diff --git a/src/modules/configure b/src/modules/configure
index 2e353214b..e2a6efd74 100755
--- a/src/modules/configure
+++ b/src/modules/configure
@@ -14,4 +14,20 @@ do
done
echo "" >> ./Makefile.inc
+echo -n "SUBS=" >> ./Makefile.inc
+FIRST=1
+for dir in *
+do
+ if [ -d $dir ] ; then
+ if [ "$FIRST" = 1 ] ; then
+ echo -n " "$dir >> ./Makefile.inc
+ else
+ echo "\\" >> ./Makefile.inc
+ echo -n " " $dir >> ./Makefile.inc
+ fi
+ FIRST=0
+ fi
+done
+
exit 0
+
diff --git a/version.log b/version.log
index 17cacb0d8..7b41c8d36 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="8"
-VERSION_BUILD="582"
+VERSION_BUILD="583"
# $Log$
#
+# BUILD : 1.7.8 (583)
+# BUGS : N/A
+# NOTES : Added multifile module support for nix, win32 will follow
+#
# BUILD : 1.7.8 (582)
# BUGS :
# NOTES : Another update in the docs/ dir. All that's left is FAQ now if i'm right. Has been noted in Changes already in r578