[xorg-commit-diffs] xc/lib/Xst Imakefile,1.1.4.1,1.1.4.2
Alan Coopersmith
xorg-commit at pdx.freedesktop.org
Wed Apr 14 18:33:24 PDT 2004
Committed by: alanc
Update of /cvs/xorg/xc/lib/Xst
In directory pdx:/tmp/cvs-serv11719/lib/Xst
Modified Files:
Tag: XORG-RELEASE-1-STSF
Imakefile
Log Message:
libXst Imakefile fixes and FreeBSD build fixes
Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/lib/Xst/Attic/Imakefile,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/Imakefile 6 Apr 2004 02:41:19 -0000 1.1.4.1
+++ b/Imakefile 15 Apr 2004 01:33:22 -0000 1.1.4.2
@@ -1,87 +1,145 @@
-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:05 cpqbld Exp $
-/******************************************************************************
- ******************************************************************************
- **
- ** Description: Imakefile for the DtPrint extension library.
- **
- ** (c) Copyright 1996 Hewlett-Packard Company
- ** (c) Copyright 1996 International Business Machines Corp.
- ** (c) Copyright 1996 Sun Microsystems, Inc.
- ** (c) Copyright 1996 Novell, Inc.
- ** (c) Copyright 1996 Digital Equipment Corp.
- ** (c) Copyright 1996 Fujitsu Limited
- ** (c) Copyright 1996 Hitachi, Ltd.
- **
- ** Permission is hereby granted, free of charge, to any person obtaining a copy
- ** of this software and associated documentation files (the "Software"), to deal
- ** in the Software without restriction, including without limitation the rights
- ** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- ** copies of the Software, and to permit persons to whom the Software is
- ** furnished to do so, subject to the following conditions:
- **
- ** The above copyright notice and this permission notice shall be included in
- ** all copies or substantial portions of the Software.
- **
- ** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- ** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- ** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- ** COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- ** IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- ** CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- **
- ** Except as contained in this notice, the names of the copyright holders shall
- ** not be used in advertising or otherwise to promote the sale, use or other
- ** dealings in this Software without prior written authorization from said
- ** copyright holders.
- **
- ******************************************************************************
- *****************************************************************************/
-XCOMM $XFree86: xc/lib/Xst/Imakefile,v 1.3 2001/01/17 19:43:01 dawes Exp $
+XCOMM
+XCOMM Copyright 2004 Sun Microsystems, Inc.
+XCOMM All rights reserved.
+XCOMM
+XCOMM Redistribution and use in source and binary forms, with or without
+XCOMM modification, are permitted provided that the following conditions
+XCOMM are met:
+XCOMM
+XCOMM 1. Redistributions of source code must retain the above copyright
+XCOMM notice, this list of conditions and the following disclaimer.
+XCOMM
+XCOMM 2. Redistributions in binary form must reproduce the above copyright
+XCOMM notice, this list of conditions and the following disclaimer in the
+XCOMM documentation and/or other materials provided with the distribution.
+XCOMM
+XCOMM 3. Neither the name of Sun Microsystems, Inc. nor the names of its
+XCOMM contributors may be used to endorse or promote products derived from
+XCOMM this software without specific prior written permission.
+XCOMM
+XCOMM This software is provided "AS IS," without a warranty of any kind.
+XCOMM
+XCOMM ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+XCOMM INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+XCOMM PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+XCOMM SUN AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES OR
+XCOMM LIABILITIES SUFFERED BY LICENSEE AS A RESULT OF OR RELATING TO USE,
+XCOMM MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS DERIVATIVES.
+XCOMM IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE,
+XCOMM PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL,
+XCOMM INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE
+XCOMM THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE
+XCOMM SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+XCOMM DAMAGES.
+XCOMM
+XCOMM You acknowledge that this software is not designed, licensed or intended
+XCOMM for use in the design, construction, operation or maintenance of any
+XCOMM nuclear facility.
+XCOMM
+XCOMM
+XCOMM @(#)Imakefile 1.35 03/11/16 SMI
+XCOMM $Id$
+
+
+#define DoNormalLib NormalLibXst
+#define DoSharedLib SharedLibXst
+#define DoDebugLib DebugLibXst
+#define DoProfileLib ProfileLibXst
+#define DoExtraLib SharedLibXt
+#define LibName Xst
+#define SoRev SOXSTREV
+
+#ifndef XBuildIncDir
+#define IncSubdir Xst
+#else
+#define IncSubdir X11
+#define IncSubSubdir Xst
+#endif
-#define DoNormalLib NormalLibXst
-#define DoSharedLib SharedLibXst
-#define DoExtraLib SharedLibXst
-#define DoDebugLib DebugLibXst
-#define DoProfileLib ProfileLibXst
-#define LibName Xst
-#define SoRev SOXSTREV
-#define LibHeaders NO
#include <Threads.tmpl>
-REQUIREDLIBS = -L$(TOP)/../stsf/STClientLibrary/src -lST -L$(TOP)/../stsf/stsflib -lstsf
+#ifdef SharedXstReqs
+REQUIREDLIBS = SharedXstReqs
+#else
+REQUIREDLIBS = $(STLIB) $(XONLYLIB)
+#endif
#if Malloc0ReturnsNull
ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
#endif
-DEFINES = $(ALLOC_DEFINES) -DUSE_XST_EXTENSION -DUSEICU
+XSTLANGLIBDIR = $(LIBDIR)/XST
+XST_DEFINES = XstDefines -DXST_LANG_LIB_PATH=\"$(XSTLANGLIBDIR)\"
-EXTRA_INCLUDES = -I../X11 -I../../include -I$(TOP)/../stsf/interface -I$(TOP)/../stsf/stsflib -I$(TOP)/../stsf/STClientLibrary/src
+DEFINES = $(ALLOC_DEFINES) $(XST_DEFINES) -DUSEICU
+INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) -I../../include $(STINC) $(ICUINC) \
+ -I$(STDIR)/stsflib -I$(STDIR)/STClientLibrary/src
-/*
- * NOTE: libXst.a has a dependency on stsf found in
- * ../../../stsf
- */
-HEADERS = Xst.h Xst_alpha.h Xst_cb.h Xst_cntl.h Xst_colors.h Xst_conv.h Xst_env.h Xst_ext.h \
- Xst_font.h Xst_fontpath.h Xst_gc.h Xst_glyph.h Xst_layoutengine.h Xst_line.h \
- Xst_private.h Xst_scaler.h Xst_space.h Xst_string.h Xst_style.h Xst_text.h \
- Xst_typedef.h Xst_util.h
+HEADERS = \
+ Xst_alpha.h \
+ Xst_cb.h \
+ Xst_colors.h \
+ Xst_conv.h \
+ Xst_cntl.h \
+ Xst_env.h \
+ Xst_ext.h \
+ Xst_font.h \
+ Xst_fontpath.h \
+ Xst_gc.h \
+ Xst_glyph.h \
+ Xst_layoutengine.h \
+ Xst_line.h \
+ Xst_private.h \
+ Xst_scaler.h \
+ Xst_space.h \
+ Xst_string.h \
+ Xst_style.h \
+ Xst_text.h \
+ Xst_typedef.h \
+ Xst_util.h \
+ Xst.h
- SRCS = Xst_cb.c Xst_cntl.c Xst_conv.c \
- Xst_env.c Xst_ext.c Xst_font.c \
- Xst_gc.c Xst_glyph.c \
- Xst_layout.c Xst_line.c Xst_scaler.c Xst_space.c \
- Xst_string.c Xst_style.c Xst_text.c Xst_util.c
+SRCS = Xst_cb.c \
+ Xst_conv.c \
+ Xst_cntl.c \
+ Xst_env.c \
+ Xst_ext.c \
+ Xst_font.c \
+ Xst_gc.c \
+ Xst_glyph.c \
+ Xst_layout.c \
+ Xst_line.c \
+ Xst_scaler.c \
+ Xst_space.c \
+ Xst_string.c \
+ Xst_style.c \
+ Xst_text.c \
+ Xst_util.c
- OBJS = Xst_cb.o Xst_cntl.o Xst_conv.o \
- Xst_env.o Xst_ext.o Xst_font.o \
- Xst_gc.o Xst_glyph.o \
- Xst_layout.o Xst_line.o Xst_scaler.o Xst_space.o \
- Xst_string.o Xst_style.o Xst_text.o Xst_util.o
+OBJS = Xst_cb.o \
+ Xst_conv.o \
+ Xst_cntl.o \
+ Xst_env.o \
+ Xst_ext.o \
+ Xst_font.o \
+ Xst_gc.o \
+ Xst_glyph.o \
+ Xst_layout.o \
+ Xst_line.o \
+ Xst_scaler.o \
+ Xst_space.o \
+ Xst_string.o \
+ Xst_style.o \
+ Xst_text.o \
+ Xst_util.o
-LINTLIBS = $(LINTXLIB) $(LINTXEXT) ../X11 ../../include/extensions
+LINTLIBS = $(LINTXLIB) $(LINTXEXT)
+
+#if (defined(SunArchitecture) && defined(SVR4Architecture))
+EXTRA_LOAD_FLAGS = ExtraLoadFlags -z defs
+#endif
#include <Library.tmpl>
More information about the xorg-commit-diffs
mailing list