[xserver-commit] xserver/hw/xizzle/os-support Makefile.am,3.4,3.5 README.OS-lib,3.11,3.12 xf86_OSlib.h,3.97,3.98 xf86_ansic.h,3.55,3.56

Daniel Stone xserver-commit@pdx.freedesktop.org
Previous message: [xserver-commit] xserver/hw/xizzle/docs XFree86.man,1.1,1.2
Next message: [xserver-commit] xserver/hw/xizzle/int10 Makefile.am,1.3,1.4
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Committed by: daniel

Update of /cvs/xserver/xserver/hw/xizzle/os-support
In directory pdx:/tmp/cvs-serv3345/os-support

Modified Files:
	Makefile.am README.OS-lib xf86_OSlib.h xf86_ansic.h 
Log Message:
Down to 20 link errors now (count 'em!).

        * *.c:
        * *.h:
        Get rid of all references to SCO.

        * hw/xizzle/*/Makefile.am:
        Change SDK include dir to $(includedir)/xizzle.
        Add SDK libs where necessary.

        * hw/xizzle/Makefile.am:
        Reformat to be nicer and easier to shuffle around; also, fix lib
        ordering so we get so much closer to the elusive final link.
        Shuffle common/xf86Init.c into libxizzle.a.

        * hw/xizzle/common/Makefile.am:
        Fix a couple of early snafus - s/BUILDXI/XINPUT/, et al; make the SDK
        stuff conditional as needed; fix the SBus includes.

        * hw/xizzle/os-support/Makefile.am:
        Name library os-support/libxizzleos.a, not
        os-support/foo/libxizzlefoo.a.
        Clean up ARCH_SOURCES so it's always initialised to something.

        * hw/xizzle/os-support/linux/Makefile.am:
        Move linked libraries to _LIBADD, which somehow escaped my attention.
        Make inclusion of drm/libxizzlelinuxdrm.a dependent on DRI.

        * hw/xizzle/vbe/vbe.c:
        s/VERSION/VBE_VERSION/;

        * hw/xizzle/Xi:
        Axe this redundant dir.

        * configure.ac:
        All Xizzle-specific: axe hw/xizzle/Xi, shuffle link order, fix list of
        required modules to be vaguely sane, add some pertinent libs/incs.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/os-support/Makefile.am,v
retrieving revision 3.4
retrieving revision 3.5
diff -u -d -r3.4 -r3.5
--- a/Makefile.am	7 Mar 2004 13:12:48 -0000	3.4
+++ b/Makefile.am	10 Mar 2004 11:50:32 -0000	3.5
@@ -1,5 +1,12 @@
 SUBDIRS = bus $(XIZZLE_OS_SUBDIR)
 
-sdk_INCLUDEDIR = $(includedir)/X11/XIZZLESDK
+OS_TARGET = $(XIZZLE_OS_SUBDIR)/libxizzle$(XIZZLE_OS_SUBDIR).a
+
+all: libxizzleos.a
+
+libxizzleos.a: $(OS_TARGET)
+	ln -s $(OS_TARGET) $@
+
+sdk_INCLUDEDIR = $(includedir)/xizzle
 sdk_INCLUDES = xf86_OSproc.h xf86_OSlib.h xf86_ansic.h xf86_libc.h xf86drm.h \
                xf86drmCompat.h assyntax.h

Index: README.OS-lib
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/os-support/README.OS-lib,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -d -r3.11 -r3.12
--- a/README.OS-lib	19 Feb 2004 03:51:37 -0000	3.11
+++ b/README.OS-lib	10 Mar 2004 11:50:32 -0000	3.12
@@ -39,7 +39,6 @@
 		bsdi/	OS support for the BSD/386 operating system.
 		linux/	OS support for the Linux operating system.
 		os2/	OS support for OS/2 2.11 and OS/2 Warp
-		sco/	OS support for the SCO SVR3.x operating system.
 		solx86/	OS support for the Solaris x86 operating system.
 		sysv/	OS support for all SVR4.0 and SVR4.2, and for
 			ISC and AT&T SVR3.2 operating systems.

Index: xf86_OSlib.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/os-support/xf86_OSlib.h,v
retrieving revision 3.97
retrieving revision 3.98
diff -u -d -r3.97 -r3.98
--- a/xf86_OSlib.h	4 Mar 2004 02:33:00 -0000	3.97
+++ b/xf86_OSlib.h	10 Mar 2004 11:50:32 -0000	3.98
@@ -107,20 +107,12 @@
     !defined(DGUX) && !defined(sgi) && \
     !defined(__SOL8__) && \
     (!defined(sun) || defined(i386))
-# ifdef SCO325
-#  ifndef _SVID3
-#   define _SVID3
-#  endif
-#  ifndef _NO_STATIC
-#   define _NO_STATIC
-#  endif
-# endif
 # include <sys/ioctl.h>
 # include <signal.h>
 # include <termio.h>
 # include <sys/stat.h>
 # include <sys/types.h>
-# if defined(SCO) || defined(ISC)
+# if defined(ISC)
 # include <sys/param.h>
 # endif
 
@@ -175,40 +167,19 @@
 # if !defined(sun)
 #  include <sys/emap.h>
 # endif
-# if defined(SCO)
-#  include <sys/vtkd.h>
-#  include <sys/console.h>
-#  include <sys/scankbd.h>
-#  include <sys/vid.h>
-#  define LED_CAP CLKED
-#  define LED_NUM NLKED
-#  define LED_SCR SLKED
-# elif defined(HAS_USL_VTS)
+# if defined(HAS_USL_VTS)
 #  include <sys/at_ansi.h>
 #  include <sys/kd.h>
 #  include <sys/vt.h>
-# endif /* SCO */
-
-# if !defined(VT_ACKACQ)
-#  define VT_ACKACQ 2
-# endif /* !VT_ACKACQ */
-
-# if defined(SCO)
-#  include <sys/sysmacros.h>
-#  define POSIX_TTY
-# endif /* SCO */
+# endif /* HAS_USL_VTS */
 
-# if defined(SVR4) || defined(SCO325)
+# if defined(SVR4)
 #  include <sys/mman.h>
 #  if !(defined(sun) && defined (i386) && defined (SVR4))
 #    define DEV_MEM "/dev/pmem"
 #  elif defined(PowerMAX_OS)
 #    define DEV_MEM "/dev/iomem"
 #  endif
-#  ifdef SCO325
-#   undef DEV_MEM
-#   define DEV_MEM "/dev/mem"
-#  endif
 #  define CLEARDTR_SUPPORT
 #  define POSIX_TTY
 # endif /* SVR4 */
@@ -227,7 +198,7 @@
 #  define i386 /* not defined in ANSI C mode */
 # endif /* ATT && !i386 */
 
-# if (defined(ATT) || defined(SVR4)) && !defined(sun) && !defined(SCO325)
+# if (defined(ATT) || defined(SVR4)) && !defined(sun)
 #  ifndef XQUEUE
 #   define XQUEUE
 #  endif
@@ -305,7 +276,6 @@
 
 #undef HAS_USL_VTS
 #undef USE_VT_SYSREQ
-#undef VT_ACKACQ
 
 #define LED_CAP KBD_LED_CAPS_LOCK
 #define LED_NUM KBD_LED_NUM_LOCK
@@ -389,9 +359,6 @@
 # define KB_101 	2
 # define KB_OTHER	3
 
-/* atc drivers ignores argument to VT_RELDISP ioctl */
-# define VT_ACKACQ	2
-
 # include <termios.h>
 # define POSIX_TTY
 # define CLEARDTR_SUPPORT

Index: xf86_ansic.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/os-support/xf86_ansic.h,v
retrieving revision 3.55
retrieving revision 3.56
diff -u -d -r3.55 -r3.56
--- a/xf86_ansic.h	4 Mar 2004 02:33:01 -0000	3.55
+++ b/xf86_ansic.h	10 Mar 2004 11:50:32 -0000	3.56
@@ -38,7 +38,7 @@
 
 #if defined(XFree86LOADER) || defined(NEED_XF86_TYPES)
 
-#if !defined(SYSV) && !defined(SVR4) && !defined(Lynx) || defined(SCO)
+#if !defined(SYSV) && !defined(SVR4) && !defined(Lynx)
 #define HAVE_VSSCANF
 #define HAVE_VFSCANF
 #endif 
@@ -222,8 +222,6 @@
 extern char* xf86strcpy(char*,const char*);
 extern xf86size_t xf86strcspn(const char*,const char*);
 extern char* xf86strerror(int);
-extern xf86size_t xf86strlcat(char*,const char*,xf86size_t);
-extern xf86size_t xf86strlcpy(char*,const char*,xf86size_t);
 extern xf86size_t xf86strlen(const char*);
 extern char* xf86strncat(char *, const char *, xf86size_t);
 extern int xf86strncmp(const char*,const char*,xf86size_t);
Previous message: [xserver-commit] xserver/hw/xizzle/docs XFree86.man,1.1,1.2
Next message: [xserver-commit] xserver/hw/xizzle/int10 Makefile.am,1.3,1.4
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]