Changeset 3508 for trunk/Ohana/src/libohana/Makefile

Timestamp:

Mar 24, 2005, 4:50:29 PM (21 years ago)

Author:

eugene

Message:

includes cleanup, adding autocode stuff, fits_db

File:

• trunk/Ohana/src/libohana/Makefile (modified) (4 diffs)

trunk/Ohana/src/libohana/Makefile

@@ -6 +6 @@
 MAN     =       $(HOME)/doc
 INC     =       $(HOME)/include
+DVO     =       $(HOME)/dvo/src
 DESTBIN =       $(LBIN)
 DESTLIB =       $(LLIB)
@@ -30 +31 @@
 
 LOBJ = \
-$(SRC)/string.$(ARCH).o         $(SRC)/findexec.$(ARCH).o        \
-$(SRC)/config.$(ARCH).o         $(SRC)/coordops.$(ARCH).o        \
-$(SRC)/Fread.$(ARCH).o          $(SRC)/glockfile.$(ARCH).o       \
-$(SRC)/LoadPhotcodes.$(ARCH).o  $(SRC)/photfits.$(ARCH).o        \
-$(SRC)/phot_catalog.$(ARCH).o   $(SRC)/imreg_datatypes.$(ARCH).o \
-$(SRC)/mosaic_astrom.$(ARCH).o
+$(SRC)/string.$(ARCH).o          \
+$(SRC)/findexec.$(ARCH).o        \
+$(SRC)/glockfile.$(ARCH).o       \
+$(SRC)/config.$(ARCH).o          \
+$(SRC)/coordops.$(ARCH).o        \
+$(SRC)/Fread.$(ARCH).o           \
+$(SRC)/Fseek.$(ARCH).o           \
+$(SRC)/LoadPhotcodes.$(ARCH).o   \
+$(SRC)/photfits.$(ARCH).o        \
+$(SRC)/phot_catalog.$(ARCH).o    \
+$(SRC)/imreg_datatypes.$(ARCH).o \
+$(SRC)/mosaic_astrom.$(ARCH).o   \
+$(SRC)/fits_db.$(ARCH).o         
+
+DOBJ = \
+$(DVO)/spectrum.$(ARCH).o \
+$(DVO)/spectrum-ascii.$(ARCH).o
 
 $(DESTLIB)/libohana.a: $(LIB)/libohana.$(ARCH).a
@@ -43 +55 @@
 
 $(LIB)/libohana.$(ARCH).a: $(HOBJ) $(LOBJ)
+        cd dvo && make install
         @if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
         rm -f $(LIB)/libohana.$(ARCH).a
-        ar rcv $(LIB)/libohana.$(ARCH).a $(LOBJ)
+        ar rcv $(LIB)/libohana.$(ARCH).a $(LOBJ) $(DOBJ)
         $(RANLIB) $(LIB)/libohana.$(ARCH).a
 
@@ -60 +73 @@
         rm -f */*.o
         rm -f */*.a
+        cd dvo && make clean
 
 dist: clean