Package: directfb Version: 2006-04-11 Author: Colin Watson , Guillem Jover Status: applied Description: Fix the link dependencies for the plugins. So that stuff like library symbol reduction in debian-installer can work properly. --- gfxdrivers/ati128/Makefile.am 2005-02-03 20:38:03.000000000 +0200 +++ gfxdrivers/ati128/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -30,6 +30,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_ati128_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- gfxdrivers/cle266/Makefile.am 2004-10-09 03:00:44.000000000 +0300 +++ gfxdrivers/cle266/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -34,6 +34,11 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_cle266_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/lib/fusion/libfusion.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- gfxdrivers/cyber5k/Makefile.am 2005-02-03 20:38:04.000000000 +0200 +++ gfxdrivers/cyber5k/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -30,6 +30,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_cyber5k_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- gfxdrivers/i810/Makefile.am 2005-02-03 20:38:04.000000000 +0200 +++ gfxdrivers/i810/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -25,6 +25,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_i810_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- gfxdrivers/i830/Makefile.am 2005-02-10 14:00:35.000000000 +0200 +++ gfxdrivers/i830/Makefile.am 2006-01-23 08:19:27.000000000 +0200 @@ -25,7 +25,10 @@ -avoid-version \ $(DFB_LDFLAGS) -libdirectfb_i830_la_LIBADD = -lm +libdirectfb_i830_la_LIBADD = -lm \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- gfxdrivers/mach64/Makefile.am 2005-02-03 20:38:04.000000000 +0200 +++ gfxdrivers/mach64/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -28,6 +28,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_mach64_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- gfxdrivers/matrox/Makefile.am 2005-02-03 20:38:04.000000000 +0200 +++ gfxdrivers/matrox/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -38,7 +38,10 @@ -avoid-version \ $(DFB_LDFLAGS) -libdirectfb_matrox_la_LIBADD = -lm +libdirectfb_matrox_la_LIBADD = -lm \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/lib/fusion/libfusion.la \ + $(top_builddir)/src/libdirectfb.la include $(top_srcdir)/rules/libobject.make --- gfxdrivers/neomagic/Makefile.am 2005-02-03 20:38:04.000000000 +0200 +++ gfxdrivers/neomagic/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -25,6 +25,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_neomagic_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- gfxdrivers/nsc/Makefile.am 2005-02-03 20:38:04.000000000 +0200 +++ gfxdrivers/nsc/Makefile.am 2006-01-23 08:20:21.000000000 +0200 @@ -30,6 +30,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_nsc_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- gfxdrivers/nvidia/Makefile.am 2005-07-18 19:28:19.000000000 +0300 +++ gfxdrivers/nvidia/Makefile.am 2006-01-23 08:20:28.000000000 +0200 @@ -32,6 +32,12 @@ libdirectfb_nvidia_la_LDFLAGS = \ -export-dynamic \ -avoid-version \ - $(DFB_LDFLAGS) -lm + $(DFB_LDFLAGS) + +libdirectfb_nvidia_la_LIBADD = -lm \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/lib/fusion/libfusion.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- gfxdrivers/radeon/Makefile.am 2005-02-03 20:38:05.000000000 +0200 +++ gfxdrivers/radeon/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -29,6 +29,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_radeon_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- gfxdrivers/savage/Makefile.am 2005-02-03 20:38:05.000000000 +0200 +++ gfxdrivers/savage/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -32,6 +32,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_savage_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- gfxdrivers/sis315/Makefile.am 2005-10-24 19:20:24.000000000 +0300 +++ gfxdrivers/sis315/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -33,6 +33,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_sis315_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- gfxdrivers/tdfx/Makefile.am 2005-02-03 20:38:05.000000000 +0200 +++ gfxdrivers/tdfx/Makefile.am 2006-01-23 08:20:33.000000000 +0200 @@ -23,6 +23,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_tdfx_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- gfxdrivers/unichrome/Makefile.am 2004-10-09 03:00:45.000000000 +0300 +++ gfxdrivers/unichrome/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -36,6 +36,11 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_unichrome_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/lib/fusion/libfusion.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- inputdrivers/dbox2remote/Makefile.am 2005-02-03 20:38:05.000000000 +0200 +++ inputdrivers/dbox2remote/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -22,6 +22,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_dbox2remote_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- inputdrivers/dreamboxremote/Makefile.am 2005-02-10 18:39:32.000000000 +0200 +++ inputdrivers/dreamboxremote/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -22,6 +22,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_dreamboxremote_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- inputdrivers/elo/Makefile.am 2005-02-03 20:38:05.000000000 +0200 +++ inputdrivers/elo/Makefile.am 2006-01-23 08:21:13.000000000 +0200 @@ -22,6 +22,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_elo_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- inputdrivers/h3600_ts/Makefile.am 2005-02-03 20:38:05.000000000 +0200 +++ inputdrivers/h3600_ts/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -22,6 +22,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_h3600_ts_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- inputdrivers/joystick/Makefile.am 2005-02-03 20:38:06.000000000 +0200 +++ inputdrivers/joystick/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -22,6 +22,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_joystick_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- inputdrivers/keyboard/Makefile.am 2005-02-03 20:38:06.000000000 +0200 +++ inputdrivers/keyboard/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -23,6 +23,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_keyboard_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- inputdrivers/linux_input/Makefile.am 2005-02-03 20:38:06.000000000 +0200 +++ inputdrivers/linux_input/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -24,6 +24,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_linux_input_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- inputdrivers/lirc/Makefile.am 2005-02-03 20:38:06.000000000 +0200 +++ inputdrivers/lirc/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -23,6 +23,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_lirc_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- inputdrivers/mutouch/Makefile.am 2005-02-03 20:38:06.000000000 +0200 +++ inputdrivers/mutouch/Makefile.am 2006-01-23 08:21:26.000000000 +0200 @@ -21,6 +21,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_mutouch_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- inputdrivers/ps2mouse/Makefile.am 2005-02-03 20:38:06.000000000 +0200 +++ inputdrivers/ps2mouse/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -22,6 +22,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_ps2mouse_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- inputdrivers/serialmouse/Makefile.am 2005-02-03 20:38:06.000000000 +0200 +++ inputdrivers/serialmouse/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -21,6 +21,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_serialmouse_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- inputdrivers/sonypi/Makefile.am 2005-02-03 20:38:06.000000000 +0200 +++ inputdrivers/sonypi/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -22,6 +22,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_sonypi_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- inputdrivers/ucb1x00_ts/Makefile.am 2005-02-03 20:38:06.000000000 +0200 +++ inputdrivers/ucb1x00_ts/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -22,6 +22,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_ucb1x00_ts_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- inputdrivers/wm97xx_ts/Makefile.am 2005-02-03 20:38:07.000000000 +0200 +++ inputdrivers/wm97xx_ts/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -22,6 +22,10 @@ -avoid-version \ $(DFB_LDFLAGS) +libdirectfb_wm97xx_ts_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- interfaces/IDirectFBFont/Makefile.am 2005-07-22 00:34:04.000000000 +0300 +++ interfaces/IDirectFBFont/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -30,10 +30,17 @@ libidirectfbfont_default_la_LDFLAGS = -avoid-version -module +libidirectfbfont_default_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + libidirectfbfont_ft2_la_SOURCES = idirectfbfont_ft2.c -libidirectfbfont_ft2_la_LIBADD = $(FREETYPE_LIBS) +libidirectfbfont_ft2_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la \ + $(FREETYPE_LIBS) libidirectfbfont_ft2_la_LDFLAGS = -avoid-version -module --- interfaces/IDirectFBImageProvider/Makefile.am 2005-07-22 00:34:04.000000000 +0300 +++ interfaces/IDirectFBImageProvider/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -44,26 +44,38 @@ libidirectfbimageprovider_png_la_SOURCES = idirectfbimageprovider_png.c -libidirectfbimageprovider_png_la_LIBADD = $(LIBPNG) +libidirectfbimageprovider_png_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la \ + $(LIBPNG) libidirectfbimageprovider_png_la_LDFLAGS = -avoid-version -module libidirectfbimageprovider_mpeg2_la_SOURCES = idirectfbimageprovider_mpeg2.c -libidirectfbimageprovider_mpeg2_la_LIBADD = mpeg2/libmpeg2decode.la +libidirectfbimageprovider_mpeg2_la_LIBADD = \ + $(top_builddir)/src/libdirectfb.la \ + mpeg2/libmpeg2decode.la libidirectfbimageprovider_mpeg2_la_LDFLAGS = -avoid-version -module libidirectfbimageprovider_gif_la_SOURCES = idirectfbimageprovider_gif.c +libidirectfbimageprovider_gif_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la + libidirectfbimageprovider_gif_la_LDFLAGS = -avoid-version -module libidirectfbimageprovider_jpeg_la_SOURCES = idirectfbimageprovider_jpeg.c -libidirectfbimageprovider_jpeg_la_LIBADD = $(LIBJPEG) +libidirectfbimageprovider_jpeg_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/src/libdirectfb.la \ + $(LIBJPEG) libidirectfbimageprovider_jpeg_la_LDFLAGS = -avoid-version -module --- interfaces/IDirectFBVideoProvider/Makefile.am 2005-07-22 00:34:04.000000000 +0300 +++ interfaces/IDirectFBVideoProvider/Makefile.am 2006-01-23 08:25:05.000000000 +0200 @@ -28,5 +28,10 @@ libidirectfbvideoprovider_v4l_la_LDFLAGS = -avoid-version -module +libidirectfbvideoprovider_v4l_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/lib/fusion/libfusion.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- systems/fbdev/Makefile.am 2005-07-18 19:22:57.000000000 +0300 +++ systems/fbdev/Makefile.am 2006-01-23 08:22:23.000000000 +0200 @@ -31,5 +31,10 @@ fbdev.c \ vt.c +libdirectfb_fbdev_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/lib/fusion/libfusion.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- systems/osx/Makefile.am 2004-10-09 02:51:42.000000000 +0300 +++ systems/osx/Makefile.am 2006-01-23 08:22:28.000000000 +0200 @@ -27,6 +27,11 @@ osx.c \ osx.h +libdirectfb_osx_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/lib/fusion/libfusion.la \ + $(top_builddir)/src/libdirectfb.la + inputdriversdir = $(MODULEDIR)/inputdrivers inputdrivers_LTLIBRARIES = libdirectfb_osxinput.la @@ -44,6 +49,11 @@ libdirectfb_osxinput_la_SOURCES = \ osxinput.c +libdirectfb_osxinput_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/lib/fusion/libfusion.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- systems/sdl/Makefile.am 2004-10-09 02:51:42.000000000 +0300 +++ systems/sdl/Makefile.am 2006-01-23 08:22:33.000000000 +0200 @@ -28,7 +28,6 @@ libdirectfb_sdl_la_LDFLAGS = \ - $(SDL_LIBS) \ -avoid-version \ -module @@ -38,14 +37,25 @@ sdl.c \ sdl.h +libdirectfb_sdl_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/lib/fusion/libfusion.la \ + $(top_builddir)/src/libdirectfb.la \ + $(SDL_LIBS) + libdirectfb_sdlinput_la_LDFLAGS = \ - $(SDL_LIBS) \ -avoid-version \ -module libdirectfb_sdlinput_la_SOURCES = \ sdlinput.c +libdirectfb_sdlinput_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/lib/fusion/libfusion.la \ + $(top_builddir)/src/libdirectfb.la \ + $(SDL_LIBS) + include $(top_srcdir)/rules/libobject.make --- systems/vnc/Makefile.am 2005-07-15 20:33:10.000000000 +0300 +++ systems/vnc/Makefile.am 2006-01-23 08:22:37.000000000 +0200 @@ -34,6 +34,11 @@ vnc.c \ vnc.h +libdirectfb_vnc_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/lib/fusion/libfusion.la \ + $(top_builddir)/src/libdirectfb.la + libdirectfb_vncinput_la_LDFLAGS = \ $(VNC_LIBS) \ -avoid-version \ @@ -42,5 +47,9 @@ libdirectfb_vncinput_la_SOURCES = \ vncinput.c +libdirectfb_vncinput_la_LIBADD = \ + $(top_builddir)/src/libdirectfb.la + + include $(top_srcdir)/rules/libobject.make --- systems/x11/Makefile.am 2005-05-30 16:57:44.000000000 +0300 +++ systems/x11/Makefile.am 2006-01-23 08:22:42.000000000 +0200 @@ -40,6 +40,11 @@ xwindow.h \ xwindow.c +libdirectfb_x11_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/lib/fusion/libfusion.la \ + $(top_builddir)/src/libdirectfb.la + libdirectfb_x11input_la_LDFLAGS = \ $(X11_LIBS) \ -avoid-version \ @@ -48,6 +53,11 @@ libdirectfb_x11input_la_SOURCES = \ x11input.c +libdirectfb_x11input_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/lib/fusion/libfusion.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- wm/default/Makefile.am 2004-12-20 03:37:08.000000000 +0200 +++ wm/default/Makefile.am 2006-01-23 08:23:03.000000000 +0200 @@ -24,5 +24,10 @@ libdirectfbwm_default_la_SOURCES = \ default.c +libdirectfbwm_default_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/lib/fusion/libfusion.la \ + $(top_builddir)/src/libdirectfb.la + include $(top_srcdir)/rules/libobject.make --- wm/unique/Makefile.am 2005-07-18 22:07:19.000000000 +0300 +++ wm/unique/Makefile.am 2006-01-23 08:07:15.000000000 +0200 @@ -66,7 +66,10 @@ unique.c # Link module against uniquewm library -libdirectfbwm_unique_la_LIBADD = libuniquewm.la +libdirectfbwm_unique_la_LIBADD = \ + $(top_builddir)/lib/direct/libdirect.la \ + $(top_builddir)/lib/fusion/libfusion.la \ + libuniquewm.la libdirectfbwm_unique_la_LDFLAGS = \ -avoid-version \