Changeset 10368

Timestamp:

Nov 30, 2006, 10:10:07 PM (20 years ago)

Author:

eugene

Message:

fixed dependencies

Location:

trunk/Ohana

Files:

• configure (modified) (1 diff)
• src/libautocode/Makefile (modified) (1 diff)
• src/libdvo/Makefile (modified) (1 diff)
• src/libfits/Makefile (modified) (1 diff)
• src/libkapa/Makefile (modified) (1 diff)
• src/libohana/Makefile (modified) (1 diff)
• src/libtap/Makefile (modified) (1 diff)

trunk/Ohana/configure

@@ -241 +241 @@
 if ("$bindir" == "") then
   set subdir = bin
+  set subpath = bin
   if ($vararch) then 
     set subdir = 'bin/$(ARCH)'

trunk/Ohana/src/libautocode/Makefile

@@ -39 +39 @@
 $(LIB)/libautocode.$(ARCH).so: $(AOBJS)
 
+$(DESTLIB)/libautocode.a:  $(LIB)/libautocode.$(ARCH).a
+$(DESTLIB)/libautocode.so: $(LIB)/libautocode.$(ARCH).so
+
 $(AOBJS): $(INC)/autocode.h
 

trunk/Ohana/src/libdvo/Makefile

@@ -49 +49 @@
 include ../libautocode/Makefile.Targets
 
-$(LIB)/libdvo.$(ARCH).a: $(AOBJS) $(OBJS)
+$(OBJS): $(INCS)
+$(AOBJS): $(ADEF)/autocode.c $(ADEF)/autocode.h $(AINC)/autocode.h
+
+$(AINC)/autocode.h: $(AINCS)
+
+$(DESTINC)/autocode.h: $(AINC)/autocode.h
+        @if [ ! -d $(DESTINC) ]; then mkdir -p $(DESTINC); fi
+        rm -f $@
+        cp $< $@
+
+bar: $(DESTINC)/autocode.h
+
+foo:
+        @echo $(DESTINC)/autocode.h
+        @echo $(AINC)/autocode.h
+        @echo $(AINCS)
+
+$(LIB)/libdvo.$(ARCH).a:  $(AOBJS) $(OBJS)
 $(LIB)/libdvo.$(ARCH).so: $(AOBJS) $(OBJS)
 
-$(AOBJS): $(ADEF)/autocode.c $(ADEF)/autocode.h $(AINC)/autocode.h
+$(DESTLIB)/libdvo.a:  $(LIB)/libdvo.$(ARCH).a
+$(DESTLIB)/libdvo.so: $(LIB)/libdvo.$(ARCH).so
 
 $(ASRC)/%.$(ARCH).o : $(ADEF)/%.d

trunk/Ohana/src/libfits/Makefile

@@ -54 +54 @@
 
 $(OBJS): $(INCS)
+
 $(LIB)/libFITS.$(ARCH).a: $(OBJS)
 $(LIB)/libFITS.$(ARCH).so: $(OBJS)
+
+$(DESTLIB)/libFITS.a:  $(LIB)/libFITS.$(ARCH).a
+$(DESTLIB)/libFITS.so: $(LIB)/libFITS.$(ARCH).so

trunk/Ohana/src/libkapa/Makefile

@@ -40 +40 @@
 $(LIB)/libkapa.$(ARCH).a: $(OBJS) $(DRAW)
 $(LIB)/libkapa.$(ARCH).so: $(OBJS) $(DRAW)
+
+$(DESTLIB)/libkapa.a:  $(LIB)/libkapa.$(ARCH).a  
+$(DESTLIB)/libkapa.so: $(LIB)/libkapa.$(ARCH).so

trunk/Ohana/src/libohana/Makefile

@@ -46 +46 @@
 
 $(OBJS): $(INCS)
+
 $(LIB)/libohana.$(ARCH).a: $(OBJS)
 $(LIB)/libohana.$(ARCH).so: $(OBJS)
+
+$(DESTLIB)/libohana.a:  $(LIB)/libohana.$(ARCH).a
+$(DESTLIB)/libohana.so: $(LIB)/libohana.$(ARCH).so
 
 $(TESTDIR)/%.$(ARCH) : $(TESTDIR)/%.c

trunk/Ohana/src/libtap/Makefile

@@ -18 +18 @@
 
 INCS = $(DESTINC)/tap_ohana.h
-
 TAP = $(SRC)/tap_ohana.$(ARCH).o
 
 $(TAP): $(INCS)
+
 $(LIB)/libtap_ohana.$(ARCH).a: $(TAP)
 $(LIB)/libtap_ohana.$(ARCH).so: $(TAP)
 
+$(DESTLIB)/libtap_ohana.a:  $(LIB)/libtap_ohana.$(ARCH).a
+$(DESTLIB)/libtap_ohana.so: $(LIB)/libtap_ohana.$(ARCH).so
+
 # libtap tests are currently not compiled or run