diff options
| author | Adam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-09-27 21:20:56 +0000 |
|---|---|---|
| committer | Adam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-09-27 21:20:56 +0000 |
| commit | f572827157397e493e5499f115b15d0de992480a (patch) | |
| tree | 8fb49c5ed90d01458a138d0ce582493c94e56219 /src/protocol | |
| parent | 9d87b0f9235458169b513904ce4e220da4e29d73 (diff) | |
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
Diffstat (limited to 'src/protocol')
| -rw-r--r-- | src/protocol/Makefile | 21 | ||||
| -rw-r--r-- | src/protocol/Makefile.sub | 15 |
2 files changed, 14 insertions, 22 deletions
diff --git a/src/protocol/Makefile b/src/protocol/Makefile index 9cef64955..a58fd8e64 100644 --- a/src/protocol/Makefile +++ b/src/protocol/Makefile @@ -8,9 +8,8 @@ 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 @@ -22,15 +21,11 @@ install: distclean: clean 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 \ @@ -43,9 +38,9 @@ subs_clean: (cd $$i; $(MAKE) clean); done clean: subs_clean - rm -f *.o *.s *.so *.c~ core + rm -f *.so~ core spotless: subs_clean - rm -f *.o *.s *.so *.c~ core *.so Makefile.inc + rm -f *.so~ core *.so Makefile.inc diff --git a/src/protocol/Makefile.sub b/src/protocol/Makefile.sub index 12502d87e..60b95920d 100644 --- a/src/protocol/Makefile.sub +++ b/src/protocol/Makefile.sub @@ -5,8 +5,8 @@ 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 @@ -15,14 +15,11 @@ module: $(OBJECTS) so distclean: spotless -.c.o: - $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $< +%.so: %.c + $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -o $*.so $*.c -.cpp.o: - $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $< - -so: - $(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE} +%.so: %.cpp + $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -o $*.so $*.cpp clean: rm -f *.o *.so *.c~ core |