Skip to content

N
nx-libs
Commit e77bf36d authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

release 3.5.0.19

parent d16188f0
Expand all Show whitespace changes
Inline Side-by-side
Showing with 270 additions and 236 deletions
debian/changelog
View file @ e77bf36d
nx-libs (2:3.5.0.19-0) UNRELEASED; urgency=low
nx-libs (2:3.5.0.19-0) unstable; urgency=low
* Add Jan's reasoning for using string_rep() instead of bash based
string substitutions as comment to /debian/Makefile.replaces.sh.
* Fix FTBFS for .deb packages after including fix for #145.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 23 Mar 2013 00:42:01 +0100
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 28 Mar 2013 08:55:02 +0100
nx-libs (2:3.5.0.18-0) unstable; urgency=low
......
nx-X11/Makefile
View file @ e77bf36d
......@@ -32,8 +32,8 @@ VERSSRC = $(CONFIGSRC)/util/printver.c
VERSPROG = $(CONFIGSRC)/util/printver.exe
all:
@$(MAKE_CMD) xmakefile-exists || $(MAKE) all-initial
@$(MAKE_CMD) $@
@${MAKE} ${MAKE_OPTS} xmakefile-exists || $(MAKE) all-initial
@${MAKE} ${MAKE_OPTS} $@
all-initial:
@echo Please use make World, or on NT use nmake World.Win32.
......@@ -57,8 +57,8 @@ World:
@date
@echo ""
@if [ -f xmakefile ]; then \
$(MAKE_CMD) -k distclean || \
$(MAKE_CMD) -k clean || \
${MAKE} ${MAKE_OPTS} -k distclean || \
${MAKE} ${MAKE_OPTS} -k clean || \
$(RM) xmakefile; \
fi
@if [ ! -f $(IRULESRC)/host.def ]; then \
......@@ -84,14 +84,14 @@ World:
# fi
cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean
$(MAKE) $(MFLAGS) Makefile.boot
$(MAKE_CMD) $(MFLAGS) version.def
${MAKE} ${MAKE_OPTS} $(MFLAGS) version.def
$(MAKE) $(MFLAGS) Makefile.boot
$(MAKE_CMD) $(MFLAGS) VerifyOS
$(MAKE_CMD) $(MFLAGS) Makefiles
$(MAKE_CMD) $(MFLAGS) BOOTSTRAPSUBDIRS= clean
$(MAKE_CMD) $(MFLAGS) includes
$(MAKE_CMD) $(MFLAGS) depend
$(MAKE_CMD) $(MFLAGS) $(WORLDOPTS) World
${MAKE} ${MAKE_OPTS} $(MFLAGS) VerifyOS
${MAKE} ${MAKE_OPTS} $(MFLAGS) Makefiles
${MAKE} ${MAKE_OPTS} $(MFLAGS) BOOTSTRAPSUBDIRS= clean
${MAKE} ${MAKE_OPTS} $(MFLAGS) includes
${MAKE} ${MAKE_OPTS} $(MFLAGS) depend
${MAKE} ${MAKE_OPTS} $(MFLAGS) $(WORLDOPTS) World
@echo ""
@date
@echo ""
......@@ -138,6 +138,7 @@ Makefile::
xmakefile: Imakefile
$(RM) xmakefile
@rm -f $(IRULESRC)/date.def; echo "" > $(IRULESRC)/date.def;
$(IMAKE_CMD) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
World.Win32:
......@@ -153,15 +154,15 @@ World.Win32:
-if exist xmakefile.bak del xmakefile.bak
-if exist xmakefile ren xmakefile xmakefile.bak
$(IMAKE:/=\) -s xmakefile -I$(IRULESRC) $(IMAKE_DEFINES) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
$(MAKE_CMD) $(MFLAGS) VerifyOS
$(MAKE_CMD) $(MFLAGS) Makefiles
$(MAKE_CMD) $(MFLAGS) clean
${MAKE} ${MAKE_OPTS} $(MFLAGS) VerifyOS
${MAKE} ${MAKE_OPTS} $(MFLAGS) Makefiles
${MAKE} ${MAKE_OPTS} $(MFLAGS) clean
cd $(CONFIGSRC)\util
$(MAKE) mkdirhier.exe
cd ..\..
$(MAKE_CMD) $(MFLAGS) includes
$(MAKE_CMD) $(MFLAGS) depend
$(MAKE_CMD) $(MFLAGS) $(WIN32WORLDOPTS)
${MAKE} ${MAKE_OPTS} $(MFLAGS) includes
${MAKE} ${MAKE_OPTS} $(MFLAGS) depend
${MAKE} ${MAKE_OPTS} $(MFLAGS) $(WIN32WORLDOPTS)
@echo :
@echo :
@echo Full build of $(RELEASE) complete.
......@@ -197,33 +198,38 @@ World.OS2:
# a copy of every rule that might be invoked at top level
clean:
$(MAKE_CMD) $@
-${MAKE_CMD} ${MAKE_OPTS} $@
find config -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
find lib -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
find programs -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
find include -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
rm -f config/cf/{version.def,date.def}
dangerous_strip_clean:
$(MAKE_CMD) $@
${MAKE} ${MAKE_OPTS} $@
distclean:
$(MAKE_CMD) $@
-${MAKE} ${MAKE_OPTS} $@
$(RM) xmakefile $(IRULESRC)/version.def $(IRULESRC)/date.def
depend:
$(MAKE_CMD) $@
${MAKE} ${MAKE_OPTS} $@
Everything:
$(MAKE_CMD) $@
${MAKE} ${MAKE_OPTS} $@
external.ln:
$(MAKE_CMD) $@
${MAKE} ${MAKE_OPTS} $@
includes:
$(MAKE_CMD) $@
${MAKE} ${MAKE_OPTS} $@
install.sdk:
$(MAKE_CMD) $@
${MAKE} ${MAKE_OPTS} $@
install.ln:
$(MAKE_CMD) $@
${MAKE} ${MAKE_OPTS} $@
install.man:
$(MAKE_CMD) $@
${MAKE} ${MAKE_OPTS} $@
install:
$(MAKE_CMD) $@
${MAKE} ${MAKE_OPTS} $@
Makefiles:
$(MAKE_CMD) $@
${MAKE} ${MAKE_OPTS} $@
man_keywords:
$(MAKE_CMD) $@
${MAKE} ${MAKE_OPTS} $@
tags:
$(MAKE_CMD) $@
${MAKE} ${MAKE_OPTS} $@
VerifyOS:
$(MAKE_CMD) $@
${MAKE} ${MAKE_OPTS} $@
nx-X11/config/cf/Imake.rules
View file @ e77bf36d
......@@ -2124,9 +2124,9 @@ LintLibReferences(varname,libname,libsource)
*/
#ifndef ProjectUnsharedFontLibReferences
#define ProjectUnsharedFontLibReferences() @@\
DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(Xfont)) @@\
FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\
LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
DEPFONTLIB = _UseCat($(USRLIBDIR)/,XBuildLibDir/,LibraryTargetName(NX_Xfont)) @@\
FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\
LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC))
#endif
/*
......@@ -2142,9 +2142,9 @@ LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
#ifndef SharedFontLibReferences
#define SharedFontLibReferences() @@\
SOFONTREV = SharedFontRev @@\
DEPFONTLIB = SharedLibDependencies(Xfont,$(FONTLIBSRC),SOFONTREV) @@\
FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\
LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
DEPFONTLIB = SharedLibDependencies(NX_Xfont,$(FONTLIBSRC),SOFONTREV) @@\
FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\
LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC))
#endif
/*
......
nx-X11/config/cf/Imake.tmpl
View file @ e77bf36d
......@@ -820,12 +820,12 @@ TCLIBDIR = TclLibDir
#ifndef UsrLibDir
#ifdef ProjectRoot
#define UsrLibDir Concat3(ProjectRoot,/,LibDirName)
#define UsrLibDir Concat4(ProjectRoot,/,LibDirName,/nx)
#ifndef AlternateUsrLibDir
#define AlternateUsrLibDir YES
#endif
#else
#define UsrLibDir Concat3(/usr,/,LibDirName)
#define UsrLibDir Concat4(/usr,/,LibDirName,/nx)
#ifndef AlternateUsrLibDir
#define AlternateUsrLibDir NO
#endif
......@@ -863,7 +863,7 @@ TCLIBDIR = TclLibDir
#endif
#ifndef IncRoot
#ifdef ProjectRoot
#define IncRoot Concat(ProjectRoot,/include)
#define IncRoot Concat(ProjectRoot,/include/nx)
#ifndef AlternateIncRoot
#define AlternateIncRoot YES
#endif
......
nx-X11/config/cf/Motif.tmpl
View file @ e77bf36d
......@@ -465,9 +465,9 @@ TOP_MOTIF_INCLUDES = -I$(MINCLUDESRC)
#endif
#if SharedLibXm
SharedLibReferences(XM,Xm,$(MWIDGETSRC),SOXMREV,SharedXmRev)
SharedLibReferences(XM,NX_Xm,$(MWIDGETSRC),SOXMREV,SharedXmRev)
#else
ProjectUnsharedLibReferences(XM,Xm,$(MWIDGETSRC),MBuildLibDir)
ProjectUnsharedLibReferences(XM,NX_Xm,$(MWIDGETSRC),MBuildLibDir)
#endif
#if SharedLibMrm
......
nx-X11/config/cf/X11.rules
View file @ e77bf36d
......@@ -36,17 +36,17 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
#endif
#if defined(X11ProjectRoot)
# define XBinDir $(XPROJECTROOT)/bin
# define XBinDir $(XPROJECTROOT)/lib/nx/bin
#elif defined(ProjectRoot)
# define XBinDir $(PROJECTROOT)/bin
# define XBinDir $(PROJECTROOT)/lib/nx/bin
#else
# define XBinDir $(BINDIR)
#endif
#ifdef X11ProjectRoot
# define XUsrLibDirPath $(USRLIBDIR):$(XPROJECTROOT)/lib
# define XUsrLibDirPath $(USRLIBDIR)/nx:$(XPROJECTROOT)
#else
# define XUsrLibDirPath $(USRLIBDIR)
# define XUsrLibDirPath $(USRLIBDIR)/nx
#endif
#ifdef UsrLibDirPath
# undef UsrLibDirPath
......@@ -60,7 +60,7 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
#if ImportX11
# define XLdPreLibs -L$(LIBSRC)
#elif defined(UseInstalledX11) && defined(X11ProjectRoot)
# define XLdPreLibs -L$(XPROJECTROOT)/lib
# define XLdPreLibs -L$(XPROJECTROOT)
#else
# define XLdPreLibs /**/
#endif
......@@ -70,7 +70,7 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
#define LdPreLibs LdPreLib XLdPreLibs
#ifdef X11ProjectRoot
# define XLdPostLibs -L$(XPROJECTROOT)/lib
# define XLdPostLibs -L$(XPROJECTROOT)
#else
# define XLdPostLibs /**/
#endif
......@@ -86,7 +86,7 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
# define TopXInclude -I$(TOP)/exports/include
#else
# ifdef X11ProjectRoot
# define TopXInclude -I$(XPROJECTROOT)/include
# define TopXInclude -I$(XPROJECTROOT)/../../include/nx
# else
# define TopXInclude /**/
# endif
......@@ -98,7 +98,7 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
#define TopIncludes TopInclude $(TOP_X_INCLUDES)
#if UseInstalledX11 && defined(X11ProjectRoot)
# define X11BuildLibPath $(XPROJECTROOT)/lib
# define X11BuildLibPath $(XPROJECTROOT)
#elif UseInstalledX11
# define X11BuildLibPath $(USRLIBDIR)
#elif ImportX11
......
nx-X11/config/cf/bsdLib.rules
View file @ e77bf36d
......@@ -134,9 +134,9 @@ LintLibReferences(varname,libname,libsource)
#ifndef SharedFontLibReferences
#define SharedFontLibReferences() @@\
SOFONTREV = SharedFontRev @@\
DEPFONTLIB = SharedLibDependencies(Xfont,$(FONTLIBSRC),SOFONTREV) @@\
FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lXfont @@\
LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
DEPFONTLIB = SharedLibDependencies(NX_Xfont,$(FONTLIBSRC),SOFONTREV) @@\
FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) LoaderLibPrefix -lNX_Xfont @@\
LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC))
#endif
/*
......
nx-X11/config/cf/bsdLib.tmpl
View file @ e77bf36d
......@@ -38,7 +38,7 @@ XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.23 2003/11/04 01:59:31 dawes Exp $
#ifndef FixupLibReferences
#define FixupLibReferences() @@\
XMULIBONLY = -lXmu @@\
XMULIBONLY = -lNX_Xmu @@\
XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
#endif
......
nx-X11/config/cf/bsdiLib.tmpl
View file @ e77bf36d
......@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/config/cf/bsdiLib.tmpl,v 3.3 2003/05/29 21:56:57 herrb Exp $
#ifndef FixupLibReferences
#define FixupLibReferences() @@\
XMULIBONLY = -lXmu @@\
XMULIBONLY = -lNX_Xmu @@\
XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
#endif
......
nx-X11/config/cf/convex.cf
View file @ e77bf36d
......@@ -90,9 +90,9 @@ DEPMRESOURCELIB = _UseCat($(USRLIBDIR),$(MRESOURCESRC),/libMrm.a)
LINTMRESOURCELIB= _UseCat($(LINTLIBDIR),$(MRESOURCESRC),/llib-lMrm.ln)
XMLIBSRC = $(LIBSRC)/Xm
DEPXMLIB = _UseCat($(USRLIBDIR),$(XMLIBSRC),/libXm.a)
XMLIB = LoaderLibPrefix _Use(-lXm,$(DEPXMLIB))
LINTXMLIB = _UseCat($(LINTLIBDIR),$(XMLIBSRC),/llib-lXm.ln)
DEPXMLIB = _UseCat($(USRLIBDIR),$(XMLIBSRC),/libNX_Xm.a)
XMLIB = LoaderLibPrefix _Use(-lNX_Xm,$(DEPXMLIB))
LINTXMLIB = _UseCat($(LINTLIBDIR),$(XMLIBSRC),/llib-lNX_Xm.ln)
UILLIBSRC = $(LIBSRC)/uil
DEPUILLIB = _UseCat($(USRLIBDIR),$(UILLIBSRC),/libUil.a)
......
nx-X11/config/cf/cygwin.tmpl
View file @ e77bf36d
......@@ -50,7 +50,7 @@ XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.18 2003/10/19 08:27:05 herrb Exp $
#ifndef FixupLibReferences
# define FixupLibReferences() @@\
XMULIBONLY = -lXmu @@\
XMULIBONLY = -lNX_Xmu @@\
XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
#endif
......
nx-X11/config/cf/darwinLib.tmpl
View file @ e77bf36d
......@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/config/cf/darwinLib.tmpl,v 1.19 2003/11/04 00:24:36 torrey Ex
#ifndef FixupLibReferences
#define FixupLibReferences() @@\
XMULIBONLY = -lXmu @@\
XMULIBONLY = -lNX_Xmu @@\
XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
#endif
......
nx-X11/config/cf/gnuLib.tmpl
View file @ e77bf36d
......@@ -6,7 +6,7 @@ XCOMM
#ifndef FixupLibReferences
#define FixupLibReferences() @@\
XMULIBONLY = -lXmu @@\
XMULIBONLY = -lNX_Xmu @@\
XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
#endif
......
nx-X11/config/cf/host.def
View file @ e77bf36d
......@@ -138,7 +138,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define BuildRenderLibrary YES
#define SharedLibFreetype2 YES
#define NormalLibFreetype2 YES
#define FontLibSharedFreeType NO
#define FontLibSharedFreeType YES
#endif
/*
......@@ -649,6 +649,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
*
#define XserverStaticFontLib NO
*/
#define XserverStaticFontLib YES
/*
* To enable binary compatibility with previous versions of the font
......@@ -686,7 +687,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
*
#define BuildXinerama NO
*/
#define BuildXinerama NO
#define BuildXinerama YES
/*
* If you don't want to build support for the GLX extension, uncomment this.
......@@ -733,7 +734,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define BuildXKB YES
#define BuildXKBlib YES
#define SharedLibXau NO
#define SharedLibXau YES
/*
* If you are running NetBSD 0.9C or later, and have the aperture driver
......@@ -956,9 +957,9 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define BuildXterm YES
*/
#define SharedLibXau NO
#define SharedLibXau YES
#define SharedLibXdmcp NO
#define SharedLibXdmcp YES
#define BuildXaw7 YES
......@@ -976,7 +977,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define BuildFontServer NO
#define BuildFreeType NO
#define BuildXTrueType NO
#define FontLibSharedFreeType NO
#define FontLibSharedFreeType YES
#endif
#if !defined(NXZaurusXServer) && defined(NXiPAQXServer)
......
nx-X11/config/cf/ibmLib.rules
View file @ e77bf36d
......@@ -127,23 +127,23 @@ LintLibReferences(varname,libname,libsource)
# ifndef SharedFontLibReferences
# define SharedFontLibReferences() @@\
DEPFONTLIB = /**/ @@\
FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(FONTLIBSRC)/libXfont.a) @@\
LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
FONTLIB = -L$(FREETYPELIBDIR) _Use(-lNX_Xfont,$(FONTLIBSRC)/libNX_Xfont.a) @@\
LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC))
# endif
# else
# ifndef SharedFontLibReferences
# define SharedFontLibReferences() @@\
DEPFONTLIB = /**/ @@\
FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(BUILDLIBDIR)/font.imp) $(BUILDLIBDI)/libXfont.a)) @@\
LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
FONTLIB = -L$(FREETYPELIBDIR) _Use(-lNX_Xfont,$(BUILDLIBDIR)/font.imp) $(BUILDLIBDI)/libNX_Xfont.a)) @@\
LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC))
# endif
# endif
# else /* OSMajorVersion < 5 */
# ifndef SharedFontLibReferences
# define SharedFontLibReferences() @@\
DEPFONTLIB = /**/ @@\
FONTLIB = -L$(FREETYPELIBDIR) _Use(-lXfont,$(BUILDLIBDI)/libXfont.so)) @@\
LintLibReferences(XFONT,Xfont,$(FONTLIBSRC))
FONTLIB = -L$(FREETYPELIBDIR) _Use(-lNX_Xfont,$(BUILDLIBDI)/libNX_Xfont.so)) @@\
LintLibReferences(XFONT,NX_Xfont,$(FONTLIBSRC))
# endif
# endif
......
nx-X11/config/cf/ibmLib.tmpl
View file @ e77bf36d
......@@ -81,7 +81,7 @@ XCOMM $XFree86: xc/config/cf/ibmLib.tmpl,v 1.3tsi Exp $
/* we want this to be defined only when building X */
# ifndef FixupLibReferences
# define FixupLibReferences() @@\
DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libXt.a)
DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libNX_Xt.a)
# endif
#endif
......
nx-X11/config/cf/linux.cf
View file @ e77bf36d
......@@ -1054,7 +1054,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
#if HaveLib64
# ifndef LibDirName
# define LibDirName lib64
# define LibDirName lib
# endif
# ifndef SystemUsrLibDir
# define SystemUsrLibDir /usr/lib64
......
nx-X11/config/cf/lnxLib.rules
View file @ e77bf36d
......@@ -389,7 +389,7 @@ JUMP_LDLIBS_libc = `$(CC) --print-libgcc-file-name` -lc
XCOMM libX11.so (X11, SM, ICE)
JUMP_ROOT_X11 = $(XLIBSRC)
JUMP_IS_HOST_X11 = YES
JUMP_STUBLIBS_X11 = libX11.sa libSM.sa libICE.sa
JUMP_STUBLIBS_X11 = libNX_X11.sa libNX_SM.sa libNX_ICE.sa
JUMP_SIBDIRS_X11 = $(JUMP_ROOT_SM) $(JUMP_ROOT_ICE)
JUMP_DIR_X11 = $(JUMP_ROOT_X11)/shared
JUMP_DEFS_X11 = $(XDMAUTHDEFS) $(XKB_DEFINES)
......@@ -400,9 +400,9 @@ JUMP_EXPORT_X11 = $(JUMP_DIR_X11)/jump.vars
JUMP_ADDRESS_X11 = 0x60200000
JUMP_JUMPTABLESIZE_X11 = 0x4000
JUMP_GOTSIZE_X11 = 4096
JUMP_STUBNAMES_X11 = libX11 libSM libICE
JUMP_STUBNAMES_X11 = libNX_X11 libNX_SM libNX_ICE
JUMP_STUBS_IMPORT_X11 = $(LIBC_SA)
JUMP_SIBARS_X11 = jump/libSM.a~ jump/libICE.a~
JUMP_SIBARS_X11 = jump/libNX_SM.a~ jump/libNX_ICE.a~
JUMP_LDLIBS_X11 = $(JUMP_SIBARS_X11) $(JUMP_LDLIBS_libc)
XCOMM libSM (part of libX11.so)
......@@ -435,9 +435,9 @@ JUMP_JUMPTABLESIZE_Xt = 0x4000
JUMP_GOTSIZE_Xt = 4096
JUMP_STUBNAMES_Xt = libXt libXmu libXext libXi libXtst libXp
JUMP_STUBS_IMPORT_Xt = $(JUMP_STUBS_IMPORT_X11)
JUMP_SIBARS_Xt = jump/libXmu.a~ jump/libXext.a~ jump/libXi.a~ jump/libXtst.a~ jump/libXp.a~
JUMP_LDLIBS_Xt = $(JUMP_SIBARS_Xt) $(JUMP_ROOT_ICE)/libICE.sa \
$(JUMP_ROOT_SM)/libSM.sa $(JUMP_ROOT_X11)/libX11.sa $(JUMP_LDLIBS_libc)
JUMP_SIBARS_Xt = jump/libNX_Xmu.a~ jump/libNX_Xext.a~ jump/libNX_Xi.a~ jump/libNX_Xtst.a~ jump/libNX_Xp.a~
JUMP_LDLIBS_Xt = $(JUMP_SIBARS_Xt) $(JUMP_ROOT_ICE)/libNX_ICE.sa \
$(JUMP_ROOT_SM)/libNX_SM.sa $(JUMP_ROOT_X11)/libNX_X11.sa $(JUMP_LDLIBS_libc)
XCOMM libXmu (part of libXt.so)
JUMP_ROOT_Xmu = $(XMUSRC)
......@@ -485,8 +485,8 @@ JUMP_JUMPTABLESIZE_Xaw = 0x4000
JUMP_GOTSIZE_Xaw = 4096
JUMP_STUBNAMES_Xaw = libXaw
JUMP_STUBS_IMPORT_Xaw = $(JUMP_STUBS_IMPORT_X11)
JUMP_LDLIBS_Xaw = $(JUMP_ROOT_Xt)/libXt.sa $(JUMP_ROOT_Xt)/libXmu.sa \
$(JUMP_ROOT_Xt)/libXext.sa $(JUMP_ROOT_X11)/libX11.sa \
JUMP_LDLIBS_Xaw = $(JUMP_ROOT_Xt)/libNX_Xt.sa $(JUMP_ROOT_Xt)/libNX_Xmu.sa \
$(JUMP_ROOT_Xt)/libNX_Xext.sa $(JUMP_ROOT_X11)/libNX_X11.sa \
$(JUMP_LDLIBS_libc)
# endif /* !UseInstalled */
......
nx-X11/config/cf/lnxLib.tmpl
View file @ e77bf36d
......@@ -9,7 +9,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $
#ifndef FixupLibReferences
#define FixupLibReferences() @@\
XMULIBONLY = -lXmu @@\
XMULIBONLY = -lNX_Xmu @@\
XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
#endif
......@@ -66,7 +66,7 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
#ifndef FixupLibReferences
#define FixupLibReferences() @@\
XMULIB = -lXmu $(XLIB)
XMULIB = -lNX_Xmu $(XLIB)
#endif
#endif /* UseElfFormat */
......
nx-X11/config/cf/mingw.tmpl
View file @ e77bf36d
......@@ -50,7 +50,7 @@ XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.18 2003/10/19 08:27:05 herrb Exp $
#ifndef FixupLibReferences
# define FixupLibReferences() @@\
XMULIBONLY = -lXmu @@\
XMULIBONLY = -lNX_Xmu @@\
XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
#endif
......
nx-X11/config/cf/nto.rules
View file @ e77bf36d
......@@ -104,7 +104,7 @@ ComplexHostProgramTarget(program)
#ifndef FixupLibReferences
#define FixupLibReferences() @@\
XMULIBONLY = -lXmu @@\
XMULIBONLY = -lNX_Xmu @@\
XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
#endif
......
nx-X11/config/cf/os2Lib.tmpl
View file @ e77bf36d
......@@ -107,35 +107,35 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.18 2003/11/12 00:10:23 dawes Exp $
#endif
#if LinkStatically
#define SDlibX11 -lX11_s
#define SDlibXExt -lXExt_s
#define SDlibXmu -lXmu_s
#define SDlibXt -lXt_s
#define SDlibXaw -lXaw_s
#define SDlibXaw7 -lXaw_s
#define SDlibXaw6 -lXaw_s
#define SDlibXi -lXi_s
#define SDlibXtst -lXtst_s
#define SDlibXp -lXp_s
#define SDlibXv -lXv_s
#define SDlibGL -lGL_s
#define SDlibDPS -lDPS_s
#define SDlibDPSTK -lDPSTK_s
#define SDlibX11 -lNX_X11_s
#define SDlibXExt -lNX_XExt_s
#define SDlibXmu -lNX_Xmu_s
#define SDlibXt -lNX_Xt_s
#define SDlibXaw -lNX_Xaw_s
#define SDlibXaw7 -lNX_Xaw_s
#define SDlibXaw6 -lNX_Xaw_s
#define SDlibXi -lNX_Xi_s
#define SDlibXtst -lNX_Xtst_s
#define SDlibXp -lNX_Xp_s
#define SDlibXv -lNX_Xv_s
#define SDlibGL -lNX_GL_s
#define SDlibDPS -lNX_DPS_s
#define SDlibDPSTK -lNX_DPSTK_s
#else
#define SDlibX11 -lX11
#define SDlibXExt -lXExt
#define SDlibXmu -lXmu
#define SDlibXt -lXt
#define SDlibXaw -lXaw
#define SDlibXaw7 -lXaw
#define SDlibXaw6 -lXaw
#define SDlibXi -lXi
#define SDlibXtst -lXtst
#define SDlibXp -lXp
#define SDlibXv -lXv
#define SDlibGL -lGL
#define SDlibDPS -lDPS
#define SDlibDPSTK -lDPSTK
#define SDlibX11 -lNX_X11
#define SDlibXExt -lNX_XExt
#define SDlibXmu -lNX_Xmu
#define SDlibXt -lNX_Xt
#define SDlibXaw -lNX_Xaw
#define SDlibXaw7 -lNX_Xaw
#define SDlibXaw6 -lNX_Xaw
#define SDlibXi -lNX_Xi
#define SDlibXtst -lNX_Xtst
#define SDlibXp -lNX_Xp
#define SDlibXv -lNX_Xv
#define SDlibGL -lNX_GL
#define SDlibDPS -lNX_DPS
#define SDlibDPSTK -lNX_DPSTK
#endif
/*
......@@ -159,7 +159,7 @@ XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.18 2003/11/12 00:10:23 dawes Exp $
#endif
#if SharedOldX
DEPOLDXLIB =
OLDXLIB = _Use(-loldX,-L$(OLDXLIBSRC) -loldX)
OLDXLIB = _Use(-lNX_oldX,-L$(OLDXLIBSRC) -lNX_oldX)
#endif
#if SharedLibXt
DEPXTOOLLIB =
......
nx-X11/config/cf/sco5.cf
View file @ e77bf36d
......@@ -318,7 +318,7 @@ XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1.9 2005/12/20 22:30:48 alanc Exp $
*/
#ifndef FixupLibReferences
#define FixupLibReferences() @@\
XMULIBONLY = -lXmu @@\
XMULIBONLY = -lNX_Xmu @@\
XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
#endif
......
nx-X11/config/cf/site.def
View file @ e77bf36d
......@@ -72,7 +72,7 @@ XCOMM site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Ex
#ifdef AfterVendorCF
#ifndef ProjectRoot
#define ProjectRoot /usr/local/lib/nx
#define ProjectRoot /usr/local
#endif
/*
......@@ -87,7 +87,7 @@ XCOMM site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Ex
* ProjectRoot rather than in /etc/X11. See also HasVarDirectory,
* UseEtcX11 and UseSeparateConfDir.
*
#define EtcX11Directory ProjectRoot/etc
#define EtcX11Directory /etc/nx
*/
......
nx-X11/config/cf/sv3Lib.tmpl
View file @ e77bf36d
......@@ -40,31 +40,31 @@ XCOMM $XFree86: xc/config/cf/sv3Lib.tmpl,v 3.2 2001/01/17 16:38:49 dawes Exp $
* are using shared libraries, we really do not need to depend on anything
*/
#if SharedLibXext
DEPEXTENSIONLIB = _UseCat($(USRLIBDIR),$(EXTENSIONSRC)/lib,/libXext_s.a)
EXTENSIONLIB = LoaderLibPrefix _Use(-lXext_s, $(DEPEXTENSIONLIB))
DEPEXTENSIONLIB = _UseCat($(USRLIBDIR),$(EXTENSIONSRC)/lib,/libNX_Xext_s.a)
EXTENSIONLIB = LoaderLibPrefix _Use(-lNX_Xext_s, $(DEPEXTENSIONLIB))
#endif
#if SharedLibX
DEPXLIB = $(DEPEXTENSIONLIB) _UseCat($(USRLIBDIR),$(XLIBSRC),/libX11_s.a)
XLIB = $(EXTENSIONLIB) LoaderLibPrefix _Use(-lX11_s,$(XLIBSRC)/libX11_s.a)
DEPXLIB = $(DEPEXTENSIONLIB) _UseCat($(USRLIBDIR),$(XLIBSRC),/libNX_X11_s.a)
XLIB = $(EXTENSIONLIB) LoaderLibPrefix _Use(-lNX_X11_s,$(XLIBSRC)/libNX_X11_s.a)
#endif
#if SharedLibXmu
DEPXMULIB = _UseCat($(USRLIBDIR),$(XMUSRC),/libXmu_s.a)
XMULIB = LoaderLibPrefix _Use(-lXmu_s,$(DEPXMULIB))
DEPXMULIB = _UseCat($(USRLIBDIR),$(XMUSRC),/libNX_Xmu_s.a)
XMULIB = LoaderLibPrefix _Use(-lNX_Xmu_s,$(DEPXMULIB))
#endif
#if SharedOldLibX
DEPOLDXLIB = _UseCat($(USRLIBDIR),$(OLDXLIBSRC),/liboldX_s.a)
OLDXLIB = LoaderLibPrefix _Use(-loldX_s,$(DEPOLDXLIB))
#endif
#if SharedLibXt
DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libXt_s.a)
XTOOLLIB = LoaderLibPrefix _Use(-lXt_s,$(DEPXTOOLLIB))
DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libNX_Xt_s.a)
XTOOLLIB = LoaderLibPrefix _Use(-lNX_Xt_s,$(DEPXTOOLLIB))
#endif
#if SharedLibXaw
DEPXAWLIB = _UseCat($(USRLIBDIR),$(AWIDGETSRC),/libXaw_s.a)
XAWLIB = LoaderLibPrefix _Use(-lXaw_s,$(DEPXAWLIB))
DEPXAWLIB = _UseCat($(USRLIBDIR),$(AWIDGETSRC),/libNX_Xaw_s.a)
XAWLIB = LoaderLibPrefix _Use(-lNX_Xaw_s,$(DEPXAWLIB))
#endif
#if SharedLibXinput
DEPXILIB = _UseCat($(USRLIBDIR),$(XILIBSRC),/libXi_s.a)
XILIB = LoaderLibPrefix _Use(-lXi_s,$(DEPXILIB))
DEPXILIB = _UseCat($(USRLIBDIR),$(XILIBSRC),/libNX_Xi_s.a)
XILIB = LoaderLibPrefix _Use(-lNX_Xi_s,$(DEPXILIB))
#endif
nx-X11/config/cf/sv4Lib.tmpl
View file @ e77bf36d
......@@ -7,7 +7,7 @@ XCOMM $Xorg: sv4Lib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
XCOMM $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.7 2003/05/29 21:56:57 herrb Exp $
/* SVR4 shared libraries are deficient in link semantics */
XMULIBONLY = -lXmu
XMULIBONLY = -lNX_Xmu
#ifndef FixupLibReferences
# define FixupLibReferences() @@\
XMULIB = $(XMULIBONLY) -z nodefs
......
nx-X11/config/cf/usl.cf
View file @ e77bf36d
......@@ -262,7 +262,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVer
*/
#ifndef FixupLibReferences
#define FixupLibReferences() @@\
XMULIBONLY = -lXmu @@\
XMULIBONLY = -lNX_Xmu @@\
XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
#endif
......
nx-X11/config/imake/Makefile.ini
View file @ e77bf36d
......@@ -21,7 +21,6 @@ IMAKEMDEP_CROSSCOMPILE = -DCROSSCOMPILE_CPP
SHELL = /bin/sh
RM = rm -f
MV = mv
MAKE = make
RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a \
tags TAGS make.log
NPROC = 1
......
nx-X11/extras/Mesa/Makefile
View file @ e77bf36d
......@@ -12,7 +12,7 @@ default: $(TOP)/configs/current
doxygen:
(cd doxygen ; make) ; \
(cd doxygen ; ${MAKE}) ; \
clean:
@for dir in $(SUBDIRS) ; do \
......
nx-X11/extras/Mesa/src/mesa/main/Imakefile
View file @ e77bf36d
......@@ -2,7 +2,7 @@
#define DoSharedLib YES
#define DoDebugLib NO
#define DoProfileLib NO
#define LibName MESAGL
#define LibName NX_MESAGL
#define SoRev SOX11REV
#define LibHeaders NO
......
nx-X11/extras/Xpm/Makefile.noX
View file @ e77bf36d
......@@ -32,7 +32,6 @@
SUBDIRS= lib sxpm cxpm
MAKE=make
MFLAGS=-f Makefile.noX
INSTALL= install -c
CURRENT_DIR=.
......
nx-X11/extras/Xpm/lib/Imakefile
View file @ e77bf36d
......@@ -125,7 +125,7 @@ OS_NAME_DEFINES = OsNameDefines
STD_DEFINES = LibraryDefines
CDEBUGFLAGS = LibraryCDebugFlags
#else
#define LibName Xpm
#define LibName NX_Xpm
#define SoRev SOXPMLIBREV
#define IncSubdir X11
/* we have to cheat on Library.tmpl to get what we want... */
......
nx-X11/extras/drm/libdrm.pc.in
View file @ e77bf36d
......@@ -6,5 +6,5 @@ includedir=@includedir@
Name: libdrm
Description: Userspace interface to kernel DRM services
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -ldrm
Libs: -L${libdir} -lNX_drm
Cflags: -I${includedir} -I${includedir}/drm
nx-X11/extras/drm/linux-core/Makefile
View file @ e77bf36d
......@@ -176,7 +176,7 @@ endif
all: modules
modules: includes
make -C $(LINUXDIR) $(GETCONFIG) SUBDIRS=`pwd` DRMSRCDIR=`pwd` modules
${MAKE} -C $(LINUXDIR) $(GETCONFIG) SUBDIRS=`pwd` DRMSRCDIR=`pwd` modules
ifeq ($(HEADERFROMBOOT),1)
......@@ -246,7 +246,7 @@ clean cleandir:
rm -rf $(CLEANFILES)
$(MODULE_LIST)::
make DRM_MODULES=$@ modules
${MAKE} DRM_MODULES=$@ modules
# Build test utilities
......
nx-X11/extras/drm/linux/Makefile
View file @ e77bf36d
......@@ -184,7 +184,7 @@ endif
all: modules
modules: includes
make -C $(LINUXDIR) $(GETCONFIG) SUBDIRS=`pwd` DRMSRCDIR=`pwd` modules
${MAKE} -C $(LINUXDIR) $(GETCONFIG) SUBDIRS=`pwd` DRMSRCDIR=`pwd` modules
ifeq ($(HEADERFROMBOOT),1)
......@@ -254,7 +254,7 @@ clean cleandir:
rm -rf $(CLEANFILES)
$(MODULE_LIST)::
make DRM_MODULES=$@ modules
${MAKE} DRM_MODULES=$@ modules
# Build test utilities
......
nx-X11/extras/expat/conftools/ltmain.sh
View file @ e77bf36d
This source diff could not be displayed because it is too large. You can view the blob instead.
nx-X11/extras/fontconfig/fontconfig.pc.in
View file @ e77bf36d
......@@ -6,5 +6,5 @@ includedir=@includedir@
Name: Fontconfig
Description: Font configuration and customization library
Version: @VERSION@
Libs: -L${libdir} -lfontconfig
Libs: -L${libdir} -lNX_fontconfig
Cflags: -I${includedir}
nx-X11/extras/ogl-sample/main/gfx/lib/glu/Imakefile
View file @ e77bf36d
......@@ -36,7 +36,7 @@ XCOMM
#define DoDebugLib DebugLibGlu
#define DoProfileLib ProfileLibGlu
#define IHaveSubdirs
#define LibName GLU
#define LibName NX_GLU
#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
#define SoRev SOGLUREV
......
nx-X11/extras/ttf2pt1/Makefile
View file @ e77bf36d
......@@ -158,8 +158,8 @@ mans: $(MANS)
clean:
rm -f t1asm ttf2pt1 *.o app/RPM/Makefile app/RPM/*.spec *.core core.* core
( cd other && make clean; )
( cd app/netscape && make clean; )
( cd other && ${MAKE} clean; )
( cd app/netscape && ${MAKE} clean; )
veryclean: clean
rm -f $(DOCS) $(MANS)
......
nx-X11/lib/FS/Imakefile
View file @ e77bf36d
......@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/FS/Imakefile,v 3.5 2001/01/17 19:41:28 dawes Exp $
#define DoExtraLib SharedLibFS
#define DoDebugLib DebugLibFS
#define DoProfileLib ProfileLibFS
#define LibName FS
#define LibName NX_FS
#define SoRev SOFSREV
#define IncSubdir X11
#define IncSubSubdir fonts
......
nx-X11/lib/GLw/Imakefile
View file @ e77bf36d
......@@ -46,7 +46,7 @@ XCOMM MOTIF_LDFLAGS = -L/usr/local/lib
#define DoProfileLib ProfileLibGLw
#define HasSharedData NO
#define LibName GLw
#define LibName NX_GLw
#define SoRev SOGLWREV
#define IncSubdir GL
......
nx-X11/lib/ICE/Imakefile
View file @ e77bf36d
......@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/ICE/Imakefile,v 3.5 2001/04/23 16:17:06 tsi Exp $
#define DoExtraLib SharedLibICE
#define DoDebugLib DebugLibICE
#define DoProfileLib ProfileLibICE
#define LibName ICE
#define LibName NX_ICE
#define SoRev SOICEREV
#define IncSubdir X11
#define IncSubSubdir ICE
......
nx-X11/lib/SM/Imakefile
View file @ e77bf36d
......@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/SM/Imakefile,v 1.3 2001/01/17 19:41:31 dawes Exp $
#define DoExtraLib SharedLibSM
#define DoDebugLib DebugLibSM
#define DoProfileLib ProfileLibSM
#define LibName SM
#define LibName NX_SM
#define SoRev SOSMREV
#define IncSubdir X11
#define IncSubSubdir SM
......
nx-X11/lib/X11/Imakefile
View file @ e77bf36d
......@@ -63,7 +63,6 @@ NX_XCOMPLIBDIR = $(XTOP)/../nxcomp
NX_XCOMPLIBLINK = Xcomp
NX_XCOMPLIBTARGET = $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME)
NX_REQUIREDLIBS = -L$(NX_XCOMPLIBDIR) -l$(NX_XCOMPLIBLINK)
NX_XCOMPDEPTARGET = $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME)
NX_XCOMPCONFIGTARGET = $(NX_XCOMPLIBDIR)/config.status
NX_XCOMPEXTLIBDIR = $(XTOP)/../nxcompext
......@@ -83,7 +82,7 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTLIBDIR)/config.status
#define DoExtraLib SharedLibX11
#define DoDebugLib DebugLibX11
#define DoProfileLib ProfileLibX11
#define LibName X11
#define LibName NX_X11
#define SoRev SOXLIBREV
#define HugeLibrary YES
#define IncSubdir X11
......@@ -1147,51 +1146,43 @@ ks_tables.h: $(XINCLUDESRC)/keysymdef.h util/makekeys.c
includes:: ks_tables.h
CONFIGURE ?= ./configure
#if NXLibraries
$(NX_XCOMPCONFIGTARGET):
cd ../../../nxcomp && \
./configure
${CONFIGURE}
$(NX_XCOMPEXTCONFIGTARGET):
cd ../../../nxcompext && \
./configure
${CONFIGURE}
#ifdef SunArchitecture
$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
cd $(NX_XCOMPLIBDIR) && \
gmake
${MAKE} -C $(NX_XCOMPLIBDIR)
$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET)
cd ../../../nxcompext && \
gmake
${MAKE} -C ../../../nxcompext
#else
$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
cd $(NX_XCOMPLIBDIR) && \
make
${MAKE} -C $(NX_XCOMPLIBDIR)
$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET)
cd ../../../nxcompext && \
make
$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) $(NX_XCOMPLIBTARGET) lib$(LIBNAME).so.$(SOXLIBREV)
${MAKE} -C ../../../nxcompext
#endif
depend:: $(NX_XCOMPLIBTARGET)
depend::
all:: $(NX_XCOMPLIBTARGET)
lib$(LIBNAME).so.$(SOXLIBREV): $(NX_XCOMPLIBTARGET)
$(NX_XCOMPDEPTARGET):
ln -s $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME) $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME)
ln -s $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME).1 $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME).1
all:: $(NX_XCOMPLIBTARGET)
depend:: $(NX_XCOMPLIBTARGET)
all:: $(NX_XCOMPDEPTARGET) $(NX_XCOMPEXTLIBTARGET)
clean::
rm -f $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME)
rm -f $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME).1
all:: $(NX_XCOMPEXTLIBTARGET)
#endif
......
nx-X11/lib/X11/Imakefile.NX.original
View file @ e77bf36d
......@@ -83,7 +83,7 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTLIBDIR)/config.status
#define DoExtraLib SharedLibX11
#define DoDebugLib DebugLibX11
#define DoProfileLib ProfileLibX11
#define LibName X11
#define LibName NX_X11
#define SoRev SOXLIBREV
#define HugeLibrary YES
#define IncSubdir X11
......@@ -1159,21 +1159,17 @@ $(NX_XCOMPEXTCONFIGTARGET):
#ifdef SunArchitecture
$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
cd $(NX_XCOMPLIBDIR) && \
gmake
${MAKE} -C $(NX_XCOMPLIBDIR)
$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET)
cd ../../../nxcompext && \
gmake
${MAKE} -C ../../../nxcompext
#else
$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
cd $(NX_XCOMPLIBDIR) && \
make
${MAKE} -C $(NX_XCOMPLIBDIR)
$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET)
cd ../../../nxcompext && \
make
${MAKE} -C ../../../nxcompext
#endif
......
nx-X11/lib/X11/Imakefile.X.original
View file @ e77bf36d
......@@ -28,7 +28,7 @@ BuildIncludes($(HEADERS),IncSubdir,..)
#define DoExtraLib SharedLibX11
#define DoDebugLib DebugLibX11
#define DoProfileLib ProfileLibX11
#define LibName X11
#define LibName NX_X11
#define SoRev SOXLIBREV
#define HugeLibrary YES
#define IncSubdir X11
......
nx-X11/lib/XRes/Imakefile
View file @ e77bf36d
......@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/XRes/Imakefile,v 1.3 2003/10/13 21:19:28 herrb Exp $
#define DoSharedLib SharedLibXRes
#define DoDebugLib DebugLibXRes
#define DoProfileLib ProfileLibXRes
#define LibName XRes
#define LibName NX_XRes
#define SoRev SOXRESREV
#define LibHeaders NO
......
nx-X11/lib/XTrap/Imakefile
View file @ e77bf36d
......@@ -4,7 +4,7 @@ XCOMM $XFree86$
#define DoSharedLib SharedLibXTrap
#define DoDebugLib DebugLibXTrap
#define DoProfileLib ProfileLibXTrap
#define LibName XTrap
#define LibName NX_XTrap
#define SoRev SOXTRAPREV
#define LibHeaders NO
......
nx-X11/lib/Xau/Imakefile
View file @ e77bf36d
......@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xau/Imakefile,v 3.5 1999/04/17 09:08:11 dawes Exp $
#define DoExtraLib SharedLibXau
#define DoDebugLib DebugLibXau
#define DoProfileLib ProfileLibXau
#define LibName Xau
#define LibName NX_Xau
#define SoRev SOXAUTHREV
#define IncSubdir X11
......
nx-X11/lib/Xaw/Imakefile
View file @ e77bf36d
......@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/Xaw/Imakefile,v 1.10 2001/01/17 19:42:27 dawes Exp $
#define DoDebugLib DebugLibXaw
#define DoProfileLib ProfileLibXaw
#define HasSharedData YES
#define LibName Xaw
#define LibName NX_Xaw
#define SoRev SOXAWREV
#define IncSubdir X11
#define IncSubSubdir Xaw
......
nx-X11/lib/Xaw6/Imakefile
View file @ e77bf36d
......@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/lib/Xaw6/Imakefile,v 1.2 1999/06/06 14:05:55 dawes Exp $
#define DoDebugLib DebugLibXaw6
#define DoProfileLib ProfileLibXaw6
#define HasSharedData YES
#define LibName Xaw
#define LibName NX_Xaw
#define SoRev SOXAW6REV
#define LibHeaders NO
#define NoSoSymlink
......
nx-X11/lib/Xaw7/Imakefile
View file @ e77bf36d
......@@ -5,7 +5,7 @@ XCOMM $Xorg$
#define DoDebugLib DebugLibXaw7
#define DoProfileLib ProfileLibXaw7
#define HasSharedData YES
#define LibName Xaw
#define LibName NX_Xaw
#define SoRev SOXAW7REV
#if BuildXaw
......
nx-X11/lib/Xcomposite/Imakefile
View file @ e77bf36d
......@@ -14,7 +14,7 @@ SOXCOMPOSITEREV=1.0.0
#define DoDebugLib DebugLibXcomposite
#define DoProfileLib ProfileLibXcomposite
#define LibName Xcomposite
#define LibName NX_Xcomposite
#define SoRev SOXCOMPOSITEREV
#define IncSubdir X11
#define IncSubSubdir extensions
......
nx-X11/lib/Xcomposite/xcomposite.pc.in
View file @ e77bf36d
......@@ -7,4 +7,4 @@ Name: Xcomposite
Description: X Composite Library
Version: @VERSION@
Cflags: -I${includedir} @XCOMPOSITE_CFLAGS@ @X_CFLAGS@
Libs: -L${libdir} -lXcomposite @XCOMPOSITE_LIBS@ @X_LIBS@
Libs: -L${libdir} -lNX_Xcomposite @XCOMPOSITE_LIBS@ @X_LIBS@
nx-X11/lib/Xcursor/Imakefile
View file @ e77bf36d
......@@ -15,7 +15,7 @@ SOXCURSORREV=1.0.2
#define DoDebugLib DebugLibXcursor
#define DoProfileLib ProfileLibXcursor
#define LibName Xcursor
#define LibName NX_Xcursor
#define SoRev SOXCURSORREV
#define IncSubdir X11
#define IncSubSubdir Xcursor
......
nx-X11/lib/Xcursor/xcursor.pc.in
View file @ e77bf36d
......@@ -12,4 +12,4 @@ Description: X Cursor Library
Version: @VERSION@
Requires: xrender
Cflags: -I${includedir} ${xrendercflags} ${xcflags}
Libs: -L${libdir} -lXcursor ${xrenderlibs} ${xlibs}
Libs: -L${libdir} -lNX_Xcursor ${xrenderlibs} ${xlibs}
nx-X11/lib/Xdamage/Imakefile
View file @ e77bf36d
......@@ -14,7 +14,7 @@ SOXDAMAGEREV=1.0.1
#define DoDebugLib DebugLibXdamage
#define DoProfileLib ProfileLibXdamage
#define LibName Xdamage
#define LibName NX_Xdamage
#define SoRev SOXDAMAGEREV
#define IncSubdir X11
#define IncSubSubdir extensions
......
nx-X11/lib/Xdamage/xdamage.pc.in
View file @ e77bf36d
......@@ -7,4 +7,4 @@ Name: Xdamage
Description: X Damage Library
Version: @VERSION@
Cflags: -I${includedir} @XDAMAGE_CFLAGS@ @X_CFLAGS@
Libs: -L${libdir} -lXdamage @XDAMAGE_LIBS@ @X_LIBS@
Libs: -L${libdir} -lNX_Xdamage @XDAMAGE_LIBS@ @X_LIBS@
nx-X11/lib/Xdmcp/Imakefile
View file @ e77bf36d
......@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xdmcp/Imakefile,v 3.4 1999/04/17 09:08:12 dawes Exp $
#define DoExtraLib SharedLibXdmcp
#define DoDebugLib DebugLibXdmcp
#define DoProfileLib ProfileLibXdmcp
#define LibName Xdmcp
#define LibName NX_Xdmcp
#define SoRev SOXDMCPREV
#define IncSubdir X11
......
nx-X11/lib/Xevie/Imakefile
View file @ e77bf36d
......@@ -14,7 +14,7 @@ SOXEVIEREV=1.0.0
#define DoDebugLib DebugLibXevie
#define DoProfileLib ProfileLibXevie
#define LibName Xevie
#define LibName NX_Xevie
#define SoRev SOXEVIEREV
#define IncSubdir X11
#define IncSubSubdir extensions
......
nx-X11/lib/Xevie/xevie.pc.in
View file @ e77bf36d
......@@ -9,4 +9,4 @@ Name: Xevie
Description: X Event Interceptor Library
Version: @VERSION@
Cflags: -I${includedir} ${xcflags}
Libs: -L${libdir} -lXevie ${xlibs}
Libs: -L${libdir} -lNX_Xevie ${xlibs}
nx-X11/lib/Xext/Imakefile
View file @ e77bf36d
......@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xext/Imakefile,v 1.12 2002/10/16 00:37:27 dawes Exp $
#define DoExtraLib SharedLibXext
#define DoDebugLib DebugLibXext
#define DoProfileLib ProfileLibXext
#define LibName Xext
#define LibName NX_Xext
#define SoRev SOXEXTREV
#define LibHeaders NO
......
nx-X11/lib/Xfixes/Imakefile
View file @ e77bf36d
......@@ -14,7 +14,7 @@ SOXFIXESREV=3.0.0
#define DoDebugLib DebugLibXfixes
#define DoProfileLib ProfileLibXfixes
#define LibName Xfixes
#define LibName NX_Xfixes
#define SoRev SOXFIXESREV
#define IncSubdir X11
#define IncSubSubdir extensions
......
nx-X11/lib/Xfixes/xfixes.pc.in
View file @ e77bf36d
......@@ -7,4 +7,4 @@ Name: Xfixes
Description: X Fixes Library
Version: @VERSION@
Cflags: -I${includedir} @X_CFLAGS@
Libs: -L${libdir} -lXfixes @X_LIBS@
Libs: -L${libdir} -lNX_Xfixes @X_LIBS@
nx-X11/lib/Xfontcache/Imakefile
View file @ e77bf36d
......@@ -9,7 +9,7 @@ XCOMM $XFree86: xc/lib/Xfontcache/Imakefile,v 1.5 2003/10/13 21:49:21 herrb Exp
#define DoExtraLib SharedLibXfontcache
#define DoDebugLib DebugLibXfontcache
#define DoProfileLib ProfileLibXfontcache
#define LibName Xfontcache
#define LibName NX_Xfontcache
#define SoRev SOXFONTCACHEREV
#define LibHeaders NO
......
nx-X11/lib/Xft/Imakefile
View file @ e77bf36d
......@@ -8,7 +8,7 @@ XCOMM $XdotOrg: xc/lib/Xft/Imakefile,v 1.5 2005/10/19 02:46:56 kem Exp $
#define DoProfileLib ProfileLibXft
#define HasSharedData YES
#define LibName Xft
#define LibName NX_Xft
#define SoRev SOXFTREV
#define IncSubdir X11
#define IncSubSubdir Xft
......
nx-X11/lib/Xft/xft.pc.in
View file @ e77bf36d
......@@ -9,4 +9,4 @@ Version: @VERSION@
Requires: xrender, fontconfig, freetype2
Requires.private: xrender, fontconfig, freetype2
Cflags: -I${includedir}
Libs: -L${libdir} -lXft
Libs: -L${libdir} -lNX_Xft
nx-X11/lib/Xft1/Imakefile
View file @ e77bf36d
......@@ -70,7 +70,7 @@ LDPRELIBS=LdPreLibs
#define DoDebugLib NO
#define DoProfileLib NO
#define HasSharedData YES
#define LibName Xft
#define LibName NX_Xft
#define SoRev SOXFT1REV
#define LibHeaders NO
#define NoSoSymlink
......
nx-X11/lib/Xi/Imakefile
View file @ e77bf36d
......@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xi/Imakefile,v 1.4 2001/01/17 19:42:47 dawes Exp $
#define DoExtraLib SharedLibXi
#define DoDebugLib DebugLibXi
#define DoProfileLib ProfileLibXi
#define LibName Xi
#define LibName NX_Xi
#define SoRev SOXINPUTREV
#define LibHeaders NO
......
nx-X11/lib/Xinerama/Imakefile
View file @ e77bf36d
......@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/Xinerama/Imakefile,v 1.4 2002/10/16 00:37:31 dawes Exp $
#define DoSharedLib SharedLibXinerama
#define DoDebugLib DebugLibXinerama
#define DoProfileLib ProfileLibXinerama
#define LibName Xinerama
#define LibName NX_Xinerama
#define SoRev SOXINERAMAREV
#define LibHeaders NO
......
nx-X11/lib/Xinerama/Xinerama.c
View file @ e77bf36d
......@@ -34,7 +34,7 @@ Equipment Corporation.
#include <X11/extensions/panoramiXext.h>
#include <X11/extensions/panoramiXproto.h>
#include <X11/extensions/Xinerama.h>
#include <stdio.h>
static XExtensionInfo _panoramiX_ext_info_data;
static XExtensionInfo *panoramiX_ext_info = &_panoramiX_ext_info_data;
......@@ -249,6 +249,16 @@ Bool XineramaIsActive(Display *dpy)
xXineramaIsActiveReq *req;
XExtDisplayInfo *info = find_display (dpy);
FILE* fptr;
if((fptr=fopen(getenv("NX_XINERAMA_CONF"),"r"))!=NULL) {
fclose (fptr);
return True;
}
else {
return False;
}
if(!XextHasExtension(info))
return False; /* server doesn't even have the extension */
......@@ -266,7 +276,6 @@ Bool XineramaIsActive(Display *dpy)
return rep.state;
}
#include <stdio.h>
XineramaScreenInfo *
XineramaQueryScreens(
......@@ -279,8 +288,11 @@ XineramaQueryScreens(
xXineramaQueryScreensReq *req;
XineramaScreenInfo *scrnInfo = NULL;
int i;
int x,y,w,h;
FILE* fptr;
if((fptr=fopen(getenv("NX_XINERAMA_CONF"),"r"))==NULL) {
PanoramiXCheckExtension (dpy, info, 0);
LockDisplay (dpy);
GetReq (XineramaQueryScreens, req);
req->reqType = info->codes->major_opcode;
......@@ -290,7 +302,6 @@ XineramaQueryScreens(
SyncHandle ();
return NULL;
}
if(rep.number) {
if((scrnInfo = Xmalloc(sizeof(XineramaScreenInfo) * rep.number))) {
xXineramaScreenInfo scratch;
......@@ -306,12 +317,43 @@ XineramaQueryScreens(
}
*number = rep.number;
} else
} else {
_XEatData(dpy, rep.length << 2);
}
}
UnlockDisplay (dpy);
SyncHandle ();
} else {
i=0;
while(!feof(fptr)) {
w=h=0;
fscanf(fptr,"%d %d %d %d",&x,&y,&w,&h);
if(w&&h)
i++;
}
rewind(fptr);
*number=i;
if((scrnInfo = Xmalloc(sizeof(XineramaScreenInfo) * i))) {
i=0;
while(!feof(fptr)){
w=h=0;
fscanf(fptr,"%d %d %d %d",&x,&y,&w,&h);
if(w&&h){
scrnInfo[i].screen_number=i;
scrnInfo[i].x_org=x;
scrnInfo[i].y_org=y;
scrnInfo[i].width=w;
scrnInfo[i].height=h;
i++;
}
}
}
fclose(fptr);
}
return scrnInfo;
}
......
nx-X11/lib/Xmu/Imakefile
View file @ e77bf36d
......@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/Xmu/Imakefile,v 1.7 1999/04/28 15:04:50 dawes Exp $
#define DoDebugLib DebugLibXmu
#define DoProfileLib ProfileLibXmu
#define HasSharedData YES
#define LibName Xmu
#define LibName NX_Xmu
#define SoRev SOXMUREV
#define IncSubdir X11
#define IncSubSubdir Xmu
......
nx-X11/lib/Xmuu/Imakefile
View file @ e77bf36d
......@@ -11,7 +11,7 @@ XCOMM other than Xlib and the system C library
#define DoExtraLib SharedLibXmuu
#define DoDebugLib DebugLibXmuu
#define DoProfileLib ProfileLibXmuu
#define LibName Xmuu
#define LibName NX_Xmuu
#define SoRev SOXMUUREV
#define LibHeaders NO
......
nx-X11/lib/Xp/Imakefile
View file @ e77bf36d
......@@ -44,7 +44,7 @@ XCOMM $XFree86: xc/lib/Xp/Imakefile,v 1.3 2001/01/17 19:43:01 dawes Exp $
#define DoExtraLib SharedLibXp
#define DoDebugLib DebugLibXp
#define DoProfileLib ProfileLibXp
#define LibName Xp
#define LibName NX_Xp
#define SoRev SOXPREV
#define LibHeaders NO
......
nx-X11/lib/Xpm/Imakefile
View file @ e77bf36d
......@@ -12,7 +12,7 @@ XCOMM $XFree86: xc/lib/Xpm/Imakefile,v 1.1 1999/01/11 14:40:02 dawes Exp $
#define DoDebugLib DebugLibXpm
#define DoProfileLib ProfileLibXpm
#define HasSharedData NO
#define LibName Xpm
#define LibName NX_Xpm
#define SoRev SOXPMREV
#define IncSubdir X11
......
nx-X11/lib/Xpm/Imakefile.NX.original
View file @ e77bf36d
......@@ -12,7 +12,7 @@ XCOMM $XFree86: xc/lib/Xpm/Imakefile,v 1.1 1999/01/11 14:40:02 dawes Exp $
#define DoDebugLib DebugLibXpm
#define DoProfileLib ProfileLibXpm
#define HasSharedData NO
#define LibName Xpm
#define LibName NX_Xpm
#define SoRev SOXPMREV
#define IncSubdir X11
......
nx-X11/lib/Xpm/Imakefile.X.original
View file @ e77bf36d
......@@ -8,7 +8,7 @@ XCOMM $XFree86: xc/lib/Xpm/Imakefile,v 1.1 1999/01/11 14:40:02 dawes Exp $
#define DoDebugLib DebugLibXpm
#define DoProfileLib ProfileLibXpm
#define HasSharedData NO
#define LibName Xpm
#define LibName NX_Xpm
#define SoRev SOXPMREV
#define IncSubdir X11
......
nx-X11/lib/XprintAppUtil/Imakefile
View file @ e77bf36d
......@@ -5,7 +5,7 @@
#define DoDebugLib NO
#define DoProfileLib NO
#define HasSharedData NO
#define LibName XprintAppUtil
#define LibName NX_XprintAppUtil
#define SoRev SOZLIBREV
#define IncSubdir X11
#define IncSubSubdir XprintAppUtil
......
nx-X11/lib/XprintUtil/Imakefile
View file @ e77bf36d
......@@ -5,7 +5,7 @@
#define DoDebugLib NO
#define DoProfileLib NO
#define HasSharedData NO
#define LibName XprintUtil
#define LibName NX_XprintUtil
#define SoRev SOZLIBREV
#define IncSubdir X11
#define IncSubSubdir XprintUtil
......
nx-X11/lib/Xrandr/Imakefile
View file @ e77bf36d
......@@ -5,7 +5,7 @@ XCOMM $XdotOrg: xc/lib/Xrandr/Imakefile,v 1.5 2005/10/24 23:30:21 alanc Exp $
#define DoSharedLib SharedLibXrandr
#define DoDebugLib DebugLibXrandr
#define DoProfileLib ProfileLibXrandr
#define LibName Xrandr
#define LibName NX_Xrandr
#define SoRev SOXRANDRREV
#define IncSubdir X11
#define IncSubSubdir extensions
......
nx-X11/lib/Xrender/Imakefile
View file @ e77bf36d
......@@ -74,7 +74,7 @@ clean::
#define DoSharedLib SharedLibXrender
#define DoDebugLib DebugLibXrender
#define DoProfileLib ProfileLibXrender
#define LibName Xrender
#define LibName NX_Xrender
#define SoRev SOXRENDERREV
#ifdef XBuildIncDir
......
nx-X11/lib/Xrender/xrender.pc.in
View file @ e77bf36d
......@@ -8,4 +8,4 @@ Description: X Render Library
Version: @VERSION@
Requires: @X_REQUIRES@
Cflags: -I${includedir} @RENDER_CFLAGS@ @X_NON_PKG_CFLAGS@
Libs: -L${libdir} -lXrender @X_NON_PKG_LIBS@
Libs: -L${libdir} -lNX_Xrender @X_NON_PKG_LIBS@
nx-X11/lib/Xss/Imakefile
View file @ e77bf36d
......@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/Xss/Imakefile,v 3.5 2003/10/26 18:59:49 herrb Exp $
#define DoExtraLib SharedLibXss
#define DoDebugLib DebugLibXss
#define DoProfileLib ProfileLibXss
#define LibName Xss
#define LibName NX_Xss
#define SoRev SOXSSREV
#define LibHeaders NO
......
nx-X11/lib/Xt/Imakefile
View file @ e77bf36d
......@@ -42,7 +42,7 @@ NX_DEFINES = -DNX_TRANS_SOCKET
#define DoDebugLib DebugLibXt
#define DoProfileLib ProfileLibXt
#define HasSharedData YES
#define LibName Xt
#define LibName NX_Xt
#define SoRev SOXTREV
#define IncSubdir X11
......
nx-X11/lib/Xt/Imakefile.NX.original
View file @ e77bf36d
......@@ -42,7 +42,7 @@ NX_DEFINES = -DNX_TRANS_SOCKET
#define DoDebugLib DebugLibXt
#define DoProfileLib ProfileLibXt
#define HasSharedData YES
#define LibName Xt
#define LibName NX_Xt
#define SoRev SOXTREV
#define IncSubdir X11
......
nx-X11/lib/Xt/Imakefile.X.original
View file @ e77bf36d
......@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/Xt/Imakefile,v 3.18tsi Exp $
#define DoDebugLib DebugLibXt
#define DoProfileLib ProfileLibXt
#define HasSharedData YES
#define LibName Xt
#define LibName NX_Xt
#define SoRev SOXTREV
#define IncSubdir X11
......
nx-X11/lib/Xtst/Imakefile
View file @ e77bf36d
......@@ -10,7 +10,7 @@ XCOMM $XFree86: xc/lib/Xtst/Imakefile,v 1.2 1998/12/20 11:57:12 dawes Exp $
#define DoExtraLib SharedLibXtst
#define DoDebugLib DebugLibXtst
#define DoProfileLib ProfileLibXtst
#define LibName Xtst
#define LibName NX_Xtst
#define SoRev SOXTESTREV
#define LibHeaders NO
......
nx-X11/lib/Xv/Imakefile
View file @ e77bf36d
......@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/Xv/Imakefile,v 1.7 2002/10/16 00:37:33 dawes Exp $
#define DoSharedLib SharedLibXv
#define DoDebugLib DebugLibXv
#define DoProfileLib ProfileLibXv
#define LibName Xv
#define LibName NX_Xv
#define SoRev SOXVREV
#define LibHeaders NO
......
nx-X11/lib/XvMC/Imakefile
View file @ e77bf36d
......@@ -4,7 +4,7 @@ XCOMM $XFree86: xc/lib/XvMC/Imakefile,v 1.5 2002/10/16 00:37:33 dawes Exp $
#define DoSharedLib SharedLibXvMC
#define DoDebugLib DebugLibXvMC
#define DoProfileLib ProfileLibXvMC
#define LibName XvMC
#define LibName NX_XvMC
#define SoRev SOXVMCREV
#define LibHeaders NO
......
nx-X11/lib/XvMC/hw/i810/Imakefile
View file @ e77bf36d
......@@ -3,7 +3,7 @@ XCOMM $XFree86: xc/lib/XvMC/hw/i810/Imakefile,v 1.2 2002/10/30 12:52:02 alanh Ex
#define DoSharedLib SharedLibXvMC
#define DoDebugLib DebugLibXvMC
#define DoProfileLib ProfileLibXvMC
#define LibName I810XvMC
#define LibName NX_I810XvMC
#define SoRev SOXVMCREV
#define LibHeaders NO
......
nx-X11/lib/XvMC/hw/via/unichrome/Imakefile
View file @ e77bf36d
......@@ -2,7 +2,7 @@
#define DoSharedLib SharedLibXvMC
#define DoDebugLib DebugLibXvMC
#define DoProfileLib ProfileLibXvMC
#define LibName viaXvMC
#define LibName NX_viaXvMC
#define SoRev SOXVMCREV
#define LibHeaders NO
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment