diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2014-01-27 21:46:30 -0800 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2014-01-31 23:50:00 -0800 |
| commit | e895f148e64396b01a325dca9724c0c900d9fb77 (patch) | |
| tree | 43dcae9e41584fd9835e07fad33dd9c6ef684cfb | |
| parent | 5b9f9f8fc43404b401805f1f6d5fe2017b5fd1a7 (diff) | |
build: Move wcap/Makefile.am into top-level Makefile.am
| -rw-r--r-- | Makefile.am | 20 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | wcap/Makefile.am | 9 |
3 files changed, 15 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index e6ef979d..82e21c4d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,9 @@ -if BUILD_WCAP_TOOLS -wcap_subdir = wcap -endif - if ENABLE_XWAYLAND xwayland_subdir = xwayland endif +bin_PROGRAMS = + SUBDIRS = \ shared \ src \ @@ -14,7 +12,6 @@ SUBDIRS = \ clients \ protocol \ tests \ - $(wcap_subdir) \ man DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install @@ -44,3 +41,16 @@ dist_westondata_DATA = \ data/sign_close.png \ data/sign_maximize.png \ data/sign_minimize.png + + +if BUILD_WCAP_TOOLS +bin_PROGRAMS += 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 b05ca2fe..116a30a5 100644 --- a/configure.ac +++ b/configure.ac @@ -492,7 +492,6 @@ AC_CONFIG_FILES([Makefile src/version.h src/weston.pc clients/Makefile - wcap/Makefile protocol/Makefile man/Makefile tests/Makefile]) 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) |