Changeset 2498

Timestamp:

Nov 26, 2004, 9:56:13 AM (22 years ago)

Author:

eugene

Message:

cleaned make rules

File:

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

trunk/Ohana/Makefile

@@ -34 +34 @@
 addstar    \
 delstar    \
-dvo        \
 elixir     \
 gastro     \
@@ -45 +44 @@
 kii        \
 misc       \
-mosastro   \
+mosastro.v2 \
 nightd     \
 perl       \
 photdbc    \
+relphot    \
 shell      \
 tcl        \
 uniphot
 
-SKIP = getusno markrock markstar 
+# dvo        \
+# need to fix up typecode,typename static vars in imregister
+# need to be sure the default make is correctly define for every package
+# drop shell1 from cvs
+
+SKIP = addusno fixcat getstar getusno lightcurve markrock markstar mosastro.v1 skycalc skyprobe
 
 OLD = mana status 
@@ -62 +67 @@
 
 # general build targets:
-links:
-        for i in $(PROGRAM) $(LIBS-$(ARCH)); do (cd src/$$i; ln -sf ../../Configure .); done
-
 libs:
         mkdir -p lib/$(ARCH)
@@ -73 +75 @@
 
 all:
-        for i in $(LIBS-$(ARCH)); do make $$i.install; done
+        for i in $(LIBS-$(ARCH)); do make $$i.install || exit; done
         for i in $(PROGRAM); do make $$i || exit; done
         for i in $(EXTRA); do make $$i || exit; done
 
 clean:
-        for i in $(LIBS-$(ARCH)); do make $$i.clean; done
-        for i in $(PROGRAM); do make $$i.clean; done
+        for i in $(LIBS-$(ARCH)); do make $$i.clean || exit; done
+        for i in $(PROGRAM); do make $$i.clean || exit; done
 
 dist:
-        for i in $(LIBS-$(ARCH)); do make $$i.dist; done
-        for i in $(PROGRAM); do make $$i.dist; done
+        for i in $(LIBS-$(ARCH)); do make $$i.dist || exit; done
+        for i in $(PROGRAM); do make $$i.dist || exit; done
 
 install:
-        for i in $(LIBS-$(ARCH)); do make $$i.install; done
-        for i in $(PROGRAM); do make $$i.install; done
+        for i in $(LIBS-$(ARCH)); do make $$i.install || exit; done
+        for i in $(PROGRAM); do make $$i.install || exit; done
 
 # standard rules: targets are foo, foo.clean, foo.install, foo.dist
 $(PROGRAM) $(LIBS-$(ARCH)): 
-        (cd src/$@; make $@)
+        (cd src/$@ && make)
 
 %.install: