build: Move wcap/Makefile.am into top-level Makefile.am

dev
Kristian Høgsberg 11 years ago
parent 5b9f9f8fc4
commit e895f148e6
  1. 20
      Makefile.am
  2. 1
      configure.ac
  3. 9
      wcap/Makefile.am

@ -1,11 +1,9 @@
if BUILD_WCAP_TOOLS
wcap_subdir = wcap
endif
if ENABLE_XWAYLAND if ENABLE_XWAYLAND
xwayland_subdir = xwayland xwayland_subdir = xwayland
endif endif
bin_PROGRAMS =
SUBDIRS = \ SUBDIRS = \
shared \ shared \
src \ src \
@ -14,7 +12,6 @@ SUBDIRS = \
clients \ clients \
protocol \ protocol \
tests \ tests \
$(wcap_subdir) \
man man
DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install
@ -44,3 +41,16 @@ dist_westondata_DATA = \
data/sign_close.png \ data/sign_close.png \
data/sign_maximize.png \ data/sign_maximize.png \
data/sign_minimize.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

@ -492,7 +492,6 @@ AC_CONFIG_FILES([Makefile
src/version.h src/version.h
src/weston.pc src/weston.pc
clients/Makefile clients/Makefile
wcap/Makefile
protocol/Makefile protocol/Makefile
man/Makefile man/Makefile
tests/Makefile]) tests/Makefile])

@ -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)
Loading…
Cancel
Save