Changeset 10336

Timestamp:

Nov 30, 2006, 5:01:25 PM (19 years ago)

Author:

eugene

Message:

convert controller.h to elixir.h; cleanup Makefile

Location:

trunk/Ohana/src/elixir

Files:

• Makefile (modified) (2 diffs)
• src/CheckCluster.c (modified) (1 diff)
• src/CheckDepend.c (modified) (1 diff)
• src/CheckEndingState.c (modified) (1 diff)
• src/CheckMachineStatus.c (modified) (1 diff)
• src/CheckMessages.c (modified) (1 diff)
• src/CheckProcess.c (modified) (1 diff)
• src/ConfigInit.c (modified) (1 diff)
• src/ConfigPID.c (modified) (1 diff)
• src/DefineProcesses.c (modified) (1 diff)
• src/DumpStatus.c (modified) (1 diff)
• src/FifoOps.c (modified) (1 diff)
• src/InitProcess.c (modified) (1 diff)
• src/LoadPending.c (modified) (1 diff)
• src/LogOpen.c (modified) (1 diff)
• src/MachineOps.c (modified) (1 diff)
• src/MsgOps.c (modified) (1 diff)
• src/Photcodes.c (modified) (1 diff)
• src/ProcessOps.c (modified) (1 diff)
• src/QueueOps.c (modified) (1 diff)
• src/RemoteOps.c (modified) (1 diff)
• src/SockScan.c (modified) (1 diff)
• src/StartMachine.c (modified) (1 diff)
• src/elixir.c (modified) (1 diff)
• src/rconnect.c (modified) (1 diff)

trunk/Ohana/src/elixir/Makefile

@@ +1 @@
+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 +31 @@
 $(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)

trunk/Ohana/src/elixir/src/CheckCluster.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 int CheckCluster (Cluster *cluster, Queue *success, Queue *failure, Queue *pending) {

trunk/Ohana/src/elixir/src/CheckDepend.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 int CheckDepend (Object *object, int argc, char **argv, int *argd) {

trunk/Ohana/src/elixir/src/CheckEndingState.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 static int Nsuccess = 0;

trunk/Ohana/src/elixir/src/CheckMachineStatus.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 # define MAXTIME 120
 

trunk/Ohana/src/elixir/src/CheckMessages.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 static struct timeval then = {0,0};

trunk/Ohana/src/elixir/src/CheckProcess.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 int CheckProcess (Process *process) {

trunk/Ohana/src/elixir/src/ConfigInit.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 void SIG_STOP (int sig) {

trunk/Ohana/src/elixir/src/ConfigPID.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 static char *PIDMaster = (char *) NULL;

trunk/Ohana/src/elixir/src/DefineProcesses.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 Process **DefineProcesses (Process *global, int *nprocess, char *config) {

trunk/Ohana/src/elixir/src/DumpStatus.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 int DumpStatus (char *filename) {

trunk/Ohana/src/elixir/src/FifoOps.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 int InitFifo (Fifo *fifo, int Nalloc, int Nextra) {

trunk/Ohana/src/elixir/src/InitProcess.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 Process *InitProcess (char *name, Queue *pending, Queue *failure, int (*mkargs)()) {

trunk/Ohana/src/elixir/src/LoadPending.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 static struct timeval then = {0.0, 0.0};

trunk/Ohana/src/elixir/src/LogOpen.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 FILE *LogOpen (char *filename) {

trunk/Ohana/src/elixir/src/MachineOps.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 /* this is in libohana -> should be in ohana.h */

trunk/Ohana/src/elixir/src/MsgOps.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 int WaitMsg (char *fifo, char **message, double maxdelay) {

trunk/Ohana/src/elixir/src/Photcodes.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 char *GetPhotcode (char *file) {

trunk/Ohana/src/elixir/src/ProcessOps.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 /* take entry and return char with filled out value,

trunk/Ohana/src/elixir/src/QueueOps.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 /* get object from top of stack */

trunk/Ohana/src/elixir/src/RemoteOps.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 void HaltElixir (char *pidfile) {

trunk/Ohana/src/elixir/src/SockScan.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 # include <errno.h>
 # define MAXTIME 10

trunk/Ohana/src/elixir/src/StartMachine.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 int StartMachine (Machine *machine, Object *object, int argc, char **argv) {

trunk/Ohana/src/elixir/src/elixir.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 static int Dynamic;

trunk/Ohana/src/elixir/src/rconnect.c

@@ -1 @@
-# include "controller.h"
+# include "elixir.h"
 
 /* rconnect opens a remote shell on hostname and returns two file descriptors: