diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/Makefile.am | 10 | ||||
| -rw-r--r-- | sys/ximage/Makefile.am | 4 | ||||
| -rw-r--r-- | sys/ximage/gstximagesrc.c | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/sys/Makefile.am b/sys/Makefile.am index 160ec779..50028bc2 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -58,6 +58,12 @@ endif # GL_DIR= # endif -SUBDIRS=$(OSS_DIR) $(SUNAUDIO_DIR) +if USE_X +XIMAGE_DIR=ximage +else +XIMAGE_DIR= +endif + +SUBDIRS=$(OSS_DIR) $(SUNAUDIO_DIR) $(XIMAGE_DIR) -DIST_SUBDIRS=oss sunaudio +DIST_SUBDIRS=oss sunaudio ximage diff --git a/sys/ximage/Makefile.am b/sys/ximage/Makefile.am index d1a4b427..1a25c775 100644 --- a/sys/ximage/Makefile.am +++ b/sys/ximage/Makefile.am @@ -1,6 +1,6 @@ plugin_LTLIBRARIES = libgstximagesrc.la -libgstximagesrc_la_SOURCES = ximagesrc.c ximageutil.c +libgstximagesrc_la_SOURCES = gstximagesrc.c ximageutil.c libgstximagesrc_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ @@ -11,4 +11,4 @@ libgstximagesrc_la_LIBADD = \ $(X_LIBS) $(XSHM_LIBS) $(XFIXES_LIBS) $(XDAMAGE_LIBS) libgstximagesrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -noinst_HEADERS = ximagesrc.h ximageutil.h +noinst_HEADERS = gstximagesrc.h ximageutil.h diff --git a/sys/ximage/gstximagesrc.c b/sys/ximage/gstximagesrc.c index 2320001f..55e1834d 100644 --- a/sys/ximage/gstximagesrc.c +++ b/sys/ximage/gstximagesrc.c @@ -43,7 +43,7 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include "ximagesrc.h" +#include "gstximagesrc.h" #include <string.h> #include <stdlib.h> |