diff options
author | Mason Larobina <mason.larobina@gmail.com> | 2010-03-08 16:52:02 +0800 |
---|---|---|
committer | Mason Larobina <mason.larobina@gmail.com> | 2010-03-08 16:52:02 +0800 |
commit | 3413c04c98b81eec98a292485b4f5c7913af61ee (patch) | |
tree | 324615a2bfbf5a016f91e1cfc47e4e565dbc2fec /Makefile | |
parent | 930e69732ebb35bd862d33065befaa918229ffb9 (diff) | |
parent | 86bfb8f9dd916d1b604145d29cd7f1b5675c4415 (diff) |
Merge branch 'experimental' of git://github.com/niamster/uzbl into experimental
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 19 |
1 files changed, 9 insertions, 10 deletions
@@ -8,32 +8,31 @@ LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -p SRC = $(wildcard src/*.c) HEAD = $(wildcard src/*.h) -TOBJ = $(SRC:.c=.o) -OBJ = $(foreach obj, $(TOBJ), $(notdir $(obj))) +OBJ = $(foreach obj, $(SRC:.c=.o), $(notdir $(obj))) all: uzbl-browser options options: @echo - @echo BUILD OPTIONS: + @echo "BUILD OPTIONS:" @echo "CFLAGS = ${CFLAGS}" @echo "LDFLAGS = ${LDFLAGS}" @echo @echo See the README file for usage instructions. +VPATH:=src .c.o: - @echo COMPILING $< + @echo -n "COMPILING $<" @${CC} -c ${CFLAGS} $< - @echo ... done. + @echo " ... done." ${OBJ}: ${HEAD} -uzbl-core: ${TOBJ} # why doesn't ${OBJ} work? - @echo - @echo LINKING object files +uzbl-core: ${OBJ} + @echo -n "LINKING object files" @${CC} -o $@ ${OBJ} ${LDFLAGS} - @echo ... done. + @echo " ... done." uzbl-browser: uzbl-core @@ -50,7 +49,7 @@ RUN_PREFIX?=$(PREFIX) force: # When compiling unit tests, compile uzbl as a library first -tests: ${TOBJ} force +tests: ${OBJ} force $(CC) -shared -Wl ${OBJ} -o ./tests/libuzbl-core.so cd ./tests/; $(MAKE) |