From f572827157397e493e5499f115b15d0de992480a Mon Sep 17 00:00:00 2001
From: Adam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Sun, 27 Sep 2009 21:20:56 +0000
Subject: Removed old mod_version system for detecting module versions and
 replaced with the Module::GetVersion() function

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2521 5417fbe8-f217-4b02-8779-1006273d7864
---
 src/modules/Makefile     | 23 +++++++++--------------
 src/modules/Makefile.sub | 18 +++++++++---------
 2 files changed, 18 insertions(+), 23 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/Makefile b/src/modules/Makefile
index 531e01736..c6653b5f3 100644
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -8,14 +8,13 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
 	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'\
 	   'MAKEBIN=${MAKEBIN}'
 
-OBJECTS= $(SRCS:.c=.o)
-OBJECTS+= $(SRCS:.cpp=.o)
-SO_FILES=$(OBJECTS:.o=.s)
+OBJECTS= $(SRCS:.c=.so)
+OBJECTS+= $(SRCS:.cpp=.so)
 CDEFS= -rdynamic -Wall
 
 all: modules subs
 
-modules: $(OBJECTS) $(SO_FILES)
+modules: $(OBJECTS)
 
 install:
 	$(CP) ./*.so $(INSTDIR)/data/modules
@@ -25,15 +24,11 @@ install:
 
 distclean: spotless
 
-.c.o:
-	$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
+%.so: %.c
+	$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $*.so $*.c
 
-.cpp.o:
-	$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
-
-.o.s:
-	$(MAKEBIN) $(CC) ${SHARED} ../mod_version.o $< -o $*.so  ${PROFILE}
-	@$(TOUCH) $*.s
+%.so: %.cpp
+	$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $*.so $*.cpp
 
 subs:
 	@for i in $(SUBS); do \
@@ -46,8 +41,8 @@ subs_clean:
 	(cd $$i; $(MAKE) $(MAKEARGS) clean); done
 
 clean: subs_clean
-	rm -f *.o *.s *.so *.c~ core
+	rm -f *.so~ core
 
 spotless:
-	rm -f *.o *.s *.so *.c~ core *.so Makefile.inc
+	rm -f *.so~ core *.so Makefile.inc
 
diff --git a/src/modules/Makefile.sub b/src/modules/Makefile.sub
index d9011d602..65c83fb89 100644
--- a/src/modules/Makefile.sub
+++ b/src/modules/Makefile.sub
@@ -5,24 +5,24 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
    	   'RUNGROUP=${RUNGROUP}' \
 	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
 
-OBJECTS= $(SRCS:.c=.o)
-SO_FILES=$(OBJECTS:.o=.s)
+OBJECTS= $(SRCS:.c=.so)
+OBJECTS+=$(SRCS:.cpp=.so)
 CDEFS= -rdynamic -Wall
 
 all: module
 
-module: $(OBJECTS) so
+module: $(OBJECTS)
 
 distclean: spotless
 
-.c.o:
-	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
+%.so: %.c
+	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -o $*.so $*.cpp
 
-so:
-	$(CC) ${SHARED} ../../mod_version.o  $(OBJECTS) -o ../$(TARGET).so ${PROFILE}
+%.so: %.cpp
+	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -o $*.so $*.cpp
 
 clean:
-	rm -f *.o *.so *.c~ core
+	rm -f *.so~ core
 
 spotless:
-	rm -f *~ *.o *.so *.c~ core
+	rm -f *~ *.so~ core
-- 
cgit