Hi More cleanup.
- Lauri
>From 9cda737c405802ef99dd34ca9cdd71077b4b0e73 Mon Sep 17 00:00:00 2001 From: Lauri Kasanen <[email protected]> Date: Thu, 26 Jul 2012 23:53:49 +0300 Subject: [PATCH] plugins: Consolidate common build system parts, remove 63 lines of copy-paste Signed-off-by: Lauri Kasanen <[email protected]> --- plugins/Make.common | 9 +++++++++ plugins/auth/Makefile.in | 14 +++----------- plugins/cgi/Makefile.in | 14 +++----------- plugins/cheetah/Makefile.in | 13 +++---------- plugins/dirlisting/Makefile.in | 14 +++----------- plugins/liana/Makefile.in | 14 +++----------- plugins/liana_ssl/Makefile.in | 14 +++----------- plugins/logger/Makefile.in | 14 +++----------- plugins/mandril/Makefile.in | 15 +++------------ plugins/palm/Makefile.in | 14 +++----------- 10 files changed, 36 insertions(+), 99 deletions(-) create mode 100644 plugins/Make.common diff --git a/plugins/Make.common b/plugins/Make.common new file mode 100644 index 0000000..246607b --- /dev/null +++ b/plugins/Make.common @@ -0,0 +1,9 @@ +_PATH = $(patsubst $(monkey_root)/%, %, $(CURDIR)) +INCDIR = ../../src/include + +.c.o: + $(CC) $(CFLAGS) $(DEFS) -I$(INCDIR) -fPIC -c $< + $(CC_QUIET) -MM -MP $(CFLAGS) $(DEFS) -I$(INCDIR) $*.c -o $*.d > /dev/null &2>&1 + +clean: + rm -rf *.[od] *~ *.*so* diff --git a/plugins/auth/Makefile.in b/plugins/auth/Makefile.in index 2c1d1bc..09d0d40 100644 --- a/plugins/auth/Makefile.in +++ b/plugins/auth/Makefile.in @@ -1,22 +1,14 @@ -_PATH = $(patsubst $(monkey_root)/%, %, $(CURDIR)) +all: monkey-auth.so +include ../Make.common + CC = @echo " CC $(_PATH)/$@"; $CC CC_QUIET= @echo -n; $CC CFLAGS = $CFLAGS LDFLAGS = $LDFLAGS DEFS = $DEFS -INCDIR = ../../src/include OBJECTS = sha1.o base64.o conf.o auth.o -all: monkey-auth.so - -include $(OBJECTS:.o=.d) monkey-auth.so: $(OBJECTS) $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -shared -o $@ $^ -lc - -.c.o: $(SOURCES) - $(CC) $(CFLAGS) $(DEFS) -I$(INCDIR) -fPIC -c $< - $(CC_QUIET) -MM -MP $(CFLAGS) $(DEFS) -I$(INCDIR) $*.c -o $*.d > /dev/null &2>&1 - -clean: - rm -rf *.[od] *.*~ *.*so* diff --git a/plugins/cgi/Makefile.in b/plugins/cgi/Makefile.in index fb2c1d3..bdee0b7 100644 --- a/plugins/cgi/Makefile.in +++ b/plugins/cgi/Makefile.in @@ -1,22 +1,14 @@ -_PATH = $(patsubst $(monkey_root)/%, %, $(CURDIR)) +all: monkey-cgi.so +include ../Make.common + CC = @echo " CC $(_PATH)/$@"; $CC CC_QUIET= @echo -n; $CC CFLAGS = $CFLAGS LDFLAGS = $LDFLAGS DEFS = $DEFS -INCDIR = ../../src/include OBJECTS = cgi.o request.o event.o -all: monkey-cgi.so - -include $(OBJECTS:.o=.d) monkey-cgi.so: $(OBJECTS) $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -shared -o $@ $^ -lc - -.c.o: - $(CC) $(CFLAGS) $(DEFS) -I$(INCDIR) -fPIC -c $< - $(CC_QUIET) -MM -MP $(CFLAGS) $(DEFS) -I$(INCDIR) $*.c -o $*.d > /dev/null &2>&1 - -clean: - rm -rf *.[od] *~ *.*so* diff --git a/plugins/cheetah/Makefile.in b/plugins/cheetah/Makefile.in index ebb0c69..a3c0d0d 100644 --- a/plugins/cheetah/Makefile.in +++ b/plugins/cheetah/Makefile.in @@ -1,21 +1,14 @@ -_PATH = $(patsubst $(monkey_root)/%, %, $(CURDIR)) +all: monkey-cheetah.so +include ../Make.common + CC = @echo " CC $(_PATH)/$@"; $CC CC_QUIET= @echo -n; $CC CFLAGS = $CFLAGS LDFLAGS = $LDFLAGS DEFS = $DEFS -INCDIR = ../../src/include CHEETAH_OBJECTS = cheetah.o loop.o cmd.o cutils.o -all: monkey-cheetah.so - -include $(CHEETAH_OBJECTS:.o=.d) monkey-cheetah.so: $(CHEETAH_OBJECTS) $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -shared -o $@ $^ -lc - -.c.o: - $(CC) $(CFLAGS) $(DEFS) -I$(INCDIR) -fPIC -c $< - $(CC_QUIET) -MM -MP $(CFLAGS) $(DEFS) -I$(INCDIR) $*.c -o $*.d > /dev/null &2>&1 -clean: - rm -rf *.[od] *~ *.*so* diff --git a/plugins/dirlisting/Makefile.in b/plugins/dirlisting/Makefile.in index 3e10724..445316c 100644 --- a/plugins/dirlisting/Makefile.in +++ b/plugins/dirlisting/Makefile.in @@ -1,22 +1,14 @@ -_PATH = $(patsubst $(monkey_root)/%, %, $(CURDIR)) +all: monkey-dirlisting.so +include ../Make.common + CC = @echo " CC $(_PATH)/$@"; $CC CC_QUIET= @echo -n; $CC CFLAGS = $CFLAGS LDFLAGS = $LDFLAGS DEFS = $DEFS -INCDIR = ../../src/include DIRLISTING_OBJECTS = dirlisting.o -all: monkey-dirlisting.so - -include $(DIRLISTING_OBJECTS:.o=.d) monkey-dirlisting.so: $(DIRLISTING_OBJECTS) $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -shared -o $@ $^ -lc - -.c.o: - $(CC) $(CFLAGS) $(DEFS) -I$(INCDIR) -fPIC -c $< - $(CC_QUIET) -MM -MP $(CFLAGS) $(DEFS) -I$(INCDIR) $*.c -o $*.d > /dev/null &2>&1 - -clean: - rm -rf *.[od] *~ *.*so* diff --git a/plugins/liana/Makefile.in b/plugins/liana/Makefile.in index d572a35..95f85b2 100644 --- a/plugins/liana/Makefile.in +++ b/plugins/liana/Makefile.in @@ -1,22 +1,14 @@ -_PATH = $(patsubst $(monkey_root)/%, %, $(CURDIR)) +all: monkey-liana.so +include ../Make.common + CC = @echo " CC $(_PATH)/$@"; $CC CC_QUIET= @echo -n; $CC CFLAGS = $CFLAGS LDFLAGS = $LDFLAGS DEFS = $DEFS -INCDIR = ../../src/include LIANA_OBJECTS = liana.o -all: monkey-liana.so - -include $(LIANA_OBJECTS:.o=.d) monkey-liana.so: $(LIANA_OBJECTS) $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -shared -o $@ $^ -lc - -.c.o: - $(CC) $(CFLAGS) $(DEFS) -I$(INCDIR) -fPIC -c $< - $(CC_QUIET) -MM -MP $(CFLAGS) $(DEFS) -I$(INCDIR) $*.c -o $*.d > /dev/null &2>&1 - -clean: - rm -rf *.[od] *~ *.*so* diff --git a/plugins/liana_ssl/Makefile.in b/plugins/liana_ssl/Makefile.in index 21fd38d..e6c0570 100644 --- a/plugins/liana_ssl/Makefile.in +++ b/plugins/liana_ssl/Makefile.in @@ -1,23 +1,15 @@ -_PATH = $(patsubst $(monkey_root)/%, %, $(CURDIR)) +all: monkey-liana_ssl.so +include ../Make.common + CC = @echo " CC $(_PATH)/$@"; $CC CC_QUIET= @echo -n; $CC CFLAGS = $CFLAGS LDFLAGS = $LDFLAGS DEFS = $DEFS -DPOSIX -INCDIR = -I../../src/include OBJECTS = liana_ssl.o MATRIX_HEADERS = /usr/include/matrixssl/ -all: monkey-liana_ssl.so - -include $(OBJECTS:.o=.d) monkey-liana_ssl.so: $(OBJECTS) $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -shared -o $@ $^ -lmatrixssl - -.c.o: - $(CC) $(CFLAGS) $(DEFS) $(INCDIR) -I$(MATRIX_HEADERS) -fPIC -c $< - $(CC_QUIET) -MM -MP $(CFLAGS) $(DEFS) $(INCDIR) $*.c -o $*.d > /dev/null &2>&1 - -clean: - rm -rf *.[od] *.*~ *.*so* diff --git a/plugins/logger/Makefile.in b/plugins/logger/Makefile.in index b07fe6a..a70f28b 100644 --- a/plugins/logger/Makefile.in +++ b/plugins/logger/Makefile.in @@ -1,22 +1,14 @@ -_PATH = $(patsubst $(monkey_root)/%, %, $(CURDIR)) +all: monkey-logger.so +include ../Make.common + CC = @echo " CC $(_PATH)/$@"; $CC CC_QUIET= @echo -n; $CC CFLAGS = $CFLAGS LDFLAGS = $LDFLAGS DEFS = $DEFS -INCDIR = ../../src/include LOGGER_OBJECTS = pointers.o logger.o -all: monkey-logger.so - -include $(LOGGER_OBJECTS:.o=.d) monkey-logger.so: $(LOGGER_OBJECTS) $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -shared -o $@ $^ -lc - -.c.o: - $(CC) $(CFLAGS) $(DEFS) -I$(INCDIR) -fPIC -c $< - $(CC_QUIET) -MM -MP $(CFLAGS) $(DEFS) -I$(INCDIR) $*.c -o $*.d > /dev/null &2>&1 -clean: - rm -rf *.[od] *~ - rm -rf *.*so* diff --git a/plugins/mandril/Makefile.in b/plugins/mandril/Makefile.in index cd39247..0190576 100644 --- a/plugins/mandril/Makefile.in +++ b/plugins/mandril/Makefile.in @@ -1,23 +1,14 @@ -_PATH = $(patsubst $(monkey_root)/%, %, $(CURDIR)) +all: monkey-mandril.so +include ../Make.common + CC = @echo " CC $(_PATH)/$@"; $CC CC_QUIET= @echo -n; $CC CFLAGS = $CFLAGS LDFLAGS = $LDFLAGS DEFS = $DEFS -INCDIR = ../../src/include MANDRIL_OBJECTS = mandril.o -all: monkey-mandril.so - -include $(MANDRIL_OBJECTS:.o=.d) monkey-mandril.so: $(MANDRIL_OBJECTS) $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -shared -o $@ $^ -lc - -.c.o: - $(CC) $(CFLAGS) $(DEFS) -I$(INCDIR) -fPIC -c $< - $(CC_QUIET) -MM -MP $(CFLAGS) $(DEFS) -I$(INCDIR) $*.c -o $*.d > /dev/null &2>&1 - -clean: - rm -rf *.[od] - rm -rf *.*so* diff --git a/plugins/palm/Makefile.in b/plugins/palm/Makefile.in index 789a436..da8a1db 100644 --- a/plugins/palm/Makefile.in +++ b/plugins/palm/Makefile.in @@ -1,23 +1,15 @@ -_PATH = $(patsubst $(monkey_root)/%, %, $(CURDIR)) +all: monkey-palm.so +include ../Make.common + CC = @echo " CC $(_PATH)/$@"; $CC CC_QUIET= @echo -n; $CC CFLAGS = $CFLAGS LDFLAGS = $LDFLAGS DEFS = $DEFS -INCDIR = ../../src/include SOURCES = palm.c protocol.c cgi.c request.c OBJECTS = palm.o protocol.o cgi.o request.o -all: monkey-palm.so - -include $(OBJECTS:.o=.d) monkey-palm.so: $(OBJECTS) $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -shared -o $@ $^ -lc - -.c.o: $(SOURCES) - $(CC) $(CFLAGS) $(DEFS) -I$(INCDIR) -fPIC -c $< - $(CC_QUIET) -MM -MP $(CFLAGS) $(DEFS) -I$(INCDIR) $*.c -o $*.d > /dev/null &2>&1 - -clean: - rm -rf *.[od] *.*~ *.*so* -- 1.7.2.1
_______________________________________________ Monkey mailing list [email protected] http://lists.monkey-project.com/listinfo/monkey
