diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-04-24 21:36:31 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-04-24 21:36:31 +0000 |
| commit | cdd9d3cebbac15dd22f6d7d0bef4b6c8275fb824 (patch) | |
| tree | 3573c745af106a108770396cedebd76978caa3f2 /src | |
| parent | bfc79c2cbb4dbdc32e05f56e00a4814b56a9981a (diff) | |
| download | xine-lib-cdd9d3cebbac15dd22f6d7d0bef4b6c8275fb824.tar.gz xine-lib-cdd9d3cebbac15dd22f6d7d0bef4b6c8275fb824.tar.bz2 | |
Fix some install patch (forgotten), plus nofpic builds.
CVS patchset: 24
CVS date: 2001/04/24 21:36:31
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio_out/Makefile.am | 4 | ||||
| -rw-r--r-- | src/video_out/Makefile.am | 4 | ||||
| -rw-r--r-- | src/xine-engine/Makefile.am | 8 |
3 files changed, 11 insertions, 5 deletions
diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am index 220f5991d..0e90b2028 100644 --- a/src/audio_out/Makefile.am +++ b/src/audio_out/Makefile.am @@ -2,6 +2,10 @@ CFLAGS = @GLOBAL_CFLAGS@ -DXINE_COMPILE EXTRA_DIST = audio_alsa_out.c audio_esd_out.c +LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic + +libdir = $(XINE_PLUGINDIR) + if HAVE_ALSA alsa_module = xineplug_ao_out_alsa.la endif diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index 8d0c37c20..3ca9adb0a 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -1,5 +1,9 @@ CFLAGS = @GLOBAL_CFLAGS@ @X_CFLAGS@ -DXINE_COMPILE +LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic + +libdir = $(XINE_PLUGINDIR) + if HAVE_X11 ## xshm and syncfb should be fixed first ;-) ## xshm_module = xineplug_vo_out_xshm.la diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 007d07564..1ae2a2761 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -6,11 +6,9 @@ CFLAGS = @GLOBAL_CFLAGS@ lib_LTLIBRARIES = libxine.la -##libxine_la_SOURCES = xine.c buffer.c metronom.c configfile.c \ -## monitor.c utils.c audio_decoder.c video_decoder.c load_plugins.c -libxine_la_SOURCES = metronom.c configfile.c buffer.c monitor.c utils.c \ - cpu_accel.c load_plugins.c video_decoder.c audio_decoder.c \ - video_out.c +libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c monitor.c \ + utils.c cpu_accel.c load_plugins.c video_decoder.c \ + audio_decoder.c video_out.c libxine_la_DEPENDENCIES = libsdeps libxine_la_LIBADD = \ ## $(top_srcdir)/src/libmpeg2/libmpeg2.la \ |