Changeset 2615

Timestamp:

Dec 3, 2004, 1:56:21 PM (22 years ago)

Author:

eugene

Message:

fixed makefile bits

Location:

trunk/Ohana

Files:

• Makefile (modified) (3 diffs)
• src/opihi/Makefile (modified) (2 diffs)

trunk/Ohana/Makefile

@@ -51 +51 @@
 
 # any of these programs can be built with 'make (name)' 
-OTHER =     \
+EXTRAS =     \
 opihi.v2    \
 addusno     \
@@ -80 +80 @@
 
 all:
-        for i in $(LIBS-$(ARCH)); do make $$i.install || exit; done
+        make libs || exit
         for i in $(PROGRAM); do make $$i || exit; done
-        for i in $(EXTRA); do make $$i || exit; done
+
+extras:
+        for i in $(EXTRAS); do make $$i || exit; done
 
 clean:
         for i in $(LIBS-$(ARCH)); do make $$i.clean || exit; done
         for i in $(PROGRAM); do make $$i.clean || exit; done
+        for i in $(EXTRAS); do make $$i.clean || exit; done
 
 dist:
@@ -96 +99 @@
         for i in $(PROGRAM); do make $$i.install || exit; done
 
+install.extras:
+        for i in $(EXTRAS); do make $$i.install || exit; done
+
 # standard rules: targets are foo, foo.clean, foo.install, foo.dist
-$(PROGRAM) $(LIBS-$(ARCH)) $(OTHER): 
+$(PROGRAM) $(LIBS-$(ARCH)) $(EXTRAS): 
         if [ -e "src/$@" ]; then (cd src/$@ && make); fi
 

trunk/Ohana/src/opihi/Makefile

@@ -14 +14 @@
 LIBS = cmd.basic cmd.data cmd.astro lib.data lib.shell
 
-PROGRAM = mana dvo dvo2 sched dimm 
+PROGRAM = mana dvo
+
+EXTRAS = dvo2 sched dimm
 
 all:
         for i in $(PROGRAM); do make $$i || exit; done
+
+extras:
+        for i in $(EXTRAS); do make $$i || exit; done
 
 install:
@@ -27 +32 @@
 #############################################################
 
-$(PROGRAM) $(LIBS):
+$(PROGRAM) $(LIBS) $(EXTRAS):
         if [ -e "$@" ]; then (cd $@ && make); fi