diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2013-12-03 21:36:53 -0800 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-12-03 21:48:42 -0800 |
| commit | f97f01ec1c1176e816a8b2d548643f99f575cebe (patch) | |
| tree | ca851c2e6e8af9c143d7f675358cc5f21010a35d | |
| parent | 30a56b0f0acb109ef45f0cbb92a28108b9c7bc1f (diff) | |
build: Move wcap build rules to toplevel Makefile.am
| -rw-r--r-- | Makefile.am | 21 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | wcap/Makefile | 7 | ||||
| -rw-r--r-- | wcap/Makefile.am | 9 |
4 files changed, 23 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index 784bd4b2..972db35f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,3 @@ -if BUILD_WCAP_TOOLS -wcap_subdir = wcap -endif - SUBDIRS = \ shared \ src \ @@ -10,13 +6,14 @@ SUBDIRS = \ data \ protocol \ tests \ - $(wcap_subdir) \ man DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install EXTRA_DIST = weston.ini.in wayland-scanner.mk +bin_PROGRAMS = $(wcap_tools) + weston.ini : $(srcdir)/weston.ini.in $(AM_V_GEN)$(SED) \ -e 's|@bindir[@]|$(bindir)|g' \ @@ -77,5 +74,19 @@ xwayland/%-server-protocol.h : $(wayland_protocoldir)/%.xml xwayland/%-client-protocol.h : $(wayland_protocoldir)/%.xml $(AM_V_GEN)$(wayland_scanner) client-header < $< > $@ +endif + + +# wcap tools + +if BUILD_WCAP_TOOLS +wcap_tools = wcap-decode + +wcap_decode_SOURCES = \ + wcap/main.c \ + wcap/wcap-decode.c \ + wcap/wcap-decode.h +wcap_decode_CFLAGS = $(GCC_CFLAGS) $(WCAP_CFLAGS) +wcap_decode_LDADD = $(WCAP_LIBS) endif diff --git a/configure.ac b/configure.ac index 859a5a75..ac05938f 100644 --- a/configure.ac +++ b/configure.ac @@ -501,7 +501,6 @@ AC_CONFIG_FILES([Makefile src/version.h src/weston.pc clients/Makefile - wcap/Makefile data/Makefile protocol/Makefile man/Makefile diff --git a/wcap/Makefile b/wcap/Makefile new file mode 100644 index 00000000..5332f251 --- /dev/null +++ b/wcap/Makefile @@ -0,0 +1,7 @@ +all: + $(MAKE) -C .. + +clean: + $(MAKE) -C .. clean + +.PHONY: all clean diff --git a/wcap/Makefile.am b/wcap/Makefile.am deleted file mode 100644 index 338208e3..00000000 --- a/wcap/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -bin_PROGRAMS = wcap-decode - -wcap_decode_SOURCES = \ - main.c \ - wcap-decode.c \ - wcap-decode.h - -wcap_decode_CFLAGS = $(GCC_CFLAGS) $(WCAP_CFLAGS) -wcap_decode_LDADD = $(WCAP_LIBS) |