X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=02dd3e410869a8368d66975ad7800024d532239d;hb=62a2b4dade30d6255bd3cec405f4943f57605e00;hp=23cc59a9798b1401c63f2d2b152d9f8de3ff07e1;hpb=b55c5c109e6b25f3d72aa4e7b140beccc694d729;p=plcapi.git

diff --git a/Makefile b/Makefile
index 23cc59a..02dd3e4 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,6 @@
 # starting with 5.0, support for these two modules is taken out
 
 # Other stuff - doc not implicit, it's redone by myplc-docs
-subdirs := php/xmlrpc
 
 # autoconf compatible variables
 DESTDIR := /
@@ -19,7 +18,7 @@ bindir := /usr/bin
 
 PWD := $(shell pwd)
 
-all: $(subdirs) 
+all: 
 	python setup.py build
 
 install: 
@@ -27,15 +26,9 @@ install:
 	    --install-purelib=$(DESTDIR)/$(datadir)/plc_api \
 	    --install-scripts=$(DESTDIR)/$(datadir)/plc_api \
 	    --install-data=$(DESTDIR)/$(datadir)/plc_api
-	install -D -m 755 php/xmlrpc/xmlrpc.so $(DESTDIR)/$(shell php-config --extension-dir)/xmlrpc.so
-
-$(subdirs): %:
-	$(MAKE) -C $@
 
 clean: 
 	find . -name '*.pyc' | xargs rm -f
-	rm -f $(INIT)
-	for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir clean ; done
 	python setup.py clean && rm -rf build
 
 index:
@@ -45,7 +38,7 @@ index:
 
 force:
 
-.PHONY: all install force clean index tags $(subdirs)
+.PHONY: all install force clean index tags
 
 #################### devel tools
 tags:
@@ -66,13 +59,8 @@ SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
 else
 ifdef PLCHOSTLXC
-SSHURL:=root@$(PLCHOSTLXC):/var/lib/lxc/$(GUESTNAME)/rootfs
-SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)
-else
-ifdef PLCHOSTVS
-SSHURL:=root@$(PLCHOSTVS):/vservers/$(GUESTNAME)
-SSHCOMMAND:=ssh root@$(PLCHOSTVS) vserver $(GUESTNAME) exec
-endif
+SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)
+SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh -o StrictHostKeyChecking=no -o LogLevel=quiet $(GUESTHOSTNAME)
 endif
 endif
 
@@ -85,14 +73,14 @@ sync:
 ifeq (,$(SSHURL))
 	@echo "sync: I need more info from the command line, e.g."
 	@echo "  make sync PLC=boot.planetlab.eu"
-	@echo "  make sync PLCHOSTVS=.. GUESTNAME=.."
-	@echo "  make sync PLCHOSTLXC=.. GUESTNAME=.. GUESTHOSTNAME=.."
+	@echo "  make sync PLCHOSTLXC=.. GUESTNAME=.."
 	@exit 1
 else
-	+$(RSYNC) plcsh PLC planetlab5.sql migrations aspects $(SSHURL)/usr/share/plc_api/
+	+$(RSYNC) plcsh PLC planetlab5.sql migrations aspects php $(SSHURL)/usr/share/plc_api/
 	+$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/
 	+$(RSYNC) plc.d/ $(SSHURL)/etc/plc.d/
-	$(SSHCOMMAND) apachectl graceful
+	$(SSHCOMMAND) /etc/plc.d/httpd stop
+	$(SSHCOMMAND) /etc/plc.d/httpd start
 endif
 
 #################### convenience, for debugging only