Makefile: Fix libraries link order.

[glsdk/omapdrmtest.git] / util / Makefile.am

diff --git a/util/Makefile.am b/util/Makefile.am
index 9d3ddd2fa24b1530d7707866e0f9b1e8c5ba9777..23f868d3d27f28dd05bf04d5a74dd6ed7d937af3 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -19,16 +19,27 @@ noinst_LTLIBRARIES = libutil.la
 
 libutil_la_SOURCES = \
        display-kms.c \
-       v4l2.c \
-       util.c
+       util.c \
+       vpe-common.c
 
-if ENABLE_X11
-libutil_la_SOURCES += display-x11.c
+if ENABLE_V4L2_DMABUF
+libutil_la_SOURCES += v4l2.c
 endif
 
 if ENABLE_DCE
 libutil_la_SOURCES += demux.c
 endif
 
-libutil_la_LIBADD = @DRM_LIBS@ @X11_LIBS@ @DCE_LIBS@
-libutil_la_CFLAGS = @DRM_CFLAGS@ @X11_CFLAGS@ @DCE_CFLAGS@ @WARN_CFLAGS@
+if ENABLE_KMSCUBE
+libutil_la_SOURCES += display-kmscube.c esTransform.c
+endif
+
+if ENABLE_WAYLAND
+libutil_la_SOURCES += display-wayland.c wayland-drm-protocol.c wayland-scaler-protocol.c
+libutil_la_CFLAGS = @DRM_CFLAGS@
+libutil_la_LDFLAGS = -lwayland-client -lwayland-cursor -ldrm -ldrm_omap -lpthread -lpvr_wlegl -lavcodec
+
+endif
+
+libutil_la_LIBADD = @DRM_LIBS@ @DCE_LIBS@ @GBM_LIBS@ @EGL_LIBS@ @GLES2_LIBS@
+libutil_la_CFLAGS = @DRM_CFLAGS@ @DCE_CFLAGS@ @WARN_CFLAGS@ @GBM_CFLAGS@ @EGL_CFLAGS@ @GLES2_CFLAGS@