diff options
| author | Eric Anholt <eric@anholt.net> | 2007-09-02 15:16:01 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-09-02 15:16:01 -0700 |
| commit | 529acb175440969af9d7fa38aab8d7dea0dc2661 (patch) | |
| tree | 75e6418c93a01293a9c0d655e7bb48735fb22f4d /hw/xfree86 | |
| parent | c56930e6ca90a61d2f4cbd845f7d0a51a66f83cb (diff) | |
Fix Xorg build by listing circular dependency libraries twice.
One of these I introduced by listing dix and mi in the same library list to
simplify other servers. The other had been hacked around using libosandcommon,
which is now gone.
Diffstat (limited to 'hw/xfree86')
| -rw-r--r-- | hw/xfree86/Makefile.am | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index 511e224d3..b9a85798c 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -35,23 +35,18 @@ INCLUDES = @XORG_INCS@ Xorg_SOURCES = xorg.c -# libxorgos and libcommon need symbols from each other -noinst_LTLIBRARIES = libosandcommon.la -libosandcommon_la_SOURCES = osandcommon.c -libosandcommon_la_LIBADD = \ - os-support/libxorgos.la \ - common/libcommon.la - -osandcommon.c xorg.c: +xorg.c: touch $@ DISTCLEANFILES = osandcommon.c xorg.c XORG_LIBS = \ - $(XSERVER_LIBS \ + $(XSERVER_LIBS) \ common/libinit.a \ loader/libloader.a \ - libosandcommon.la \ + os-support/libxorgos.la \ + common/libcommon.la \ + os-support/libxorgos.la \ rac/librac.a \ parser/libxf86config.a \ dixmods/libdixmods.la \ @@ -60,7 +55,10 @@ XORG_LIBS = \ ddc/libddc.a \ i2c/libi2c.a \ dixmods/libxorgxkb.la \ - @XORG_LIBS@ + $(top_builddir)/mi/libmi.la \ + $(top_builddir)/os/libos.la \ + @XORG_LIBS@ \ + dixmods/libxorgxkb.la Xorg_DEPENDENCIES = $(XORG_LIBS) Xorg_LDADD = $(XORG_LIBS) $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) |