commit ffbdce0

Michael Forney  ·  2014-11-01 21:07:34 +0000 UTC
parent 2b04296 
swc.pc: Properly set Requires{,.private}
2 files changed,  +7, -10
M Makefile
M swc.pc.in
M Makefile
+5, -7 
 1@@ -103,14 +103,12 @@ $(foreach dir,BIN LIB INCLUDE PKGCONFIG,$(DESTDIR)$($(dir)DIR)) $(DESTDIR)$(DATA
 2 .PHONY: build
 3 build: $(SUBDIRS:%=build-%) $(TARGETS)
 4 
 5+REQUIRES          := wayland-server
 6+REQUIRES_PRIVATE  := $(filter-out $(REQUIRES),$(libswc_PACKAGES))
 7+SWC_PC_VARS       := VERSION PREFIX LIBDIR INCLUDEDIR DATADIR REQUIRES REQUIRES_PRIVATE
 8+
 9 swc.pc: swc.pc.in
10-	$(Q_GEN)sed                             \
11-	    -e "s:@VERSION@:$(VERSION):"        \
12-	    -e "s:@PREFIX@:$(PREFIX):"          \
13-	    -e "s:@LIBDIR@:$(LIBDIR):"          \
14-	    -e "s:@INCLUDEDIR@:$(INCLUDEDIR):"  \
15-	    -e "s:@DATADIR@:$(DATADIR):"        \
16-	    $< > $@
17+	$(Q_GEN)sed $(foreach var,$(SWC_PC_VARS),-e 's:@$(var)@:$($(var)):') $< >$@
18 
19 .PHONY: install-swc.pc
20 install-swc.pc: swc.pc | $(DESTDIR)$(PKGCONFIGDIR)
M swc.pc.in
+2, -3 
1@@ -10,6 +10,5 @@ Version: @VERSION@
2 Cflags: -I${includedir}
3 Libs: -L${libdir} -lswc
4 
5-Requires: wayland-server
6-Requires.private: libudev libevdev xkbcommon libdrm pixman-1 wld
7-
8+Requires: @REQUIRES@
9+Requires.private: @REQUIRES_PRIVATE@