From 2d7b1893befb84850f3221cbe70b3bce4e621d63 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 2 Aug 2005 00:41:07 +0000 Subject: [PATCH] - Workaround for AS_HELP_STRING compatibility with older autoconf. - New intermediate build target for Xorg server - ia64 fixes --- configure.ac | 10 ++++++++++ hw/xfree86/Makefile.am | 21 ++++++++++++++++----- hw/xfree86/os-support/bus/Makefile.am | 10 +++++++--- hw/xfree86/os-support/linux/Makefile.am | 12 +++++++++--- hw/xfree86/os-support/misc/Makefile.am | 4 ++-- hw/xfree86/os-support/solaris/Makefile.am | 6 +++--- 6 files changed, 47 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 3fc23672c..ea9c0d11d 100644 --- a/configure.ac +++ b/configure.ac @@ -130,6 +130,8 @@ case $host_cpu in ;; esac +m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) + REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xextproto xfont xproto xtrans xau xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto" DEFAULT_VENDOR_STRING="X.Org" @@ -618,6 +620,14 @@ test x$XORG = xyes && case $host_os in XORG_OS="linux" XORG_OS_SUBDIR="linux" XORG_OS_KBD="Lnx" + case $host_cpu in + ia64*) + ia64=yes + ;; + *) + ;; + esac + AM_CONDITIONAL([LINUX_IA64], [test "x$ia64" = xyes]) ;; freebsd*) XORG_OS="freebsd" diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index 5549c4e11..a5d2f3b69 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -12,15 +12,26 @@ DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \ bin_PROGRAMS = Xorg -Xorg_SOURCES = dummy.c +Xorg_SOURCES = xorg.c -DISTCLEANFILES = dummy.c +DISTCLEANFILES = xorg.c -dummy.c: +xorg.c: touch $@ -OS_LIBS = os-support/bus/libbus.a \ - os-support/@XORG_OS_SUBDIR@/lib@XORG_OS_SUBDIR@.a os-support/misc/libmisc.a +xorgos.c: + touch $@ + +# to get the grouping semantics right, you have to glom these three together +# 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_LIBADD = os-support/@XORG_OS_SUBDIR@/lib@XORG_OS_SUBDIR@.la \ + os-support/bus/libbus.la \ + os-support/misc/libmisc.la + +OS_LIBS = libxorgos.la XORG_LIBS = \ @XORG_CORE_LIBS@ \ diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am index eff204db6..8976435ce 100644 --- a/hw/xfree86/os-support/bus/Makefile.am +++ b/hw/xfree86/os-support/bus/Makefile.am @@ -1,12 +1,16 @@ -noinst_LIBRARIES = libbus.a +noinst_LTLIBRARIES = libbus.la sdk_HEADERS = xf86Pci.h PCI_SOURCES = @XORG_OS_PCI@Pci.c ix86Pci.c -libbus_a_SOURCES = Pci.c $(PCI_SOURCES) +if LINUX_IA64 +PLATFORM_PCI_SOURCES = 460gxPCI.c altixPCI.c e8870PCI.c zx1PCI.c +endif + +libbus_la_SOURCES = Pci.c $(PCI_SOURCES) $(PLATFORM_PCI_SOURCES) if XORG_BUS_SBUS - libbus_a_SOURCES += Sbus.c + libbus_la_SOURCES += Sbus.c endif INCLUDES = $(XORG_INCS) diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am index 98dd778f9..a9dcbe6f0 100644 --- a/hw/xfree86/os-support/linux/Makefile.am +++ b/hw/xfree86/os-support/linux/Makefile.am @@ -1,5 +1,10 @@ -noinst_LIBRARIES = liblinux.a -liblinux_a_SOURCES = lnx_init.c lnx_video.c lnx_io.c lnx_kbd.c lnx_mouse.c \ +noinst_LTLIBRARIES = liblinux.la + +if LINUX_IA64 +PLATFORM_PCI_SUPPORT = $(srcdir)/../shared/ia64Pci.c +endif + +liblinux_la_SOURCES = lnx_init.c lnx_video.c lnx_io.c lnx_kbd.c lnx_mouse.c \ lnx_pci.c lnx_agp.c lnx_kmod.c lnx_KbdMap.c \ $(srcdir)/../shared/bios_mmap.c \ $(srcdir)/../shared/VTsw_usl.c \ @@ -9,7 +14,8 @@ liblinux_a_SOURCES = lnx_init.c lnx_video.c lnx_io.c lnx_kbd.c lnx_mouse.c \ $(srcdir)/../shared/sigio.c \ $(srcdir)/../shared/stdResource.c \ $(srcdir)/../shared/libc_wrapper.c \ - $(srcdir)/../shared/at_scancode.c + $(srcdir)/../shared/at_scancode.c \ + $(PLATFORM_PCI_SUPPORT) sdk_HEADERS = agpgart.h diff --git a/hw/xfree86/os-support/misc/Makefile.am b/hw/xfree86/os-support/misc/Makefile.am index a401320d6..50c061a31 100644 --- a/hw/xfree86/os-support/misc/Makefile.am +++ b/hw/xfree86/os-support/misc/Makefile.am @@ -1,6 +1,6 @@ -noinst_LIBRARIES = libmisc.a +noinst_LTLIBRARIES = libmisc.la -libmisc_a_SOURCES = Delay.c IODelay.c BUSmemcpy.c SlowBcopy.c +libmisc_la_SOURCES = Delay.c IODelay.c BUSmemcpy.c SlowBcopy.c #AM_LDFLAGS = -r diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am index 13542514a..f9e32b558 100644 --- a/hw/xfree86/os-support/solaris/Makefile.am +++ b/hw/xfree86/os-support/solaris/Makefile.am @@ -31,7 +31,7 @@ PROWORKS_ASM_FLAGS = # endif PROWORKS_INOUT_SRC = solaris-$(PROWORKS_ASM_ARCH).S PROWORKS_INOUT_OBJ = solaris-$(PROWORKS_ASM_ARCH).o -libsolaris_a_LIBADD = $(PROWORKS_INOUT_OBJ) +libsolaris_la_LIBADD = $(PROWORKS_INOUT_OBJ) #all:: $(PROWORKS_ASM_ARCH).il #includes:: $(PROWORKS_ASM_ARCH).il @@ -41,8 +41,8 @@ libsolaris_a_LIBADD = $(PROWORKS_INOUT_OBJ) $(PROWORKS_INOUT_OBJ): $(PROWORKS_INOUT_SRC) $(AS) -P -o $@ $(PROWORKS_ASM_FLAGS) $(PROWORKS_INOUT_SRC) -noinst_LIBRARIES = libsolaris.a -libsolaris_a_SOURCES = sun_bios.c sun_init.c $(IO_SRC) $(KBD_SRCS) \ +noinst_LTLIBRARIES = libsolaris.la +libsolaris_la_SOURCES = sun_bios.c sun_init.c $(IO_SRC) $(KBD_SRCS) \ sun_mouse.c sun_vid.c $(AGP_SRC) \ $(srcdir)/../shared/libc_wrapper.c \ $(srcdir)/../shared/kmod_noop.c $(srcdir)/../shared/pm_noop.c \