[PATCH 1/2] Add some intramodule dependencies

[Aaron Plattner]

On Mon, Sep 19, 2011 at 02:51:07PM -0700, Alan Coopersmith wrote:
> libshadow depends on libfb for fbGetWinPrivateKey
> libvbe depends on libint10 for xf86Int10AllocPages, xf86Int10FreePages,
>  xf86ExecX86int10, xf86ExtendedInitInt10, xf86FreeInt10, xf86int10Addr
> 
> Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
> ---
>  hw/xfree86/dixmods/Makefile.am |    1 +
>  hw/xfree86/vbe/Makefile.am     |    1 +
>  2 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
> index 1a162ab..10001a5 100644
> --- a/hw/xfree86/dixmods/Makefile.am
> +++ b/hw/xfree86/dixmods/Makefile.am
> @@ -59,6 +59,7 @@ librecord_la_SOURCES = recordmod.c
>  
>  libshadow_la_LDFLAGS = -avoid-version
>  libshadow_la_LIBADD = $(top_builddir)/miext/shadow/libshadow.la
> +libshadow_la_LIBADD += libfb.la

Just linking these together doesn't seem right, since it won't initialize
it as a module.  Should it call xf86LoadSubModule at runtime instead?

>  libshadow_la_SOURCES = shmodule.c
>  
>  libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
> diff --git a/hw/xfree86/vbe/Makefile.am b/hw/xfree86/vbe/Makefile.am
> index 85c6fd8..1e245e6 100644
> --- a/hw/xfree86/vbe/Makefile.am
> +++ b/hw/xfree86/vbe/Makefile.am
> @@ -1,5 +1,6 @@
>  module_LTLIBRARIES = libvbe.la
>  libvbe_la_LDFLAGS = -avoid-version
> +libvbe_la_LIBADD = $(top_builddir)/hw/xfree86/int10/libint10.la
>  libvbe_la_SOURCES = vbe.c vbeModes.c vbe_module.c
>  
>  sdk_HEADERS = vbe.h vbeModes.h
> -- 
> 1.7.3.2