fbt/lemonbar
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixup for rebase.

Browse Source
This commit is contained in:
John Vogel 2014-02-11 23:20:03 -05:00
parent 7f28ae9c79
commit 74ce792202
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -1,11 +1,7 @@
CC ?= gcc CC ?= gcc
STRIP ?= strip STRIP ?= strip
CFLAGS = -std=c99 -O2 CFLAGS = -std=c99 -O2
<<<<<<< HEAD
LDFLAGS = -lxcb -lxcb-xinerama
=======
LDFLAGS = -lxcb -lxcb-xinerama -lxcb-randr LDFLAGS = -lxcb -lxcb-xinerama -lxcb-randr
>>>>>>> 59fb6c5... Ported randr code to wip branch, plus some fixes.
CFDEBUG = -g3 -pedantic -Wall -Wunused-parameter -Wlong-long\ CFDEBUG = -g3 -pedantic -Wall -Wunused-parameter -Wlong-long\
-Wsign-conversion -Wconversion -Wimplicit-function-declaration -Wsign-conversion -Wconversion -Wimplicit-function-declaration
@ -35,14 +31,9 @@ debug: ${EXEC}
debug: CC += ${CFDEBUG} debug: CC += ${CFDEBUG}
clean: clean:
<<<<<<< HEAD
rm -rf ./*.o
rm -rf ./${EXEC}
=======
rm -f ./config.h rm -f ./config.h
rm -f ./*.o rm -f ./*.o
rm -f ./${EXEC} rm -f ./${EXEC}
>>>>>>> 59fb6c5... Ported randr code to wip branch, plus some fixes.
install: bar install: bar
test -d ${DESTDIR}${BINDIR} || mkdir -p ${DESTDIR}${BINDIR} test -d ${DESTDIR}${BINDIR} || mkdir -p ${DESTDIR}${BINDIR}