Commit fca49484 authored by Ryan Jackson's avatar Ryan Jackson

Fixed standalone Linux Makefile for frisbee to link in disksize.o from the imagezip tree.

Cleanup of both imagezip and frisbee makefiles.
parent b18f7ed5
......@@ -23,7 +23,7 @@ LINUXOPTS = -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE \
CLIENTFLAGS = $(CFLAGS)
CLIENTLIBS = -lz $(PTHREADLIBS)
CLIENTOBJS = client.o frisbee.o $(SHAREDOBJS)
CLIENTOBJS = client.o frisbee.o $(IMAGEZIPDIR)/disksize.o $(SHAREDOBJS)
SERVERFLAGS = $(CFLAGS)
SERVERLIBS = $(PTHREADLIBS)
......@@ -73,6 +73,8 @@ event.o: $(SRCDIR)/event.c decls.h log.h event.h
$(IMAGEZIPDIR)/imageunzip.c: $(IMAGEZIPDIR)/imagehdr.h $(IMAGEZIPDIR)/queue.h
$(IMAGEZIPDIR)/disksize.c: $(IMAGEZIPDIR)/imagehdr.h $(IMAGEZIPDIR)/queue.h
frisbee.o: $(IMAGEZIPDIR)/imageunzip.c
$(CC) -c $(CFLAGS) -DFRISBEE -I$(IMAGEZIPDIR) -o frisbee.o \
$(IMAGEZIPDIR)/imageunzip.c
......
......@@ -54,16 +54,16 @@ endif
all: imagezip imageunzip imagedump
imagezip: imagezip.o version.o $(FSOBJS) $(FSLIBS)
$(CC) $(CFLAGS) imagezip.o version.o $(FSOBJS) $(FSLIBS) $(LIBS) -o imagezip
$(CC) $(CFLAGS) $^ $(LIBS) -o imagezip
imageunzip: imageunzip.o crc.o version.o
$(CC) $(CFLAGS) imageunzip.o crc.o version.o $(UNZIPLIBS) -o imageunzip
imageunzip: imageunzip.o crc.o version.o disksize.o
$(CC) $(CFLAGS) $^ $(UNZIPLIBS) -o imageunzip
imageunzip.o: imageunzip.c
$(CC) -c $(UNZIPCFLAGS) -o imageunzip.o $<
imageunzip.o: imageunzip.c
$(CC) $(UNZIPCFLAGS) -o $@ -c $<
imagedump: imagedump.o version.o
$(CC) $(CFLAGS) imagedump.o version.o $(LIBS) -o imagedump
$(CC) $(CFLAGS) $^ $(LIBS) -o imagedump
version.c: imagezip.c imageunzip.c imagedump.c
echo >$@ "char build_info[] = \"Built `date +%d-%b-%Y` by `id -nu`@`hostname | sed 's/\..*//'`:`pwd`\";"
......
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