diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-09-04 14:49:49 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-09-04 14:49:49 -0700 |
| commit | e89d16be07e45e487913509788a9e8cb1ee09bc7 (patch) | |
| tree | a3aa68bb16d97fdbefcb584e0d7516d0eb0c9c0e /hw/xfree86/Makefile.am | |
| parent | bf5948518763b5e21eff806a0a9abc5f7757fa10 (diff) | |
Revert part of 529acb175440969af9d7fa38aab8d7dea0dc2661 because libtool is smart.
Diffstat (limited to 'hw/xfree86/Makefile.am')
| -rw-r--r-- | hw/xfree86/Makefile.am | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index b9a85798c..9be022010 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -35,7 +35,14 @@ INCLUDES = @XORG_INCS@ Xorg_SOURCES = xorg.c -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: touch $@ DISTCLEANFILES = osandcommon.c xorg.c @@ -44,9 +51,7 @@ XORG_LIBS = \ $(XSERVER_LIBS) \ common/libinit.a \ loader/libloader.a \ - os-support/libxorgos.la \ - common/libcommon.la \ - os-support/libxorgos.la \ + libosandcommon.la \ rac/librac.a \ parser/libxf86config.a \ dixmods/libdixmods.la \ |