diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2002-08-18 13:43:13 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2002-08-18 13:43:13 +0000 |
| commit | 776591aa4787a2e597af265c4fcb71ad9ddb000d (patch) | |
| tree | 3eefb7114b1799bdc2cf78b80e214f89f5fb5de9 | |
| parent | 677a46581afbe26e9ec697696c57ac6f41898554 (diff) | |
| download | xine-lib-776591aa4787a2e597af265c4fcb71ad9ddb000d.tar.gz xine-lib-776591aa4787a2e597af265c4fcb71ad9ddb000d.tar.bz2 | |
fix conditional X11 linking for older automake versions
CVS patchset: 2471
CVS date: 2002/08/18 13:43:13
| -rw-r--r-- | src/dxr3/Makefile.am | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am index 92fd08ab5..356ffc851 100644 --- a/src/dxr3/Makefile.am +++ b/src/dxr3/Makefile.am @@ -7,6 +7,9 @@ libdir = $(XINE_PLUGINDIR) if HAVE_DXR3 dxr3_modules = xineplug_decode_dxr3_video.la xineplug_decode_dxr3_spu.la xineplug_vo_out_dxr3.la endif +if HAVE_X11 +link_x_libs = $(X_LIBS) -lXext +endif if HAVE_LIBFAME link_fame = -lfame endif @@ -23,12 +26,8 @@ xineplug_decode_dxr3_spu_la_SOURCES = dxr3_decode_spu.c nav_read.c xineplug_decode_dxr3_spu_la_LDFLAGS = -avoid-version -module xineplug_vo_out_dxr3_la_SOURCES = video_out_dxr3.c dxr3_mpeg_encoders.c alphablend.c dxr3_spu_encoder.c -if HAVE_X11 -xineplug_vo_out_dxr3_la_LIBADD = $(X_LIBS) -lXext -xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module $(link_fame) $(link_rte) $(X_LIBS) -else -xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module $(link_fame) $(link_rte) -endif +xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) +xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module noinst_HEADERS = dxr3.h dxr3_scr.h video_out_dxr3.h nav_types.h nav_read.h alphablend.h bswap.h |