Fixed dependencies for parallel make
authorIsaac Dooley <idooley2@illinois.edu>
Thu, 21 Jun 2007 16:37:50 +0000 (16:37 +0000)
committerIsaac Dooley <idooley2@illinois.edu>
Thu, 21 Jun 2007 16:37:50 +0000 (16:37 +0000)
src/arch/net/charmrun/Makefile

index 1fe5f4f206ed1d7b663effdd5a36c6788a291920..a557746ddf0074bb52299b916ceb22746fa65a37 100644 (file)
@@ -7,22 +7,28 @@ INCLUDED=../conv-mach.h ../conv-mach-opt.h \
        ../ccs-server.c ../ccs-server.h ../ccs-auth.c ../ccs-auth.h \
        ../sockRoutines.c ../sockRoutines.h
 
-all: charmrun-silent charmd
-
-charmrun-silent: charmrun-notify
-
-charmrun-notify: charmrun.c $(INCLUDED)
-       $(CHARMC) -c -seq -DSILENT charmrun.c
-       $(CHARMC) -cp $(BIN) -seq -o charmrun-silent charmrun.o
-       $(CHARMC) -c -seq -DNOTIFY charmrun.c
-       $(CHARMC) -cp $(BIN) -seq -o charmrun-notify charmrun.o
+all: charmrun-silent charmrun-notify charmd charmd-faceless post-config
+
+charmrun-silent.o: charmrun.c $(INCLUDED)
+       $(CHARMC) -seq -DSILENT -c charmrun.c -o charmrun-silent.o
+charmrun-silent: charmrun-silent.o
+       $(CHARMC) -cp $(BIN) charmrun-silent.o -o charmrun-silent
+charmrun-notify.o: charmrun.c $(INCLUDED)
+       $(CHARMC) -seq -DNOTIFY -c charmrun.c -o charmrun-notify.o
+charmrun-notify: charmrun-notify.o
+       $(CHARMC) -cp $(BIN) charmrun-notify.o -o charmrun-notify
+post-config: charmrun-notify charmrun-silent
        (cd ..; CHARMINC=.; . ./conv-config.sh; cp ../bin/charmrun-notify$$CMK_POST_EXE ../bin/charmrun$$CMK_POST_EXE)
 
-charmd: charmd_faceless
+daemon.o: daemon.c daemon.h
+       $(CHARMC) -seq -c daemon.c -o daemon.o
+daemon-faceless.o: daemon.c daemon.h
+       $(CHARMC) -DFACELESS -c daemon.c -o daemon-faceless.o
 
-charmd_faceless: daemon.c daemon.h ../sockRoutines-seq.o
-       $(CHARMC) -cp $(BIN) -seq daemon.c ../sockRoutines-seq.o -o charmd
-       $(CHARMC) -cp $(BIN) -DFACELESS -seq daemon.c ../sockRoutines-seq.o -o charmd_faceless;
+charmd: daemon.o ../sockRoutines-seq.o
+       $(CHARMC) -cp $(BIN) -seq daemon.o ../sockRoutines-seq.o -o charmd
+charmd-faceless: daemon-faceless.o ../sockRoutines-seq.o
+       $(CHARMC) -cp $(BIN) daemon-faceless.o ../sockRoutines-seq.o -o charmd_faceless;
 
 clean:
        rm -f *.o charmrun charmrun-notify charmrun-silent