X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=fa9d6f6c1a36cbb6755c93e853a890dd60cfa8dc;hb=3ebe1efb5570c4a678774ebdf33b36be6dc49bbc;hp=7f5b123f4678d2594eefa3768562c450add800d9;hpb=8819789ef2264b26aebfae489932a447f6e0f65f;p=bluesky.git

diff --git a/Makefile b/Makefile
index 7f5b123..fa9d6f6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,15 @@
+LIBS3_PATH=$(HOME)/scratch/libs3-1.4/build
 PACKAGES=glib-2.0 gthread-2.0
 DEBUG=-g
-CFLAGS=-O -Wall -D_FILE_OFFSET_BITS=64 $(DEBUG) \
+CFLAGS=-O -std=gnu99 -Wall -D_FILE_OFFSET_BITS=64 $(DEBUG) \
+	$(shell pkg-config --cflags $(PACKAGES))
+CXXFLAGS=-O -Wall -D_FILE_OFFSET_BITS=64 $(DEBUG) \
 	$(shell pkg-config --cflags $(PACKAGES))
 LDFLAGS=$(DEBUG) $(shell pkg-config --libs $(PACKAGES))
 SUBDIRS=nfs3
 
-SRCS=dir.c inode.c
-OBJS=$(SRCS:.c=.o)
+SRCS=dir.c inode.c store.c
+OBJS=$(SRCS:.c=.o) s3store.o
 
 all : bluesky
 	for d in $(SUBDIRS); do $(MAKE) -C $$d; done
@@ -16,10 +19,11 @@ bluesky.a : $(OBJS)
 	ranlib $@
 
 bluesky : main.o bluesky.a
-	$(CC) $(LDFLAGS) -o $@ $^
+	$(CXX) $(LDFLAGS) -o $@ $^ -Wl,-rpath=$(LIBS3_PATH)/lib -L$(LIBS3_PATH)/lib -ls3
 
 clean :
 	rm -f $(OBJS) bluesky
+	for d in $(SUBDIRS); do $(MAKE) -C $$d clean; done
 
 dep :
 	touch Makefile.dep