From 17526433ced369f6c09a564563f7b7d9dc523acb Mon Sep 17 00:00:00 2001 From: imaginos Date: Thu, 31 Mar 2005 20:41:01 +0000 Subject: [PATCH] move install target into modules git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@53 726aef4b-f618-498e-8847-2d620e286838 --- Makefile.in | 6 ++---- modules/Makefile.in | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3c4e5b61..6c4c2ccd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -13,7 +13,7 @@ SRCS=main.cpp znc.cpp User.cpp IRCSock.cpp UserSock.cpp DCCBounce.cpp DCCSock.cp all: znc @MODTARGET@ depend:: - g++ -M $(CXXFLAGS) $(SRCS) $(INCLUDES) >.depend + g++ -MM $(CXXFLAGS) $(SRCS) $(INCLUDES) >.depend (cd modules; $(MAKE) depend) znc: $(OBJS) @@ -37,7 +37,5 @@ clean: install: znc @MODTARGET@ mkdir -p $(DEST) - mkdir -p $(DEST)/modules install -m 0711 znc $(DEST) - install -m 0711 modules/*.so $(DEST)/modules - + (cd modules; $(MAKE) DEST=$(DEST)) diff --git a/modules/Makefile.in b/modules/Makefile.in index 2e98ffcf..076cd013 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in @@ -16,6 +16,10 @@ all: $(OBJS) $(addsuffix .so, $(basename $(wildcard *.cpp))) depend:: g++ -M $(CXXFLAGS) $(SRCS) $(INCLUDES) >.depend +install: all + mkdir -p $(DEST)/modules + install -m 0711 *.so $(DEST)/modules + clean: rm -rf *.so *.o core core.*