mirrors/wmii
1
0
Fork 0
mirror of https://github.com/0intro/wmii synced 2024-11-22 05:42:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use pkg-config globally.

Browse Source
This commit is contained in:
Kris Maglione 2009-05-21 14:22:58 -04:00
parent 65f7040f2c
commit dd5f800f0e
7 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/Makefile
View File

@ -37,5 +37,5 @@ wmii/x11.o wmii/map.o: dall
O9MENU=wmii9menu.o clientutil.o wmii/x11.o wmii/map.o $(OFILES) $(LIBIXP)
wmii9menu.O: $(O9MENU)
$(LINK) $@ $(O9MENU) $(LIBX11) -lXext -lbio
$(LINK) $@ $(O9MENU) $$(pkg-config --libs $(X11PACKAGES)) -lXext -lbio

9
cmd/click/Makefile
View File

@ -7,10 +7,11 @@ main.c: ${ROOT}/mk/wmii.mk
TARG = click
HFILES= dat.h fns.h
LIB = ${LIBIXP}
LDFLAGS += -lm ${LIBX11} -lXext -lXtst -lregexp9 -lbio -lfmt -lutf
CFLAGS += ${INCX11} -DVERSION=\"${VERSION}\" \
-DIXP_NEEDAPI=86
PACKAGES += $(X11PACKAGES) xext xrandr xrender xinerama
LIB = $(LIBIXP)
LDFLAGS += -lm -lXtst -lregexp9 -lbio -lfmt -lutf
CFLAGS += -DVERSION=\"$(VERSION)\" -DIXP_NEEDAPI=86
OBJ = main \
_util \
../wmii/map \

8
cmd/menu/Makefile
View File

@ -12,11 +12,11 @@ bindings.c: keys.txt Makefile
TARG = wimenu
HFILES= dat.h fns.h
PACKAGES += $(X11PACKAGES) xext xrandr xrender xinerama
LIB = $(LIBIXP)
LDFLAGS += -lm $(LIBX11) -lXext -lXrandr -LXrender -lXinerama \
-lregexp9 -lbio -lfmt -lutf
CFLAGS += $(INCX11) -DVERSION=\"$(VERSION)\" \
-DIXP_NEEDAPI=86
LDFLAGS += -lm -lregexp9 -lbio -lfmt -lutf
CFLAGS += -DVERSION=\"$(VERSION)\" -DIXP_NEEDAPI=86
OBJ = main \
caret \
history \

9
cmd/strut/Makefile
View File

@ -7,10 +7,11 @@ main.c: ${ROOT}/mk/wmii.mk
TARG = wistrut
HFILES= dat.h fns.h
LIB = ${LIBIXP}
LDFLAGS += -lm ${LIBX11} -lXext -lXrandr -lregexp9 -lbio -lfmt -lutf
CFLAGS += ${INCX11} -DVERSION=\"${VERSION}\" \
-DIXP_NEEDAPI=86
PACKAGES += $(X11PACKAGES) xext xrandr xinerama
LIB = $(LIBIXP)
LDFLAGS += -lm -lregexp9 -lbio -lfmt -lutf
CFLAGS += -DVERSION=\"$(VERSION)\" -DIXP_NEEDAPI=86
OBJ = main \
event \
ewmh \

9
cmd/wmii/Makefile
View File

@ -7,11 +7,12 @@ main.c: $(ROOT)/mk/wmii.mk
TARG = wmii
HFILES= dat.h fns.h
LIB = $(LIBIXP)
LDFLAGS += -lm $(LIBX11) -lXext -lXrandr -lXrender -lXinerama \
$(LIBICONV) -lregexp9 -lbio -lfmt -lutf
PACKAGES += $(X11PACKAGES) xext xrandr xrender xinerama
CFLAGS += $(INCX11) $(INCICONV) -DVERSION=\"$(VERSION)\" \
LIB = $(LIBIXP)
LDFLAGS += -lm $(LIBICONV) -lregexp9 -lbio -lfmt -lutf
CFLAGS += $(INCICONV) -DVERSION=\"$(VERSION)\" \
-DIXP_NEEDAPI=97
OBJ = area \
bar \

4
config.mk
View File

@ -33,8 +33,8 @@ P9PATHS = ${PLAN9}:"'$${HOME}/plan9'":/usr/local/plan9:/usr/local/9:/opt/plan9:/
# are painfully slow, and should be avoided.
#BINSH = /bin/ash
INCX11 = $$(pkg-config --cflags xft)
LIBX11 = $$(pkg-config --libs xft)
X11PACKAGES = xft
INCX11 = $$(pkg-config --cflags $(X11PACKAGES))
LIBICONV = # Leave blank if your libc includes iconv (glibc does)
LIBIXP = $(LIBDIR)/libixp.a

10
mk/hdr.mk
View File

@ -1,12 +1,14 @@
FILTER = cat
EXCFLAGS = -I$$(echo $(INCPATH)|sed 's/:/ -I/g') -D_XOPEN_SOURCE=600
COMPILE= CC="$(CC)" CFLAGS="$(EXCFLAGS) $(CFLAGS)" $(ROOT)/util/compile
COMPILEPIC= CC="$(CC)" CFLAGS="$(EXCFLAGS) $(CFLAGS) $(SOCFLAGS)" $(ROOT)/util/compile
LINK= LD="$(LD)" LDFLAGS="$(LDFLAGS)" $(ROOT)/util/link
LINKSO= LD="$(LD)" LDFLAGS="$(SOLDFLAGS) $(SHARED)" $(ROOT)/util/link
COMPILE= CC="$(CC)" CFLAGS="$(EXCFLAGS) $(CFLAGS) $$(pkg-config --cflags $(PACKAGES))" $(ROOT)/util/compile
COMPILEPIC= CC="$(CC)" CFLAGS="$(EXCFLAGS) $(CFLAGS) $$(pkg-config --cflags $(PACKAGES)) $(SOCFLAGS)" $(ROOT)/util/compile
LINK= LD="$(LD)" LDFLAGS="$(LDFLAGS) $$(pkg-config --libs $(PACKAGES))" $(ROOT)/util/link
LINKSO= LD="$(LD)" LDFLAGS="$(SOLDFLAGS) $(SHARED) $$(pkg-config --libs $(PACKAGES))" $(ROOT)/util/link
CLEANNAME=$(ROOT)/util/cleanname
SOEXT=so
PACKAGES = 2>/dev/null
include $(ROOT)/config.mk
# I hate this.