Index: /trunk/Ohana/src/elixir/Makefile
===================================================================
--- /trunk/Ohana/src/elixir/Makefile	(revision 10335)
+++ /trunk/Ohana/src/elixir/Makefile	(revision 10336)
@@ -1,20 +1,19 @@
+default: elixir
+help:
+	@echo "make options: elixir (default)"
+
 include ../../Configure
 HOME 	=	$(ROOT)/src/elixir
-CONFIG  =	$(ROOT)/config
-PROGRAM =	elixir
-
 BIN	=	$(HOME)/bin
 LIB	=	$(HOME)/lib
-INC	= 	$(HOME)/include
 SRC	=	$(HOME)/src
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(BINDIR)
-DESTLIB	=	$(LIBDIR)
-DESTINC	=	$(INCDIR)
-DESTMAN	=	$(MANDIR)
+INC	= 	$(HOME)/include
+include ../../Makefile.Common
 
-#  
-CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
-LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
+LDFLAGS := 	-ldvo -lFITS -lohana $(LDFLAGS)
+
+elixir: $(BIN)/elixir.$(ARCH)
+install: $(DESTBIN)/elixir
 
 ELIXIR = \
@@ -32,32 +31,4 @@
 $(SRC)/ConfigPID.$(ARCH).o		$(SRC)/RemoteOps.$(ARCH).o
 
-default: elixir
-
-$(ELIXIR): $(INC)/controller.h
-
-# dependancy rules for binary code ##########################
-$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-
-$(BIN)/$(PROGRAM).$(ARCH): $(ELIXIR)
-	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
-	$(CC) $(ELIXIR) -o $(BIN)/$(PROGRAM).$(ARCH) $(LFLAGS)
-
-install: $(DESTBIN)/$(PROGRAM)
-
-$(DESTBIN)/$(PROGRAM): $(BIN)/$(PROGRAM).$(ARCH)
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN); fi
-	rm -f $(DESTBIN)/$(PROGRAM)
-	cp $(BIN)/$(PROGRAM).$(ARCH) $(DESTBIN)/$(PROGRAM)
-
-# utilities #################################################
-clean:	
-	rm -f $(BIN)/*.$(ARCH)
-	rm -f $(SRC)/*.o
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
-
-.PRECIOUS: %.$(ARCH).o
-.PRECIOUS: $(BIN)/%.$(ARCH)
-
-%.$(ARCH).o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(ELIXIR): $(INC)/elixir.h
+$(BIN)/elixir.$(ARCH): $(ELIXIR)
Index: /trunk/Ohana/src/elixir/src/CheckCluster.c
===================================================================
--- /trunk/Ohana/src/elixir/src/CheckCluster.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/CheckCluster.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 int CheckCluster (Cluster *cluster, Queue *success, Queue *failure, Queue *pending) {
Index: /trunk/Ohana/src/elixir/src/CheckDepend.c
===================================================================
--- /trunk/Ohana/src/elixir/src/CheckDepend.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/CheckDepend.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 int CheckDepend (Object *object, int argc, char **argv, int *argd) {
Index: /trunk/Ohana/src/elixir/src/CheckEndingState.c
===================================================================
--- /trunk/Ohana/src/elixir/src/CheckEndingState.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/CheckEndingState.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 static int Nsuccess = 0;
Index: /trunk/Ohana/src/elixir/src/CheckMachineStatus.c
===================================================================
--- /trunk/Ohana/src/elixir/src/CheckMachineStatus.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/CheckMachineStatus.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 # define MAXTIME 120
 
Index: /trunk/Ohana/src/elixir/src/CheckMessages.c
===================================================================
--- /trunk/Ohana/src/elixir/src/CheckMessages.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/CheckMessages.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 static struct timeval then = {0,0};
Index: /trunk/Ohana/src/elixir/src/CheckProcess.c
===================================================================
--- /trunk/Ohana/src/elixir/src/CheckProcess.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/CheckProcess.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 int CheckProcess (Process *process) {
Index: /trunk/Ohana/src/elixir/src/ConfigInit.c
===================================================================
--- /trunk/Ohana/src/elixir/src/ConfigInit.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/ConfigInit.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 void SIG_STOP (int sig) {
Index: /trunk/Ohana/src/elixir/src/ConfigPID.c
===================================================================
--- /trunk/Ohana/src/elixir/src/ConfigPID.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/ConfigPID.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 static char *PIDMaster = (char *) NULL;
Index: /trunk/Ohana/src/elixir/src/DefineProcesses.c
===================================================================
--- /trunk/Ohana/src/elixir/src/DefineProcesses.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/DefineProcesses.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 Process **DefineProcesses (Process *global, int *nprocess, char *config) {
Index: /trunk/Ohana/src/elixir/src/DumpStatus.c
===================================================================
--- /trunk/Ohana/src/elixir/src/DumpStatus.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/DumpStatus.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 int DumpStatus (char *filename) {
Index: /trunk/Ohana/src/elixir/src/FifoOps.c
===================================================================
--- /trunk/Ohana/src/elixir/src/FifoOps.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/FifoOps.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 int InitFifo (Fifo *fifo, int Nalloc, int Nextra) {
Index: /trunk/Ohana/src/elixir/src/InitProcess.c
===================================================================
--- /trunk/Ohana/src/elixir/src/InitProcess.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/InitProcess.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 Process *InitProcess (char *name, Queue *pending, Queue *failure, int (*mkargs)()) {
Index: /trunk/Ohana/src/elixir/src/LoadPending.c
===================================================================
--- /trunk/Ohana/src/elixir/src/LoadPending.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/LoadPending.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 static struct timeval then = {0.0, 0.0};
Index: /trunk/Ohana/src/elixir/src/LogOpen.c
===================================================================
--- /trunk/Ohana/src/elixir/src/LogOpen.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/LogOpen.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 FILE *LogOpen (char *filename) {
Index: /trunk/Ohana/src/elixir/src/MachineOps.c
===================================================================
--- /trunk/Ohana/src/elixir/src/MachineOps.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/MachineOps.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 /* this is in libohana -> should be in ohana.h */
Index: /trunk/Ohana/src/elixir/src/MsgOps.c
===================================================================
--- /trunk/Ohana/src/elixir/src/MsgOps.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/MsgOps.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 int WaitMsg (char *fifo, char **message, double maxdelay) {
Index: /trunk/Ohana/src/elixir/src/Photcodes.c
===================================================================
--- /trunk/Ohana/src/elixir/src/Photcodes.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/Photcodes.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 char *GetPhotcode (char *file) {
Index: /trunk/Ohana/src/elixir/src/ProcessOps.c
===================================================================
--- /trunk/Ohana/src/elixir/src/ProcessOps.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/ProcessOps.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 /* take entry and return char with filled out value,
Index: /trunk/Ohana/src/elixir/src/QueueOps.c
===================================================================
--- /trunk/Ohana/src/elixir/src/QueueOps.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/QueueOps.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 /* get object from top of stack */
Index: /trunk/Ohana/src/elixir/src/RemoteOps.c
===================================================================
--- /trunk/Ohana/src/elixir/src/RemoteOps.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/RemoteOps.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 void HaltElixir (char *pidfile) {
Index: /trunk/Ohana/src/elixir/src/SockScan.c
===================================================================
--- /trunk/Ohana/src/elixir/src/SockScan.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/SockScan.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 # include <errno.h>
 # define MAXTIME 10
Index: /trunk/Ohana/src/elixir/src/StartMachine.c
===================================================================
--- /trunk/Ohana/src/elixir/src/StartMachine.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/StartMachine.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 int StartMachine (Machine *machine, Object *object, int argc, char **argv) {
Index: /trunk/Ohana/src/elixir/src/elixir.c
===================================================================
--- /trunk/Ohana/src/elixir/src/elixir.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/elixir.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 static int Dynamic;
Index: /trunk/Ohana/src/elixir/src/rconnect.c
===================================================================
--- /trunk/Ohana/src/elixir/src/rconnect.c	(revision 10335)
+++ /trunk/Ohana/src/elixir/src/rconnect.c	(revision 10336)
@@ -1,3 +1,3 @@
-# include "controller.h"
+# include "elixir.h"
 
 /* rconnect opens a remote shell on hostname and returns two file descriptors: