diff -r 487cbfbafa2c -r b31db3248246 Makefile --- a/Makefile Fri Sep 19 01:04:41 2008 +0300 +++ b/Makefile Thu Sep 25 15:03:09 2008 +0300 @@ -1,16 +1,18 @@ -LIBEVENT_PATH = libs/libevent -LIBFUSE_PATH = libs/libfuse +LIBEVENT_PATH = ../libs/libevent-dev +LIBFUSE_PATH = ../libs/libfuse-2.7.4 LIBRARY_PATHS = -L${LIBEVENT_PATH}/lib -L${LIBFUSE_PATH}/lib INCLUDE_PATHS = -I${LIBEVENT_PATH}/include -I${LIBFUSE_PATH}/include -LDLIBS = -levent +LDLIBS = -levent -lfuse -DEFINES = +# XXX: ugh... use `pkg-config fuse` +DEFINES = -D_FILE_OFFSET_BITS=64 MY_CFLAGS = -Wall -g -std=gnu99 -BIN_NAMES = helloworld +BIN_NAMES = hello helloworld -bin/helloworld: obj/helloworld.o +bin/helloworld: +bin/hello: obj/evfuse.o obj/lib/common.o # computed LDFLAGS = ${LIBRARY_PATHS} ${LIBRARY_LIST} @@ -18,6 +20,7 @@ SRC_PATHS = $(wildcard src/*.c) SRC_NAMES = $(patsubst src/%,%,$(SRC_PATHS)) +SRC_DIRS = $(dir $(SRC_NAMES)) BIN_PATHS = $(addprefix bin/,$(BIN_NAMES)) @@ -32,10 +35,13 @@ makedepend -p../obj/ -Y -- $(CFLAGS) -- $(SRC_NAMES) 2> /dev/null cd .. +obj-dirs: + python build/make_obj_dirs.py $(BIN_PATHS) + obj/%.o : src/%.c - $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ + $(CC) -c $(CPPFLAGS) $(CFLAGS) $^ -o $@ bin/% : obj/%.o - $(CC) $(LDFLAGS) $< $(LOADLIBES) $(LDLIBS) -o $@ + $(CC) $(LDFLAGS) $+ $(LOADLIBES) $(LDLIBS) -o $@ # DO NOT DELETE THIS LINE -- make depend depends on it.