[557] in BarnOwl Developers

home help back first fref pref prev next nref lref last post

[D-O-H] r674 - / branches/par

daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:07:23 2009

Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Mon, 19 Mar 2007 14:14:34 -0400 (EDT)

Author: nelhage
Date: 2007-03-19 14:14:33 -0400 (Mon, 19 Mar 2007)
New Revision: 674

Modified:
   /
   branches/par/Makefile.in
Log:
 r20303@phanatique:  nelhage | 2007-03-19 13:32:25 -0400
 Modifying the makefile to build and install perl modules



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:24493
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/barnowl:20301
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h:18636
   + 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:24493
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/barnowl:20303
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h:18636

Modified: branches/par/Makefile.in
===================================================================
--- branches/par/Makefile.in	2007-03-19 18:14:23 UTC (rev 673)
+++ branches/par/Makefile.in	2007-03-19 18:14:33 UTC (rev 674)
@@ -30,6 +30,8 @@
 TESTER_SRC = tester.c
 
 EXE = barnowl
+PERL_MODULES = Jabber
+MODULE_DIRS = $(PERL_MODULES:%=perl/modules/%)
 
 BASE_OBJS = $(BASE_SRCS:.c=.o)
 
@@ -56,12 +58,26 @@
 test: tester
 	./tester reg
 
-clean: libfaimclean
+clean: libfaimclean modules_clean
 	$(RM) $(EXE) tester *.o $(AUTOGEN) owl_prototypes.h.new
 
 distclean: clean libfaimdistclean
 	$(RM) config.cache config.log config.status  Makefile config.h TAGS *~ core
 
+.PHONY: $(MODULE_DIRS)
+
+modules: $(MODULE_DIRS)
+modules_clean:
+	for i in $(MODULE_DIRS); do \
+		cd $$i; test ! -f Makefile || make clean; \
+	done
+
+$(MODULE_DIRS): %: %/Makefile
+	( cd $@ && make $(notdir $@).par )
+
+$(MODULE_DIRS:=/Makefile): %/Makefile: %/Makefile.PL
+	( cd $(dir $@) && perl -I../../lib Makefile.PL )
+
 proto: owl_prototypes.h
 
 perlglue.c: perlglue.xs Makefile 
@@ -103,12 +119,16 @@
 libfaimdistclean:
 	(cd libfaim; $(MAKE) distclean)
 
-all: $(EXE)
+all: $(EXE) $(MODULE_DIRS)
 
 install: all installdirs
 	${INSTALL_PROGRAM} $(EXE) ${DESTDIR}${bindir}/$(EXE)
 	${INSTALL_DATA} doc/owl.1 ${DESTDIR}${mandir}/man1/barnowl.1
-	tar -C perl -c . | tar -C ${DESTDIR}${datadir} -x
+	${INSTALL} -d ${DESTDIR}${datadir}/lib
+	tar -C perl/lib -c . | tar -C ${DESTDIR}${datadir}/lib -x
+	for i in $(PERL_MODULES); do \
+		${INSTALL_DATA} perl/modules/$$i/$$i.par ${DESTDIR}${datadir}/modules; \
+	done
 
 installdirs: mkinstalldirs
 	${srcdir}/mkinstalldirs ${DESTDIR}${bindir} ${DESTDIR}${mandir}/man1 ${DESTDIR}${datadir}


home help back first fref pref prev next nref lref last post