From 624c5ba5b6fefff3a71f4fcc5984ad6ccf5e6c22 Mon Sep 17 00:00:00 2001 From: Adam- Date: Tue, 20 Oct 2009 21:05:51 +0000 Subject: [PATCH] Fixed makesfiles to work on both bsd make and gnu make git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2575 5417fbe8-f217-4b02-8779-1006273d7864 --- src/core/Makefile | 12 ++++++------ src/modules/Makefile | 12 ++++++------ src/protocol/Makefile | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/core/Makefile b/src/core/Makefile index 99a9573d6..f32d0e1d7 100644 --- a/src/core/Makefile +++ b/src/core/Makefile @@ -8,8 +8,8 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \ 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' \ 'MODULEFLAGS=${MODULEFLAGS}' 'MAKEBIN=${MAKEBIN}' -OBJECTS= $(SRCS:.c=.so) -OBJECTS+= $(SRCS:.cpp=.so) +OBJECTS= $(SRCS:.c=.o) +OBJECTS+= $(SRCS:.cpp=.o) CDEFS= -rdynamic -Wall all: modules subs @@ -21,11 +21,11 @@ install: distclean: spotless -%.so: %.c - $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $*.so $*.c +.c.o: + $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $*.so $< -%.so: %.cpp - $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $*.so $*.cpp +.cpp.o: + $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $*.so $< subs: @for i in $(SUBS); do \ diff --git a/src/modules/Makefile b/src/modules/Makefile index b0432ddd7..8d0fe0eb9 100644 --- a/src/modules/Makefile +++ b/src/modules/Makefile @@ -8,8 +8,8 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \ 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'\ 'MAKEBIN=${MAKEBIN}' -OBJECTS= $(SRCS:.c=.so) -OBJECTS+= $(SRCS:.cpp=.so) +OBJECTS= $(SRCS:.c=.o) +OBJECTS+= $(SRCS:.cpp=.o) CDEFS= -rdynamic -Wall all: modules subs @@ -24,11 +24,11 @@ install: distclean: spotless -%.so: %.c - $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $*.so $*.c +.c.o: + $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $*.so $< -%.so: %.cpp - $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $*.so $*.cpp +.cpp.o: + $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $*.so $< subs: @for i in $(SUBS); do \ diff --git a/src/protocol/Makefile b/src/protocol/Makefile index 7555e50b0..1c5f17320 100644 --- a/src/protocol/Makefile +++ b/src/protocol/Makefile @@ -8,8 +8,8 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \ 'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'\ 'MAKEBIN=${MAKEBIN}' -OBJECTS= $(SRCS:.c=.so) -OBJECTS+= $(SRCS:.cpp=.so) +OBJECTS= $(SRCS:.c=.o) +OBJECTS+= $(SRCS:.cpp=.o) CDEFS= -rdynamic -Wall all: modules subs @@ -21,11 +21,11 @@ install: distclean: clean spotless -%.so: %.c - $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $*.so $*.c +.c.o: + $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $*.so $< -%.so: %.cpp - $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $*.so $*.cpp +.cpp.o: + $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -o $*.so $< subs: @for i in $(SUBS); do \