Commit 428a0eda authored by Mike Hibler's avatar Mike Hibler

Make the creation of the frisbee.o object the responsibility of the

frisbee.redux makefile, not the imagezip makefile.  Besides making
more sense, this ensure that all the frisbee client objects get built
with the same compiler (the imagezip/unzip code will be built with gcc30
if imagezip NTFS support is enabled)
parent 3d7a9cc4
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group. # Copyright (c) 2000-2003 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
...@@ -15,14 +15,16 @@ all: frisbee frisbeed ...@@ -15,14 +15,16 @@ all: frisbee frisbeed
include $(TESTBED_SRCDIR)/GNUmakerules include $(TESTBED_SRCDIR)/GNUmakerules
FRISBEEDIR = $(OBJDIR)/os/imagezip
SHAREDOBJS = log.o network.o trace.o utils.o SHAREDOBJS = log.o network.o trace.o utils.o
PTHREADCFLAGS = -D_THREAD_SAFE \ PTHREADCFLAGS = -D_THREAD_SAFE \
-I/usr/local/include/pthread/linuxthreads -I/usr/local/include/pthread/linuxthreads
PTHREADLIBS = -L/usr/local/lib -llthread -llgcc_r PTHREADLIBS = -L/usr/local/lib -llthread -llgcc_r
CLIENTFLAGS = $(CFLAGS) CLIENTFLAGS = $(CFLAGS)
CLIENTLIBS = ../imagezip/frisbee.o -lz $(PTHREADLIBS) CLIENTLIBS = -lz $(PTHREADLIBS)
CLIENTOBJS = client.o $(SHAREDOBJS) CLIENTOBJS = client.o frisbee.o $(SHAREDOBJS)
SERVERFLAGS = $(CFLAGS) SERVERFLAGS = $(CFLAGS)
SERVERLIBS = $(PTHREADLIBS) SERVERLIBS = $(PTHREADLIBS)
...@@ -40,7 +42,7 @@ LDFLAGS = -static ...@@ -40,7 +42,7 @@ LDFLAGS = -static
#CLIENTLIBS += `elvin-config --libs vin4c` #CLIENTLIBS += `elvin-config --libs vin4c`
#EVENTFLAGS = $(CFLAGS) `elvin-config --cflags vin4c` -I$(TESTBED_SRCDIR) #EVENTFLAGS = $(CFLAGS) `elvin-config --cflags vin4c` -I$(TESTBED_SRCDIR)
frisbee: $(CLIENTOBJS) ../imagezip/frisbee.o frisbee: $(CLIENTOBJS)
$(CC) $(LDFLAGS) $(CLIENTFLAGS) $(CLIENTOBJS) $(CLIENTLIBS) -o frisbee $(CC) $(LDFLAGS) $(CLIENTFLAGS) $(CLIENTOBJS) $(CLIENTLIBS) -o frisbee
cp frisbee frisbee.debug cp frisbee frisbee.debug
strip frisbee strip frisbee
...@@ -54,6 +56,11 @@ frisbeed: $(SERVEROBJS) ...@@ -54,6 +56,11 @@ frisbeed: $(SERVEROBJS)
event.o: $(SRCDIR)/event.c decls.h log.h event.h event.o: $(SRCDIR)/event.c decls.h log.h event.h
$(CC) $(EVENTFLAGS) -c $(SRCDIR)/event.c $(CC) $(EVENTFLAGS) -c $(SRCDIR)/event.c
$(FRISBEEDIR)/imageunzip.c: $(FRISBEEDIR)/imagehdr.h $(FRISBEEDIR)/queue.h
frisbee.o: $(FRISBEEDIR)/imageunzip.c
$(CC) -c $(CFLAGS) -DFRISBEE -I$(FRISBEEDIR) -o frisbee.o $<
client.o: decls.h log.h trace.h client.o: decls.h log.h trace.h
server.o: decls.h log.h trace.h server.o: decls.h log.h trace.h
log.o: decls.h log.h log.o: decls.h log.h
......
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group. # Copyright (c) 2000-2003 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
...@@ -33,7 +33,7 @@ LIBS += -Lntfs -lntfs ...@@ -33,7 +33,7 @@ LIBS += -Lntfs -lntfs
NTFSDIR = ntfs NTFSDIR = ntfs
endif endif
all: imagezip imageunzip imagedump frisbee.o all: imagezip imageunzip imagedump
include $(TESTBED_SRCDIR)/GNUmakerules include $(TESTBED_SRCDIR)/GNUmakerules
...@@ -49,9 +49,6 @@ imageunzip.o: imageunzip.c ...@@ -49,9 +49,6 @@ imageunzip.o: imageunzip.c
imagedump: imagedump.o version.o imagedump: imagedump.o version.o
$(CC) $(CFLAGS) imagedump.o version.o $(LIBS) -o imagedump $(CC) $(CFLAGS) imagedump.o version.o $(LIBS) -o imagedump
frisbee.o: imageunzip.c
$(CC) -c $(UNZIPCFLAGS) -DFRISBEE -o frisbee.o $<
ntfs: ntfs:
@$(MAKE) -C ntfs all @$(MAKE) -C ntfs all
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment