Index: /trunk/Ohana/src/addstar/Makefile
===================================================================
--- /trunk/Ohana/src/addstar/Makefile	(revision 5268)
+++ /trunk/Ohana/src/addstar/Makefile	(revision 5269)
@@ -9,4 +9,6 @@
 INC	= 	$(HOME)/include
 SRC	=	$(HOME)/src
+DEF	=	$(HOME)/def
+DFS	=	$(HOME)/dfs
 MAN	=	$(HOME)/doc
 DESTBIN	=	$(LBIN)
@@ -84,12 +86,51 @@
 $(SRC)/match_refstars.$(ARCH).o \
 
+SERVER = \
+$(SRC)/SocketOps.$(ARCH).o \
+$(SRC)/IOBufferOps.$(ARCH).o \
+$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/args_server.$(ARCH).o \
+$(SRC)/CheckPassword.$(ARCH).o \
+$(SRC)/NewImage.$(ARCH).o \
+$(SRC)/CommOps.$(ARCH).o
+
+CLIENT = \
+$(SRC)/SocketOps.$(ARCH).o \
+$(SRC)/IOBufferOps.$(ARCH).o \
+$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/args_client.$(ARCH).o \
+$(SRC)/CommOps.$(ARCH).o
+
 default: $(PROGRAM)
+
+COMMOBJ = \
+$(DFS)/AddstarClientOptions.$(ARCH).o \
+$(DFS)/Stars.$(ARCH).o
+
+COMMINC = \
+$(DFS)/AddstarClientOptions.h \
+$(DFS)/Stars.h
+
+autocode: $(COMMOBJ)
+
+ADDSTARC = $(SRC)/addstarc.$(ARCH).o $(CLIENT) $(COMMOBJ)
+ADDSTARD = $(SRC)/addstard.$(ARCH).o $(SERVER) $(COMMOBJ)
+
+$(ADDSTARC) : $(INC)/addstar.h
+$(ADDSTARD) : $(INC)/addstar.h
+$(ADDSTAR)  : $(INC)/addstar.h
+
+$(INC)/addstar.h       : $(INC)/commcode.h
 
 addstar                : $(BIN)/addstar.$(ARCH)
 $(BIN)/addstar.$(ARCH) : $(ADDSTAR)
-# $(ADDSTAR): $(INC)/addstar.h
 
-gztest                : $(BIN)/gztest.$(ARCH)
-$(BIN)/gztest.$(ARCH) : $(SRC)/gztest.$(ARCH).o
+addstard                : $(BIN)/addstard.$(ARCH)
+$(BIN)/addstard.$(ARCH) : $(SRC)/addstard.$(ARCH).o $(SERVER) $(COMMOBJ)
+
+addstarc                : $(BIN)/addstarc.$(ARCH)
+$(BIN)/addstarc.$(ARCH) : $(ADDSTARC)
+
+gztest                  : $(BIN)/gztest.$(ARCH)
 
 mkacc-2mass                : $(BIN)/mkacc-2mass.$(ARCH)
@@ -109,4 +150,18 @@
 	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
 	$(CC) $^ -o $@ $(LFLAGS)
+
+$(INC)/commcode.h: $(COMMINC)
+	cat $(DEF)/common.h >  $(INC)/commcode.h
+	cat $(COMMINC)      >> $(INC)/commcode.h
+	@echo "# endif"     >> $(INC)/commcode.h
+	@echo done with commcode.h
+
+$(DFS)/%.c: $(DEF)/%.d $(DEF)/commcode.c $(INC)/commcode.h
+	@if [ ! -d $(DFS) ]; then mkdir -p $(DFS); fi
+	generate $< $(DEF)/commcode.c $@
+
+$(DFS)/%.h: $(DEF)/%.d $(DEF)/commcode.h
+	@if [ ! -d $(DFS) ]; then mkdir -p $(DFS); fi
+	generate $< $(DEF)/commcode.h $@
 
 $(DESTBIN)/%: $(BIN)/%.$(ARCH)
@@ -133,2 +188,5 @@
 	rm -f `find . -name "*~"`
 	rm -f `find . -name "#*"`
+	rm -f $(DFS)/*.h
+	rm -f $(DFS)/*.c
+	rm -f $(INC)/commcode.h