build: Consolidate scanner build rules

This commit is contained in:
Kristian Høgsberg 2014-03-07 11:57:34 -08:00
parent 7ecb102409
commit bb41c57446

View file

@ -57,10 +57,13 @@ nodist_libwayland_client_la_SOURCES = \
pkgconfig_DATA += src/wayland-client.pc src/wayland-server.pc pkgconfig_DATA += src/wayland-client.pc src/wayland-server.pc
protocoldir = $(top_srcdir)/protocol
if ENABLE_SCANNER if ENABLE_SCANNER
wayland_scanner = $(top_builddir)/wayland-scanner wayland_scanner = $(top_builddir)/wayland-scanner
bin_PROGRAMS = wayland-scanner
wayland_scanner_SOURCES = src/scanner.c
wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la
$(BUILT_SOURCES) : wayland-scanner
pkgconfig_DATA += src/wayland-scanner.pc
else else
wayland_scanner = wayland-scanner wayland_scanner = wayland-scanner
endif endif
@ -74,18 +77,6 @@ protocol/%-server-protocol.h : $(top_srcdir)/protocol/%.xml
protocol/%-client-protocol.h : $(top_srcdir)/protocol/%.xml protocol/%-client-protocol.h : $(top_srcdir)/protocol/%.xml
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) client-header < $< > $@ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) client-header < $< > $@
if ENABLE_SCANNER
bin_PROGRAMS = wayland-scanner
wayland_scanner_SOURCES = src/scanner.c
wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la
$(BUILT_SOURCES) : wayland-scanner
pkgconfig_DATA += src/wayland-scanner.pc
endif
BUILT_SOURCES = \ BUILT_SOURCES = \
$(nodist_libwayland_server_la_SOURCES) \ $(nodist_libwayland_server_la_SOURCES) \
$(nodist_libwayland_client_la_SOURCES) $(nodist_libwayland_client_la_SOURCES)