Revert part of 529acb1754 because libtool is smart.

This commit is contained in:
Ian Romanick 2007-09-04 14:49:49 -07:00
parent bf59485187
commit e89d16be07

View File

@ -35,7 +35,14 @@ INCLUDES = @XORG_INCS@
Xorg_SOURCES = xorg.c 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 $@ touch $@
DISTCLEANFILES = osandcommon.c xorg.c DISTCLEANFILES = osandcommon.c xorg.c
@ -44,9 +51,7 @@ XORG_LIBS = \
$(XSERVER_LIBS) \ $(XSERVER_LIBS) \
common/libinit.a \ common/libinit.a \
loader/libloader.a \ loader/libloader.a \
os-support/libxorgos.la \ libosandcommon.la \
common/libcommon.la \
os-support/libxorgos.la \
rac/librac.a \ rac/librac.a \
parser/libxf86config.a \ parser/libxf86config.a \
dixmods/libdixmods.la \ dixmods/libdixmods.la \