andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'dbn/no-libxorg'

Browse Source
This commit is contained in:
Keith Packard 2011-06-28 09:10:14 -07:00
commit f968f4ace9
13 changed files with 35 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dix/.gitignore vendored
View File

@ -1,3 +1,2 @@
# Add & Override for this directory and it's subdirectories
dix.c
Xserver-dtrace.h

6
dix/Makefile.am
View File

@ -64,11 +64,9 @@ dtrace-dix.o: $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS)
noinst_PROGRAMS = dix.O
dix_O_SOURCES =
dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS)
$(AM_V_GEN)ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
endif
dix.c:
touch $@
CLEANFILES = dix.c Xserver-dtrace.h
CLEANFILES = Xserver-dtrace.h

4
hw/xfree86/.gitignore vendored
View File

@ -1,4 +1,4 @@
libxorg.c
Xorg
xorg.c
xorg.conf.example
sdksyms.c
sdksyms.dep

47
hw/xfree86/Makefile.am
View File

@ -38,18 +38,18 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
utils doc man
bin_PROGRAMS = Xorg
Xorg_SOURCES = xorg.c
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 = libxorg.c
libxorg_la_LIBADD = \
LOCAL_LIBS = \
$(MAIN_LIB) \
$(XSERVER_LIBS) \
loader/libloader.la \
os-support/libxorgos.la \
common/libcommon.la \
os-support/libxorgos.la \
parser/libxf86config_internal.la \
dixmods/libdixmods.la \
modes/libxf86modes.la \
@ -57,31 +57,21 @@ libxorg_la_LIBADD = \
ddc/libddc.la \
i2c/libi2c.la \
dixmods/libxorgxkb.la \
$(XORG_LIBS) \
$(top_builddir)/mi/libmi.la \
$(top_builddir)/os/libos.la \
@XORG_LIBS@
libxorg_la_DEPENDENCIES = $(libxorg_la_LIBADD)
libxorg.c xorg.c:
touch $@
DISTCLEANFILES = libxorg.c xorg.c
Xorg_DEPENDENCIES = libxorg.la
Xorg_LDADD = $(MAIN_LIB) libxorg.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)
$(top_builddir)/os/libos.la
Xorg_LDADD = \
$(LOCAL_LIBS) \
$(XORG_SYS_LIBS) \
$(XSERVER_SYS_LIBS)
Xorg_DEPENDENCIES = $(LOCAL_LIBS)
Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
BUILT_SOURCES = xorg.conf.example
DISTCLEANFILES += xorg.conf.example
DISTCLEANFILES = xorg.conf.example
EXTRA_DIST = xorgconf.cpp
if SPECIAL_DTRACE_OBJECTS
# Re-add dtrace object code that gets lost when building static libraries
Xorg_LDADD += $(XSERVER_LIBS)
endif
if SOLARIS_ASM_INLINE
# Needs to be built before any files are compiled when using Sun compilers
# so in*/out* inline definitions are properly processed.
@ -116,3 +106,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
View File

@ -1,3 +0,0 @@
# Add & Override for this directory and it's subdirectories
sdksyms.c
sdksyms.dep

14
hw/xfree86/loader/Makefile.am
View File

@ -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)

2
hw/xfree86/os-support/.gitignore vendored
View File

@ -1,2 +0,0 @@
# Add & Override for this directory and it's subdirectories
xorgos.c

7
hw/xfree86/os-support/Makefile.am
View File

@ -9,18 +9,13 @@ EXTRA_DIST = int10Defines.h xf86OSpriv.h
# as one library, otherwise libtool will actively defeat your attempts to
# list them multiple times on the link line.
noinst_LTLIBRARIES = libxorgos.la
libxorgos_la_SOURCES = xorgos.c
libxorgos_la_SOURCES =
libxorgos_la_LIBADD = @XORG_OS_SUBDIR@/lib@XORG_OS_SUBDIR@.la \
bus/libbus.la \
misc/libmisc.la
AM_CFLAGS = $(DIX_CFLAGS)
xorgos.c:
touch $@
DISTCLEANFILES = xorgos.c
# FIXME: These don't seem to be used anywhere
EXTRA_DIST += \
shared/bios_devmem.c

0
hw/xfree86/loader/sdksyms.sh → hw/xfree86/sdksyms.sh
View File

2
os/.gitignore vendored
View File

@ -1,2 +0,0 @@
# Add & Override for this directory and it's subdirectories
os.c

6
os/Makefile.am
View File

@ -51,11 +51,7 @@ dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS)
noinst_PROGRAMS = os.O
os_O_SOURCES =
os.O: dtrace.o $(am_libos_la_OBJECTS)
$(AM_V_GEN)ld -r -o $@ dtrace.o .libs/*.o
endif
os.c:
touch $@
CLEANFILES = os.c

1
test/.gitignore vendored
View File

@ -1,4 +1,3 @@
libxservertest.c
xkb
input
xtest

12
test/Makefile.am
View File

@ -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,6 +24,7 @@ list_LDADD=$(TEST_LDADD)
misc_LDADD=$(TEST_LDADD)
fixes_LDADD=$(TEST_LDADD)
nodist_libxservertest_la_SOURCES = $(top_builddir)/hw/xfree86/sdksyms.c
libxservertest_la_LIBADD = \
$(XSERVER_LIBS) \
$(top_builddir)/hw/xfree86/loader/libloader.la \
@ -33,14 +37,8 @@ libxservertest_la_LIBADD = \
$(top_builddir)/hw/xfree86/ddc/libddc.la \
$(top_builddir)/hw/xfree86/i2c/libi2c.la \
$(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \
$(top_builddir)/hw/xfree86/libxorg.la \
$(top_builddir)/mi/libmi.la \
$(top_builddir)/os/libos.la \
@XORG_LIBS@
endif
endif
CLEANFILES=libxservertest.c
libxservertest.c:
touch $@