head	1.13;
access;
symbols
	charm6_1:1.13
	charm_6_0_1:1.13
	charm6_0_1:1.13
	charm6_0:1.10
	ChaNGa_1-0:1.8
	charm5_9:1.8
	charm_5-4-2:1.5
	charm_5-4-1:1.3;
locks; strict;
comment	@# @;


1.13
date	2009.02.10.02.40.36;	author gzheng;	state Exp;
branches;
next	1.12;
commitid	g7nuhH78FlCnIPBt;

1.12
date	2008.10.08.21.18.17;	author gzheng;	state Exp;
branches;
next	1.11;
commitid	4aw97uS3CyBGURlt;

1.11
date	2008.10.05.00.35.04;	author phil;	state Exp;
branches;
next	1.10;
commitid	plc2QD3yBlyx8nlt;

1.10
date	2007.06.21.21.25.23;	author idooley2;	state Exp;
branches;
next	1.9;
commitid	7f8b467aecb84567;

1.9
date	2007.06.21.16.37.50;	author idooley2;	state Exp;
branches;
next	1.8;
commitid	4b92467aa94c4567;

1.8
date	2003.11.05.05.00.51;	author gzheng;	state Exp;
branches;
next	1.7;

1.7
date	2003.10.29.21.46.31;	author gzheng;	state Exp;
branches;
next	1.6;

1.6
date	2001.08.23.17.00.35;	author olawlor;	state Exp;
branches;
next	1.5;

1.5
date	2001.05.01.03.51.19;	author gzheng;	state Exp;
branches;
next	1.4;

1.4
date	2001.04.23.02.59.36;	author gzheng;	state Exp;
branches;
next	1.3;

1.3
date	2000.12.26.19.31.07;	author gzheng;	state Exp;
branches;
next	1.2;

1.2
date	2000.12.24.22.25.59;	author gzheng;	state Exp;
branches;
next	1.1;

1.1
date	2000.12.02.05.33.51;	author olawlor;	state Exp;
branches;
next	;


desc
@@


1.13
log
@fixed the missing -seq which was left out in Phil's parallel make changes.
@
text
@BIN=../../bin
CHARMC=$(BIN)/charmc $(OPTS)

SHELL=/bin/sh

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-notify charmrun-silent charmd charmd_faceless

charmrun-silent: charmrun.c $(INCLUDED)
	$(CHARMC) -c -seq -DSILENT charmrun.c -o charmrun-silent.o
	$(CHARMC) -cp $(BIN) -seq -o charmrun-silent charmrun-silent.o

charmrun-notify: charmrun.c $(INCLUDED)
	$(CHARMC) -c -seq -DNOTIFY charmrun.c
	$(CHARMC) -cp $(BIN) -seq -o charmrun-notify charmrun.o
	(cd ..; CHARMINC=.; . ./conv-config.sh; cp ../bin/charmrun-notify$$CMK_POST_EXE ../bin/charmrun$$CMK_POST_EXE)

charmd: daemon.c daemon.h ../sockRoutines-seq.o
	$(CHARMC) -seq -c daemon.c -o daemon.o
	$(CHARMC) -cp $(BIN) -seq daemon.o ../sockRoutines-seq.o -o charmd

charmd_faceless: daemon.c daemon.h ../sockRoutines-seq.o
	$(CHARMC) -seq -DFACELESS -c daemon.c -o daemon-faceless.o
	$(CHARMC) -cp $(BIN) -seq -DFACELESS daemon-faceless.o ../sockRoutines-seq.o -o charmd_faceless;

clean:
	rm -f *.o charmrun charmrun-notify charmrun-silent
	rm -f charmd charmd_faceless
@


1.12
log
@changes to Phil's change:
1. make charm++ always compile charmd no matter what after Phil's change
2. charmrun-silent never gets compiled as it used to be
@
text
@d22 1
a22 1
	$(CHARMC) -c daemon.c -o daemon.o
d26 1
a26 1
	$(CHARMC) -DFACELESS -c daemon.c -o daemon-faceless.o
@


1.11
log
@Final changes to make './build all blah -j' succeed
@
text
@d10 1
a10 1
all: charmrun-notify charmd charmd_faceless
a14 1
	(cd ..; CHARMINC=.; . ./conv-config.sh; cp ../bin/charmrun-silent$$CMK_POST_EXE ../bin/charmrun$$CMK_POST_EXE)
d21 1
a21 1
charmd-both : daemon.c daemon.h ../sockRoutines-seq.o
a23 2
	$(CHARMC) -DFACELESS -c daemon.c -o daemon.o
	$(CHARMC) -cp $(BIN) -seq -DFACELESS daemon.o ../sockRoutines-seq.o -o charmd_faceless;
d25 3
a27 9
charmd: charmd-both
# charmd: daemon.c daemon.h ../sockRoutines-seq.o
# 	$(CHARMC) -c daemon.c -o daemon.o
# 	$(CHARMC) -cp $(BIN) -seq daemon.o ../sockRoutines-seq.o -o charmd

charmd_faceless: charmd-both
# charmd_faceless: daemon.c daemon.h ../sockRoutines-seq.o
# 	$(CHARMC) -DFACELESS -c daemon.c -o daemon-faceless.o
# 	$(CHARMC) -cp $(BIN) -seq -DFACELESS daemon-faceless.o ../sockRoutines-seq.o -o charmd_faceless;
@


1.10
log
@Reverting last change.
@
text
@d10 1
a10 1
all: charmrun-silent charmd
d12 4
a15 1
charmrun-silent: charmrun-notify
a17 2
	$(CHARMC) -c -seq -DSILENT charmrun.c
	$(CHARMC) -cp $(BIN) -seq -o charmrun-silent charmrun.o
d22 5
a26 1
charmd: charmd_faceless
d28 9
a36 3
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;
@


1.9
log
@Fixed dependencies for parallel make
@
text
@d10 1
a10 1
all: charmrun-silent charmrun-notify charmd charmd-faceless post-config
d12 7
a18 9
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
d21 1
a21 4
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
d23 3
a25 4
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;
@


1.8
log
@when copy charmrun-notify to charmrun, use CMK_POST_EXE in conv-mach.sh to append the filename in windows.
@
text
@d10 1
a10 1
all: charmrun-silent charmd
d12 9
a20 7
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
d23 4
a26 1
charmd: charmd_faceless
d28 4
a31 3
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;
@


1.7
log
@moved daemon.c daemon.h to charmrun.
also slightly modified charmrun to be able to start a converse VMI program.
@
text
@d19 1
a19 1
	if test "$$OSTYPE" = cygwin; then cp $(BIN)/charmrun-notify.exe $(BIN)/charmrun.exe; else cp $(BIN)/charmrun-notify $(BIN)/charmrun; fi
@


1.6
log
@Added "++usehostname" (send the node-programs charmrun's hostname
instead of hard IP) and "++server-auth" (enable CCS authentication).
Also updated for skt_ip_t IP addresses.
@
text
@d10 5
a14 1
$(BIN)/charmrun: charmrun.c $(INCLUDED)
d21 6
d29 1
@


1.5
log
@charmrun Makefile add conv-mach-opt.h dependence.
@
text
@d6 5
a10 1
$(BIN)/charmrun: charmrun.c ../conv-mach.h ../conv-mach-opt.h
@


1.4
log
@port Converse to GM library.
split part of machine.c to machine-gm.c and machine-eth.c
charmrun GM support;
@
text
@d6 1
a6 1
$(BIN)/charmrun: charmrun.c ../conv-mach.h
@


1.3
log
@changed SHELL definition.
@
text
@d6 1
a6 1
$(BIN)/charmrun: charmrun.c 
@


1.2
log
@add SHELL definition
@
text
@d4 1
a4 1
SHELL=sh
@


1.1
log
@Moved from Common.net/conv-host/
@
text
@d4 1
a4 1
all: $(BIN)/charmrun
d11 1
a11 1
	(if test "$$OSTYPE" = cygwin; then cp $(BIN)/charmrun-notify.exe $(BIN)/charmrun.exe; else cp $(BIN)/charmrun-notify $(BIN)/charmrun; fi)
@

