diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2014-03-07 11:57:34 -0800 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2014-03-07 12:00:13 -0800 |
| commit | bb41c5744667b607773ae4ada876e58e512c9739 (patch) | |
| tree | 781d98b63508884a1339d891f14eddbfe6289530 | |
| parent | 7ecb102409f30be29f157f9dd300b9f8860c7b85 (diff) | |
build: Consolidate scanner build rules
| -rw-r--r-- | Makefile.am | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index adc8358..c5fcce0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,10 +57,13 @@ nodist_libwayland_client_la_SOURCES = \ pkgconfig_DATA += src/wayland-client.pc src/wayland-server.pc -protocoldir = $(top_srcdir)/protocol - if ENABLE_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 wayland_scanner = wayland-scanner endif @@ -74,18 +77,6 @@ protocol/%-server-protocol.h : $(top_srcdir)/protocol/%.xml protocol/%-client-protocol.h : $(top_srcdir)/protocol/%.xml $(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 = \ $(nodist_libwayland_server_la_SOURCES) \ $(nodist_libwayland_client_la_SOURCES) |