xfree86: Move sdksyms generation to ddx toplevel
The symbols in sdksyms.c cover the entire source tree. In order to make them resolve when libxorg.la goes away, move the objects from libloader to Xorg. Unfortunately, this means sdksyms needs to get built again for the test code. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Tested-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
7d5c8a12cb
commit
6259b30111
2
hw/xfree86/.gitignore
vendored
2
hw/xfree86/.gitignore
vendored
|
@ -1,2 +1,4 @@
|
|||
Xorg
|
||||
xorg.conf.example
|
||||
sdksyms.c
|
||||
sdksyms.dep
|
||||
|
|
|
@ -38,10 +38,11 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
|
|||
utils doc man
|
||||
|
||||
bin_PROGRAMS = Xorg
|
||||
Xorg_SOURCES =
|
||||
nodist_Xorg_SOURCES = sdksyms.c
|
||||
|
||||
AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
|
||||
INCLUDES = @XORG_INCS@
|
||||
INCLUDES = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
|
||||
-I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac
|
||||
|
||||
noinst_LTLIBRARIES = libxorg.la
|
||||
libxorg_la_SOURCES =
|
||||
|
@ -111,3 +112,12 @@ xorg.conf.example: xorgconf.cpp
|
|||
|
||||
relink:
|
||||
$(AM_V_at)rm -f Xorg && $(MAKE) Xorg
|
||||
|
||||
CLEANFILES = sdksyms.c sdksyms.dep
|
||||
EXTRA_DIST += sdksyms.sh
|
||||
|
||||
sdksyms.dep sdksyms.c: sdksyms.sh
|
||||
CPP='$(CPP)' AWK='$(AWK)' $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(INCLUDES)
|
||||
|
||||
SDKSYMS_DEP = sdksyms.dep
|
||||
include $(SDKSYMS_DEP)
|
||||
|
|
3
hw/xfree86/loader/.gitignore
vendored
3
hw/xfree86/loader/.gitignore
vendored
|
@ -1,3 +0,0 @@
|
|||
# Add & Override for this directory and it's subdirectories
|
||||
sdksyms.c
|
||||
sdksyms.dep
|
|
@ -9,11 +9,7 @@ AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
|
|||
|
||||
EXTRA_DIST = \
|
||||
loader.h \
|
||||
loaderProcs.h \
|
||||
sdksyms.sh
|
||||
|
||||
nodist_libloader_la_SOURCES = \
|
||||
sdksyms.c
|
||||
loaderProcs.h
|
||||
|
||||
libloader_la_SOURCES = \
|
||||
loader.c \
|
||||
|
@ -23,11 +19,3 @@ libloader_la_SOURCES = \
|
|||
os.c
|
||||
|
||||
libloader_la_LIBADD = $(DLOPEN_LIBS)
|
||||
|
||||
CLEANFILES = sdksyms.c sdksyms.dep
|
||||
|
||||
sdksyms.dep sdksyms.c: sdksyms.sh $(top_builddir)/include/do-not-use-config.h
|
||||
CPP='$(CPP)' AWK='$(AWK)' $(srcdir)/sdksyms.sh $(top_srcdir) $(AM_CFLAGS) $(CFLAGS) $(INCLUDES)
|
||||
|
||||
SDKSYMS_DEP = sdksyms.dep
|
||||
include $(SDKSYMS_DEP)
|
||||
|
|
|
@ -7,7 +7,10 @@ check_LTLIBRARIES = libxservertest.la
|
|||
TESTS=$(noinst_PROGRAMS)
|
||||
|
||||
AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
|
||||
INCLUDES = @XORG_INCS@
|
||||
INCLUDES = $(XORG_INCS) -I$(top_srcdir)/hw/xfree86/parser \
|
||||
-I$(top_srcdir)/miext/cw -I$(top_srcdir)/hw/xfree86/ddc \
|
||||
-I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \
|
||||
-I$(top_srcdir)/hw/xfree86/ramdac
|
||||
TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)
|
||||
|
||||
if SPECIAL_DTRACE_OBJECTS
|
||||
|
@ -21,7 +24,7 @@ list_LDADD=$(TEST_LDADD)
|
|||
misc_LDADD=$(TEST_LDADD)
|
||||
fixes_LDADD=$(TEST_LDADD)
|
||||
|
||||
libxservertest_la_SOURCES =
|
||||
nodist_libxservertest_la_SOURCES = $(top_builddir)/hw/xfree86/sdksyms.c
|
||||
libxservertest_la_LIBADD = \
|
||||
$(XSERVER_LIBS) \
|
||||
$(top_builddir)/hw/xfree86/loader/libloader.la \
|
||||
|
|
Loading…
Reference in New Issue
Block a user