[PATCH xserver 4/5] xfree86: use links in git to share files due to upcoming automake changes

Gaetan Nadon memsize at videotron.ca
Mon Feb 17 14:33:13 PST 2014


Automake 1.14 gives us warning about source code specified in *_SOURCES
that comes from directories other than the current one. It suggests to enable
the subdir-objects feature which only supports code in sub directories.

Automake is warning us because 2.0 version will turn on this feature by default
and cannot be turned off. It assumes the object code is to be generated in the
subdirs and triggers the subdir-objects feature.

The solution the patch proposes is to use links in git to share the source
files. So in hw/xfree86/os-support/bsd,
    kmod_noop.c -> ../shared/kmod_noop.c

The Makefile will simply lists "kmod_noop.c" as opposed to
    $(srcdir)/../shared/kmod_noop.c

The will not trigger the subdir-objects feature, even in automake 2.0.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 hw/xfree86/int10/Makefile.am              |    4 ++--
 hw/xfree86/int10/linux.c                  |    1 +
 hw/xfree86/int10/linux_vm86.c             |    1 +
 hw/xfree86/os-support/bsd/Makefile.am     |   22 +++++++++++-----------
 hw/xfree86/os-support/bsd/agp_noop.c      |    1 +
 hw/xfree86/os-support/bsd/ioperm_noop.c   |    1 +
 hw/xfree86/os-support/bsd/kmod_noop.c     |    1 +
 hw/xfree86/os-support/bsd/lnx_agp.c       |    1 +
 hw/xfree86/os-support/bsd/pm_noop.c       |    1 +
 hw/xfree86/os-support/bsd/posix_tty.c     |    1 +
 hw/xfree86/os-support/bsd/sigio.c         |    1 +
 hw/xfree86/os-support/bsd/vidmem.c        |    1 +
 hw/xfree86/os-support/bsd/xf86Axp.c       |    1 +
 hw/xfree86/os-support/hurd/Makefile.am    |   14 +++++++-------
 hw/xfree86/os-support/hurd/VTsw_noop.c    |    1 +
 hw/xfree86/os-support/hurd/agp_noop.c     |    1 +
 hw/xfree86/os-support/hurd/kmod_noop.c    |    1 +
 hw/xfree86/os-support/hurd/pm_noop.c      |    1 +
 hw/xfree86/os-support/hurd/posix_tty.c    |    1 +
 hw/xfree86/os-support/hurd/sigiostubs.c   |    1 +
 hw/xfree86/os-support/hurd/vidmem.c       |    1 +
 hw/xfree86/os-support/linux/Makefile.am   |   14 +++++++-------
 hw/xfree86/os-support/linux/VTsw_usl.c    |    1 +
 hw/xfree86/os-support/linux/bios_mmap.c   |    1 +
 hw/xfree86/os-support/linux/posix_tty.c   |    1 +
 hw/xfree86/os-support/linux/sigio.c       |    1 +
 hw/xfree86/os-support/linux/vidmem.c      |    1 +
 hw/xfree86/os-support/linux/xf86Axp.c     |    1 +
 hw/xfree86/os-support/solaris/Makefile.am |   12 ++++++------
 hw/xfree86/os-support/solaris/VTsw_noop.c |    1 +
 hw/xfree86/os-support/solaris/agp_noop.c  |    1 +
 hw/xfree86/os-support/solaris/kmod_noop.c |    1 +
 hw/xfree86/os-support/solaris/posix_tty.c |    1 +
 hw/xfree86/os-support/solaris/sigio.c     |    1 +
 hw/xfree86/os-support/solaris/vidmem.c    |    1 +
 hw/xfree86/os-support/stub/Makefile.am    |   16 ++++++++--------
 hw/xfree86/os-support/stub/VTsw_noop.c    |    1 +
 hw/xfree86/os-support/stub/agp_noop.c     |    1 +
 hw/xfree86/os-support/stub/ioperm_noop.c  |    1 +
 hw/xfree86/os-support/stub/kmod_noop.c    |    1 +
 hw/xfree86/os-support/stub/pm_noop.c      |    1 +
 hw/xfree86/os-support/stub/posix_tty.c    |    1 +
 hw/xfree86/os-support/stub/sigio.c        |    1 +
 hw/xfree86/os-support/stub/vidmem.c       |    1 +
 hw/xfree86/parser/Makefile.am             |    2 +-
 hw/xfree86/parser/xprintf.c               |    1 +
 hw/xfree86/utils/cvt/Makefile.am          |    4 ++--
 hw/xfree86/utils/cvt/xf86cvt.c            |    1 +
 hw/xfree86/utils/cvt/xprintf.c            |    1 +
 49 files changed, 85 insertions(+), 44 deletions(-)
 create mode 120000 hw/xfree86/int10/linux.c
 create mode 120000 hw/xfree86/int10/linux_vm86.c
 create mode 120000 hw/xfree86/os-support/bsd/agp_noop.c
 create mode 120000 hw/xfree86/os-support/bsd/ioperm_noop.c
 create mode 120000 hw/xfree86/os-support/bsd/kmod_noop.c
 create mode 120000 hw/xfree86/os-support/bsd/lnx_agp.c
 create mode 120000 hw/xfree86/os-support/bsd/pm_noop.c
 create mode 120000 hw/xfree86/os-support/bsd/posix_tty.c
 create mode 120000 hw/xfree86/os-support/bsd/sigio.c
 create mode 120000 hw/xfree86/os-support/bsd/vidmem.c
 create mode 120000 hw/xfree86/os-support/bsd/xf86Axp.c
 create mode 120000 hw/xfree86/os-support/hurd/VTsw_noop.c
 create mode 120000 hw/xfree86/os-support/hurd/agp_noop.c
 create mode 120000 hw/xfree86/os-support/hurd/kmod_noop.c
 create mode 120000 hw/xfree86/os-support/hurd/pm_noop.c
 create mode 120000 hw/xfree86/os-support/hurd/posix_tty.c
 create mode 120000 hw/xfree86/os-support/hurd/sigiostubs.c
 create mode 120000 hw/xfree86/os-support/hurd/vidmem.c
 create mode 120000 hw/xfree86/os-support/linux/VTsw_usl.c
 create mode 120000 hw/xfree86/os-support/linux/bios_mmap.c
 create mode 120000 hw/xfree86/os-support/linux/posix_tty.c
 create mode 120000 hw/xfree86/os-support/linux/sigio.c
 create mode 120000 hw/xfree86/os-support/linux/vidmem.c
 create mode 120000 hw/xfree86/os-support/linux/xf86Axp.c
 create mode 120000 hw/xfree86/os-support/solaris/VTsw_noop.c
 create mode 120000 hw/xfree86/os-support/solaris/agp_noop.c
 create mode 120000 hw/xfree86/os-support/solaris/kmod_noop.c
 create mode 120000 hw/xfree86/os-support/solaris/posix_tty.c
 create mode 120000 hw/xfree86/os-support/solaris/sigio.c
 create mode 120000 hw/xfree86/os-support/solaris/vidmem.c
 create mode 120000 hw/xfree86/os-support/stub/VTsw_noop.c
 create mode 120000 hw/xfree86/os-support/stub/agp_noop.c
 create mode 120000 hw/xfree86/os-support/stub/ioperm_noop.c
 create mode 120000 hw/xfree86/os-support/stub/kmod_noop.c
 create mode 120000 hw/xfree86/os-support/stub/pm_noop.c
 create mode 120000 hw/xfree86/os-support/stub/posix_tty.c
 create mode 120000 hw/xfree86/os-support/stub/sigio.c
 create mode 120000 hw/xfree86/os-support/stub/vidmem.c
 create mode 120000 hw/xfree86/parser/xprintf.c
 create mode 120000 hw/xfree86/utils/cvt/xf86cvt.c
 create mode 120000 hw/xfree86/utils/cvt/xprintf.c

diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am
index 66cb14d..0f66ac1 100644
--- a/hw/xfree86/int10/Makefile.am
+++ b/hw/xfree86/int10/Makefile.am
@@ -23,8 +23,8 @@ if INT10_VM86
 AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(DIX_CFLAGS) $(XORG_CFLAGS) $(EXTRA_CFLAGS)
 libint10_la_SOURCES = \
 	$(COMMON_SOURCES) \
-	$(srcdir)/../os-support/linux/int10/vm86/linux_vm86.c \
-	$(srcdir)/../os-support/linux/int10/linux.c
+	linux_vm86.c \
+	linux.c
 endif
 
 if INT10_X86EMU
diff --git a/hw/xfree86/int10/linux.c b/hw/xfree86/int10/linux.c
new file mode 120000
index 0000000..9478e67
--- /dev/null
+++ b/hw/xfree86/int10/linux.c
@@ -0,0 +1 @@
+../os-support/linux/int10/linux.c
\ No newline at end of file
diff --git a/hw/xfree86/int10/linux_vm86.c b/hw/xfree86/int10/linux_vm86.c
new file mode 120000
index 0000000..9e3d9ac
--- /dev/null
+++ b/hw/xfree86/int10/linux_vm86.c
@@ -0,0 +1 @@
+../os-support/linux/int10/vm86/linux_vm86.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/bsd/Makefile.am b/hw/xfree86/os-support/bsd/Makefile.am
index 7133c0f..a3e6bae 100644
--- a/hw/xfree86/os-support/bsd/Makefile.am
+++ b/hw/xfree86/os-support/bsd/Makefile.am
@@ -2,25 +2,25 @@ noinst_LTLIBRARIES = libbsd.la
 
 # APM support.
 if BSD_KQUEUE_APM
-APM_SOURCES = $(srcdir)/bsd_kqueue_apm.c
+APM_SOURCES = bsd_kqueue_apm.c
 else 
 if BSD_APM
-APM_SOURCES = $(srcdir)/bsd_apm.c
+APM_SOURCES = bsd_apm.c
 else
-APM_SOURCES = $(srcdir)/../shared/pm_noop.c
+APM_SOURCES = pm_noop.c
 endif
 endif
 
 if FREEBSD_KLDLOAD
 KMOD_SOURCES = bsd_kmod.c
 else
-KMOD_SOURCES = $(srcdir)/../shared/kmod_noop.c
+KMOD_SOURCES = kmod_noop.c
 endif
 
 if AGP
-AGP_SOURCES = $(srcdir)/../linux/lnx_agp.c
+AGP_SOURCES = lnx_agp.c
 else
-AGP_SOURCES = $(srcdir)/../shared/agp_noop.c
+AGP_SOURCES = agp_noop.c
 endif
 
 if ALPHA_VIDEO
@@ -29,7 +29,7 @@ ARCH_SOURCES = \
 	alpha_video.c \
 	bsd_ev56.c \
 	bsd_axp.c \
-	$(srcdir)/../shared/xf86Axp.c
+	xf86Axp.c
 endif
 
 if ARM_VIDEO
@@ -48,7 +48,7 @@ if SPARC64_VIDEO
 # Cheat here and piggyback other sparc64 bits on SPARC64_VIDEO.
 ARCH_SOURCES = \
 	sparc64_video.c \
-	$(srcdir)/../shared/ioperm_noop.c
+	ioperm_noop.c
 endif
 
 # FIXME: NetBSD Aperture defines (configure.ac)
@@ -57,9 +57,9 @@ AM_CFLAGS = -DUSESTDRES $(XORG_CFLAGS) $(DIX_CFLAGS)
 AM_CPPFLAGS = $(XORG_INCS)
 
 libbsd_la_SOURCES = \
-	$(srcdir)/../shared/posix_tty.c \
-	$(srcdir)/../shared/sigio.c \
-	$(srcdir)/../shared/vidmem.c \
+	posix_tty.c \
+	sigio.c \
+	vidmem.c \
 	bsd_VTsw.c \
 	bsd_init.c \
 	bsd_bell.c \
diff --git a/hw/xfree86/os-support/bsd/agp_noop.c b/hw/xfree86/os-support/bsd/agp_noop.c
new file mode 120000
index 0000000..dd63e37
--- /dev/null
+++ b/hw/xfree86/os-support/bsd/agp_noop.c
@@ -0,0 +1 @@
+../shared/agp_noop.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/bsd/ioperm_noop.c b/hw/xfree86/os-support/bsd/ioperm_noop.c
new file mode 120000
index 0000000..a0f2d09
--- /dev/null
+++ b/hw/xfree86/os-support/bsd/ioperm_noop.c
@@ -0,0 +1 @@
+../shared/ioperm_noop.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/bsd/kmod_noop.c b/hw/xfree86/os-support/bsd/kmod_noop.c
new file mode 120000
index 0000000..86a8c13
--- /dev/null
+++ b/hw/xfree86/os-support/bsd/kmod_noop.c
@@ -0,0 +1 @@
+../shared/kmod_noop.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/bsd/lnx_agp.c b/hw/xfree86/os-support/bsd/lnx_agp.c
new file mode 120000
index 0000000..738109a
--- /dev/null
+++ b/hw/xfree86/os-support/bsd/lnx_agp.c
@@ -0,0 +1 @@
+../linux/lnx_agp.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/bsd/pm_noop.c b/hw/xfree86/os-support/bsd/pm_noop.c
new file mode 120000
index 0000000..2b99c76
--- /dev/null
+++ b/hw/xfree86/os-support/bsd/pm_noop.c
@@ -0,0 +1 @@
+../shared/pm_noop.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/bsd/posix_tty.c b/hw/xfree86/os-support/bsd/posix_tty.c
new file mode 120000
index 0000000..74c31e0
--- /dev/null
+++ b/hw/xfree86/os-support/bsd/posix_tty.c
@@ -0,0 +1 @@
+../shared/posix_tty.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/bsd/sigio.c b/hw/xfree86/os-support/bsd/sigio.c
new file mode 120000
index 0000000..5d3a016
--- /dev/null
+++ b/hw/xfree86/os-support/bsd/sigio.c
@@ -0,0 +1 @@
+../shared/sigio.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/bsd/vidmem.c b/hw/xfree86/os-support/bsd/vidmem.c
new file mode 120000
index 0000000..8da4c69
--- /dev/null
+++ b/hw/xfree86/os-support/bsd/vidmem.c
@@ -0,0 +1 @@
+../shared/vidmem.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/bsd/xf86Axp.c b/hw/xfree86/os-support/bsd/xf86Axp.c
new file mode 120000
index 0000000..39dfeb6
--- /dev/null
+++ b/hw/xfree86/os-support/bsd/xf86Axp.c
@@ -0,0 +1 @@
+../shared/xf86Axp.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/hurd/Makefile.am b/hw/xfree86/os-support/hurd/Makefile.am
index f228c1c..dc3f93d 100644
--- a/hw/xfree86/os-support/hurd/Makefile.am
+++ b/hw/xfree86/os-support/hurd/Makefile.am
@@ -2,13 +2,13 @@ noinst_LTLIBRARIES = libhurd.la
 
 libhurd_la_SOURCES = hurd_bell.c hurd_init.c hurd_mmap.c \
 		hurd_video.c \
-		$(srcdir)/../shared/VTsw_noop.c \
-		$(srcdir)/../shared/posix_tty.c \
-		$(srcdir)/../shared/vidmem.c \
-		$(srcdir)/../shared/sigiostubs.c \
-		$(srcdir)/../shared/pm_noop.c \
-		$(srcdir)/../shared/kmod_noop.c \
-		$(srcdir)/../shared/agp_noop.c
+		VTsw_noop.c \
+		posix_tty.c \
+		vidmem.c \
+		sigiostubs.c \
+		pm_noop.c \
+		kmod_noop.c \
+		agp_noop.c
 
 AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS)
 
diff --git a/hw/xfree86/os-support/hurd/VTsw_noop.c b/hw/xfree86/os-support/hurd/VTsw_noop.c
new file mode 120000
index 0000000..a263942
--- /dev/null
+++ b/hw/xfree86/os-support/hurd/VTsw_noop.c
@@ -0,0 +1 @@
+../shared/VTsw_noop.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/hurd/agp_noop.c b/hw/xfree86/os-support/hurd/agp_noop.c
new file mode 120000
index 0000000..dd63e37
--- /dev/null
+++ b/hw/xfree86/os-support/hurd/agp_noop.c
@@ -0,0 +1 @@
+../shared/agp_noop.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/hurd/kmod_noop.c b/hw/xfree86/os-support/hurd/kmod_noop.c
new file mode 120000
index 0000000..86a8c13
--- /dev/null
+++ b/hw/xfree86/os-support/hurd/kmod_noop.c
@@ -0,0 +1 @@
+../shared/kmod_noop.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/hurd/pm_noop.c b/hw/xfree86/os-support/hurd/pm_noop.c
new file mode 120000
index 0000000..2b99c76
--- /dev/null
+++ b/hw/xfree86/os-support/hurd/pm_noop.c
@@ -0,0 +1 @@
+../shared/pm_noop.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/hurd/posix_tty.c b/hw/xfree86/os-support/hurd/posix_tty.c
new file mode 120000
index 0000000..74c31e0
--- /dev/null
+++ b/hw/xfree86/os-support/hurd/posix_tty.c
@@ -0,0 +1 @@
+../shared/posix_tty.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/hurd/sigiostubs.c b/hw/xfree86/os-support/hurd/sigiostubs.c
new file mode 120000
index 0000000..0b6469b
--- /dev/null
+++ b/hw/xfree86/os-support/hurd/sigiostubs.c
@@ -0,0 +1 @@
+../shared/sigiostubs.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/hurd/vidmem.c b/hw/xfree86/os-support/hurd/vidmem.c
new file mode 120000
index 0000000..8da4c69
--- /dev/null
+++ b/hw/xfree86/os-support/hurd/vidmem.c
@@ -0,0 +1 @@
+../shared/vidmem.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am
index 83e7e00..5a9e558 100644
--- a/hw/xfree86/os-support/linux/Makefile.am
+++ b/hw/xfree86/os-support/linux/Makefile.am
@@ -3,8 +3,8 @@ noinst_LTLIBRARIES = liblinux.la
 if LINUX_ALPHA
 noinst_LTLIBRARIES += liblinuxev56.la
 PLATFORM_PCI_SUPPORT = \
-       $(srcdir)/lnx_axp.c \
-       $(srcdir)/../shared/xf86Axp.c
+       lnx_axp.c \
+       xf86Axp.c
 
 liblinuxev56_la_CFLAGS = $(AM_CFLAGS) -mcpu=ev56
 
@@ -23,11 +23,11 @@ endif
 
 liblinux_la_SOURCES = lnx_init.c lnx_video.c \
                      lnx_agp.c lnx_kmod.c lnx_bell.c lnx_platform.c \
-                     $(srcdir)/../shared/bios_mmap.c \
-		     $(srcdir)/../shared/VTsw_usl.c \
-		     $(srcdir)/../shared/posix_tty.c \
-                     $(srcdir)/../shared/vidmem.c \
-		     $(srcdir)/../shared/sigio.c \
+                     bios_mmap.c \
+		     VTsw_usl.c \
+		     posix_tty.c \
+                     vidmem.c \
+		     sigio.c \
                      $(ACPI_SRCS) \
                      $(APM_SRCS) \
                      $(PLATFORM_PCI_SUPPORT)
diff --git a/hw/xfree86/os-support/linux/VTsw_usl.c b/hw/xfree86/os-support/linux/VTsw_usl.c
new file mode 120000
index 0000000..9e45cf7
--- /dev/null
+++ b/hw/xfree86/os-support/linux/VTsw_usl.c
@@ -0,0 +1 @@
+../shared/VTsw_usl.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/linux/bios_mmap.c b/hw/xfree86/os-support/linux/bios_mmap.c
new file mode 120000
index 0000000..885d061
--- /dev/null
+++ b/hw/xfree86/os-support/linux/bios_mmap.c
@@ -0,0 +1 @@
+../shared/bios_mmap.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/linux/posix_tty.c b/hw/xfree86/os-support/linux/posix_tty.c
new file mode 120000
index 0000000..74c31e0
--- /dev/null
+++ b/hw/xfree86/os-support/linux/posix_tty.c
@@ -0,0 +1 @@
+../shared/posix_tty.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/linux/sigio.c b/hw/xfree86/os-support/linux/sigio.c
new file mode 120000
index 0000000..5d3a016
--- /dev/null
+++ b/hw/xfree86/os-support/linux/sigio.c
@@ -0,0 +1 @@
+../shared/sigio.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/linux/vidmem.c b/hw/xfree86/os-support/linux/vidmem.c
new file mode 120000
index 0000000..8da4c69
--- /dev/null
+++ b/hw/xfree86/os-support/linux/vidmem.c
@@ -0,0 +1 @@
+../shared/vidmem.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/linux/xf86Axp.c b/hw/xfree86/os-support/linux/xf86Axp.c
new file mode 120000
index 0000000..39dfeb6
--- /dev/null
+++ b/hw/xfree86/os-support/linux/xf86Axp.c
@@ -0,0 +1 @@
+../shared/xf86Axp.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am
index 6cda4b3..930fa99 100644
--- a/hw/xfree86/os-support/solaris/Makefile.am
+++ b/hw/xfree86/os-support/solaris/Makefile.am
@@ -1,13 +1,13 @@
 if SOLARIS_VT
 VTSW_SRC = sun_VTsw.c
 else
-VTSW_SRC = $(srcdir)/../shared/VTsw_noop.c
+VTSW_SRC = VTsw_noop.c
 endif
 
 if AGP
 AGP_SRC = sun_agp.c
 else
-AGP_SRC = $(srcdir)/../shared/agp_noop.c
+AGP_SRC = agp_noop.c
 endif
 
 SOLARIS_INOUT_SRC = solaris- at SOLARIS_INOUT_ARCH@.S
@@ -19,10 +19,10 @@ solaris- at SOLARIS_INOUT_ARCH@.il: solaris- at SOLARIS_INOUT_ARCH@.S
 noinst_LTLIBRARIES = libsolaris.la
 libsolaris_la_SOURCES = sun_init.c \
 	sun_vid.c sun_bell.c $(AGP_SRC) sun_apm.c \
-	$(srcdir)/../shared/kmod_noop.c \
-	$(srcdir)/../shared/posix_tty.c \
-	$(srcdir)/../shared/sigio.c \
-	$(srcdir)/../shared/vidmem.c \
+	kmod_noop.c \
+	posix_tty.c \
+	sigio.c \
+	vidmem.c \
 	$(VTSW_SRC)
 nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC)
 
diff --git a/hw/xfree86/os-support/solaris/VTsw_noop.c b/hw/xfree86/os-support/solaris/VTsw_noop.c
new file mode 120000
index 0000000..a263942
--- /dev/null
+++ b/hw/xfree86/os-support/solaris/VTsw_noop.c
@@ -0,0 +1 @@
+../shared/VTsw_noop.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/solaris/agp_noop.c b/hw/xfree86/os-support/solaris/agp_noop.c
new file mode 120000
index 0000000..dd63e37
--- /dev/null
+++ b/hw/xfree86/os-support/solaris/agp_noop.c
@@ -0,0 +1 @@
+../shared/agp_noop.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/solaris/kmod_noop.c b/hw/xfree86/os-support/solaris/kmod_noop.c
new file mode 120000
index 0000000..86a8c13
--- /dev/null
+++ b/hw/xfree86/os-support/solaris/kmod_noop.c
@@ -0,0 +1 @@
+../shared/kmod_noop.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/solaris/posix_tty.c b/hw/xfree86/os-support/solaris/posix_tty.c
new file mode 120000
index 0000000..74c31e0
--- /dev/null
+++ b/hw/xfree86/os-support/solaris/posix_tty.c
@@ -0,0 +1 @@
+../shared/posix_tty.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/solaris/sigio.c b/hw/xfree86/os-support/solaris/sigio.c
new file mode 120000
index 0000000..5d3a016
--- /dev/null
+++ b/hw/xfree86/os-support/solaris/sigio.c
@@ -0,0 +1 @@
+../shared/sigio.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/solaris/vidmem.c b/hw/xfree86/os-support/solaris/vidmem.c
new file mode 120000
index 0000000..8da4c69
--- /dev/null
+++ b/hw/xfree86/os-support/solaris/vidmem.c
@@ -0,0 +1 @@
+../shared/vidmem.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/stub/Makefile.am b/hw/xfree86/os-support/stub/Makefile.am
index a39e17d..fecde16 100644
--- a/hw/xfree86/os-support/stub/Makefile.am
+++ b/hw/xfree86/os-support/stub/Makefile.am
@@ -5,14 +5,14 @@ AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
 AM_CPPFLAGS = $(XORG_INCS)
 
 libstub_la_SOURCES = \
-	$(srcdir)/../shared/VTsw_noop.c \
-	$(srcdir)/../shared/agp_noop.c \
-	$(srcdir)/../shared/ioperm_noop.c \
-	$(srcdir)/../shared/kmod_noop.c \
-	$(srcdir)/../shared/pm_noop.c \
-	$(srcdir)/../shared/vidmem.c \
-	$(srcdir)/../shared/posix_tty.c \
-	$(srcdir)/../shared/sigio.c \
+	VTsw_noop.c \
+	agp_noop.c \
+	ioperm_noop.c \
+	kmod_noop.c \
+	pm_noop.c \
+	vidmem.c \
+	posix_tty.c \
+	sigio.c \
 	stub_bell.c \
 	stub_bios.c \
 	stub_init.c \
diff --git a/hw/xfree86/os-support/stub/VTsw_noop.c b/hw/xfree86/os-support/stub/VTsw_noop.c
new file mode 120000
index 0000000..a263942
--- /dev/null
+++ b/hw/xfree86/os-support/stub/VTsw_noop.c
@@ -0,0 +1 @@
+../shared/VTsw_noop.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/stub/agp_noop.c b/hw/xfree86/os-support/stub/agp_noop.c
new file mode 120000
index 0000000..dd63e37
--- /dev/null
+++ b/hw/xfree86/os-support/stub/agp_noop.c
@@ -0,0 +1 @@
+../shared/agp_noop.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/stub/ioperm_noop.c b/hw/xfree86/os-support/stub/ioperm_noop.c
new file mode 120000
index 0000000..a0f2d09
--- /dev/null
+++ b/hw/xfree86/os-support/stub/ioperm_noop.c
@@ -0,0 +1 @@
+../shared/ioperm_noop.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/stub/kmod_noop.c b/hw/xfree86/os-support/stub/kmod_noop.c
new file mode 120000
index 0000000..86a8c13
--- /dev/null
+++ b/hw/xfree86/os-support/stub/kmod_noop.c
@@ -0,0 +1 @@
+../shared/kmod_noop.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/stub/pm_noop.c b/hw/xfree86/os-support/stub/pm_noop.c
new file mode 120000
index 0000000..2b99c76
--- /dev/null
+++ b/hw/xfree86/os-support/stub/pm_noop.c
@@ -0,0 +1 @@
+../shared/pm_noop.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/stub/posix_tty.c b/hw/xfree86/os-support/stub/posix_tty.c
new file mode 120000
index 0000000..74c31e0
--- /dev/null
+++ b/hw/xfree86/os-support/stub/posix_tty.c
@@ -0,0 +1 @@
+../shared/posix_tty.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/stub/sigio.c b/hw/xfree86/os-support/stub/sigio.c
new file mode 120000
index 0000000..5d3a016
--- /dev/null
+++ b/hw/xfree86/os-support/stub/sigio.c
@@ -0,0 +1 @@
+../shared/sigio.c
\ No newline at end of file
diff --git a/hw/xfree86/os-support/stub/vidmem.c b/hw/xfree86/os-support/stub/vidmem.c
new file mode 120000
index 0000000..8da4c69
--- /dev/null
+++ b/hw/xfree86/os-support/stub/vidmem.c
@@ -0,0 +1 @@
+../shared/vidmem.c
\ No newline at end of file
diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
index 3bf62e8..4122061 100644
--- a/hw/xfree86/parser/Makefile.am
+++ b/hw/xfree86/parser/Makefile.am
@@ -31,7 +31,7 @@ libxf86config_internal_la_SOURCES = \
 	$(INTERNAL_SOURCES)
 
 libxf86config_la_SOURCES = \
-	$(top_srcdir)/os/xprintf.c \
+	xprintf.c \
 	$(INTERNAL_SOURCES)
 libxf86config_la_CFLAGS = $(AM_CFLAGS)
 libxf86config_la_LDFLAGS = -static
diff --git a/hw/xfree86/parser/xprintf.c b/hw/xfree86/parser/xprintf.c
new file mode 120000
index 0000000..9f6cde3
--- /dev/null
+++ b/hw/xfree86/parser/xprintf.c
@@ -0,0 +1 @@
+../../../os/xprintf.c
\ No newline at end of file
diff --git a/hw/xfree86/utils/cvt/Makefile.am b/hw/xfree86/utils/cvt/Makefile.am
index 26abeb4..63a0d1b 100644
--- a/hw/xfree86/utils/cvt/Makefile.am
+++ b/hw/xfree86/utils/cvt/Makefile.am
@@ -29,7 +29,7 @@ AM_CPPFLAGS = $(XORG_INCS) \
 
 # gah
 cvt_SOURCES = cvt.c \
-	$(top_srcdir)/hw/xfree86/modes/xf86cvt.c \
-	$(top_srcdir)/os/xprintf.c
+	xf86cvt.c \
+	xprintf.c
 
 cvt_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
diff --git a/hw/xfree86/utils/cvt/xf86cvt.c b/hw/xfree86/utils/cvt/xf86cvt.c
new file mode 120000
index 0000000..1216d88
--- /dev/null
+++ b/hw/xfree86/utils/cvt/xf86cvt.c
@@ -0,0 +1 @@
+../../../../hw/xfree86/modes/xf86cvt.c
\ No newline at end of file
diff --git a/hw/xfree86/utils/cvt/xprintf.c b/hw/xfree86/utils/cvt/xprintf.c
new file mode 120000
index 0000000..7024cb7
--- /dev/null
+++ b/hw/xfree86/utils/cvt/xprintf.c
@@ -0,0 +1 @@
+../../../../os/xprintf.c
\ No newline at end of file
-- 
1.7.9.5



More information about the xorg-devel mailing list