diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-06 16:18:25 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-06 16:18:25 +0200 |
| commit | 8d13033d6c84109fff3d2788d9bb844462ad6b8e (patch) | |
| tree | 030f1916447f7c27de64244f0ec2664c03e722c8 | |
| parent | e7b343f647fa5c44551946b39afdeebe0812c8eb (diff) | |
| download | xine-lib-8d13033d6c84109fff3d2788d9bb844462ad6b8e.tar.gz xine-lib-8d13033d6c84109fff3d2788d9bb844462ad6b8e.tar.bz2 | |
Similarly, add a vidix_LTLIBRARIES class to install the vidix drivers in the correct location.
| -rw-r--r-- | misc/Makefile.common | 6 | ||||
| -rw-r--r-- | src/video_out/vidix/drivers/Makefile.am | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/misc/Makefile.common b/misc/Makefile.common index 739ebb54e..357c19666 100644 --- a/misc/Makefile.common +++ b/misc/Makefile.common @@ -6,6 +6,7 @@ xineplugdir = $(XINE_PLUGINDIR) xineplug_ldflags = $(NOUNDEF) -avoid-version -module xinepostdir = $(XINE_PLUGINDIR)/post +vidixdir = $(XINE_PLUGINDIR)/vidix $(XINE_LIB): @cd $(top_srcdir)/src/xine-engine && $(MAKE) @@ -61,6 +62,11 @@ uninstall-hook: echo " rm -f $(DESTDIR)$(xinepostdir)/$$p"; \ rm -f $(DESTDIR)$(xinepostdir)/$$p; \ done; + @list='$(vidix_LTLIBRARIES)'; for p in $$list; do \ + p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(vidixdir)/$$p"; \ + rm -f $(DESTDIR)$(vidixdir)/$$p; \ + done; mostlyclean-generic: -rm -f *~ \#* .*~ .\#* diff --git a/src/video_out/vidix/drivers/Makefile.am b/src/video_out/vidix/drivers/Makefile.am index 3c0369af7..f438dde36 100644 --- a/src/video_out/vidix/drivers/Makefile.am +++ b/src/video_out/vidix/drivers/Makefile.am @@ -2,8 +2,6 @@ include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = genfb_vid.c -libdir = $(XINE_PLUGINDIR)/vidix - if HAVE_VIDIX vidix_drivers = \ mach64_vid.la \ @@ -20,7 +18,7 @@ vidix_drivers = \ savage_vid.la endif -lib_LTLIBRARIES = $(vidix_drivers) +vidix_LTLIBRARIES = $(vidix_drivers) radeon_vid_la_SOURCES = radeon_vid.c radeon_vid_la_LDFLAGS = -avoid-version -module -lm |