mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-28 21:33:09 +00:00
dix: remove all but main() from main.c
All other functions are pushed into where they seemed to fit. main.c is now linked separately into libmain.a and linked in by the various DDXs. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
2a2a7fa685
commit
987579c930
11 changed files with 376 additions and 377 deletions
|
|
@ -85,6 +85,7 @@ XDMX_LIBS = \
|
|||
$(GLX_LIBS) \
|
||||
input/libdmxinput.a \
|
||||
config/libdmxconfig.a \
|
||||
$(MAIN_LIB) \
|
||||
$(XSERVER_LIBS)
|
||||
|
||||
Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ Xvfb_SOURCES = $(SRCS)
|
|||
XVFB_LIBS = \
|
||||
@XVFB_LIBS@ \
|
||||
libfbcmap.a \
|
||||
$(MAIN_LIB) \
|
||||
$(XSERVER_LIBS)
|
||||
|
||||
Xvfb_LDADD = $(XVFB_LIBS) $(XVFB_SYS_LIBS) $(XSERVER_SYS_LIBS)
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ libxorg.c xorg.c:
|
|||
DISTCLEANFILES = libxorg.c xorg.c
|
||||
|
||||
Xorg_DEPENDENCIES = libxorg.la
|
||||
Xorg_LDADD = libxorg.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)
|
||||
Xorg_LDADD = $(MAIN_LIB) libxorg.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)
|
||||
|
||||
Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ X11_bin_LDADD = \
|
|||
$(top_builddir)/dix/dixfonts.lo \
|
||||
$(top_builddir)/miext/rootless/librootless.la \
|
||||
$(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \
|
||||
$(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin
|
||||
$(DARWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin
|
||||
|
||||
X11_bin_LDFLAGS = \
|
||||
-XCClinker -Objc \
|
||||
|
|
|
|||
Loading…
Reference in a new issue