debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable all code related to libXp

Browse Source 
deprecated and mostly no longer included on current OSes
This commit is contained in:
Peter Howkins
2016-04-20 20:17:22 +01:00
parent b251a15844
commit 2ea057d511
54 changed files with 302 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cde/config/cf/DtInfo.tmpl
View File

@@ -404,7 +404,7 @@ XCOMM Following X11 and Mtf defines should be replaced w/ std config
# define MtfLibraries $(DYNAMIC) $(XMLIB)
#endif
#ifndef X11Libraries
# define X11Libraries $(DYNAMIC) $(XTOOLLIB) $(XPLIB) $(XMULIB) $(XLIB)
# define X11Libraries $(DYNAMIC) $(XTOOLLIB) $(XMULIB) $(XLIB)
#endif
X11_INCLUDES=X11Includes

18
cde/config/cf/Motif.tmpl
View File

@@ -325,31 +325,31 @@ XCOMM $TOG: Motif.tmpl /main/6 1999/05/19 17:00:05 mgreess $
#endif
#ifndef XmClientLibs
# define XmClientLibs $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(XMEXTRA_LIBS)
# define XmClientLibs $(XMLIB) $(XTOOLLIB) $(XLIB) $(XMEXTRA_LIBS)
#endif
#ifndef XmClientDepLibs
# define XmClientDepLibs $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)
# define XmClientDepLibs $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
#endif
#ifndef MrmClientLibs
# define MrmClientLibs $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(XMEXTRA_LIBS)
# define MrmClientLibs $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XLIB) $(XMEXTRA_LIBS)
#endif
#ifndef MrmClientDepLibs
# define MrmClientDepLibs $(DEPMRESOURCELIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)
# define MrmClientDepLibs $(DEPMRESOURCELIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
#endif
#ifndef UilClientLibs
# define UilClientLibs $(UILLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(XMEXTRA_LIBS)
# define UilClientLibs $(UILLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XLIB) $(XMEXTRA_LIBS)
#endif
#ifndef UilClientDepLibs
# define UilClientDepLibs $(DEPUILLIB) $(DEPMRESOURCELIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)
# define UilClientDepLibs $(DEPUILLIB) $(DEPMRESOURCELIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
#endif
#ifndef TestClientLibs
# define TestClientLibs $(PURIFYLIBS) $(TESTCOMLIB) \
$(AUTOSCRIPTLIB) $(AUTOUTILLIB) \
$(AUTOCREATELIB) $(AUTOVISUALLIB) $(AUTOSYNTHLIB) \
$(XMLIB) $(TESTGEOLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) \
$(XMLIB) $(TESTGEOLIB) $(XTOOLLIB) $(XLIB) \
$(AUTOEXTRALIBS) $(XMEXTRA_LIBS)
#endif
#ifndef TestUilClientLibs
@@ -357,7 +357,7 @@ XCOMM $TOG: Motif.tmpl /main/6 1999/05/19 17:00:05 mgreess $
$(AUTOSCRIPTLIB) $(AUTOUTILLIB) \
$(AUTOCREATELIB) $(AUTOVISUALLIB) $(AUTOSYNTHLIB) \
$(UILLIB) $(MRESOURCELIB) $(XMLIB) $(TESTGEOLIB) \
$(XTOOLLIB) $(XPLIB) $(XLIB) $(AUTOEXTRALIBS) $(XMEXTRA_LIBS)
$(XTOOLLIB) $(XLIB) $(AUTOEXTRALIBS) $(XMEXTRA_LIBS)
#endif
#ifndef TestClientDepLibs
# define TestClientDepLibs XmClientDepLibs
@@ -578,7 +578,7 @@ LINTXMWIDGETLIB = $(MWIDGETSRC)/llib-l/Xm.ln
#if NeedDefaultDepLibs
# if HasSharedLibraries || defined(UseInstalled)
DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)
DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
# else
DEPLIBS = $(LOCAL_LIBRARIES)
# endif

22
cde/config/cf/X11.tmpl
View File

@@ -933,28 +933,6 @@ SharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev)
ProjectUnsharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),XBuildLibDir)
#endif
#ifndef SharedLibXp
#define SharedLibXp HasSharedLibraries
#endif
#ifndef NormalLibXp
#define NormalLibXp (!SharedLibXp | ForceNormalLib)
#endif
#ifndef DebugLibXp
#define DebugLibXp NO /* debugged Xp library */
#endif
#ifndef ProfileLibXp
#define ProfileLibXp NO /* profiled Xp library */
#endif
XPLIBSRC = $(LIBSRC)/Xp
#if SharedLibXp
#ifndef SharedXpRev
#define SharedXpRev 6.2
#endif
SharedLibReferences(XP,Xp,$(XPLIBSRC),SOXPREV,SharedXpRev)
#else
ProjectUnsharedLibReferences(XP,Xp,$(XPLIBSRC),XBuildLibDir)
#endif
#ifndef SharedLibXt
#define SharedLibXt HasSharedLibraries
#endif

4
cde/config/cf/cde.tmpl
View File

@@ -425,10 +425,10 @@ ProjectUnsharedLibReferences(CSA,csa,$(CSASRC),CDEBuildLibDir)
#ifndef DtClientLibs
# define DtClientLibs $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB)
# define DtClientLibs $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB)
#endif
#ifndef DepDtClientLibs
# define DepDtClientLibs $(DEPDTPRINTLIB) $(DEPDTHELPLIB) $(DEPDTWIDGETLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)
# define DepDtClientLibs $(DEPDTPRINTLIB) $(DEPDTHELPLIB) $(DEPDTWIDGETLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
#endif
#ifndef DtClientSysLibs
# define DtClientSysLibs $(DYNLIBSYSLIB) $(ICONVSYSLIB) $(REGEXSYSLIB) -lm

2
cde/config/cf/hpLib.tmpl
View File

@@ -18,7 +18,7 @@ XCOMM $XConsortium: hpLib.tmpl /main/10 1996/12/04 11:57:22 swick $
#define SharedSMReqs $(ICELIB)
#define SharedXpReqs $(XLIB)
#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) SharedThreadReqs
#define SharedXReqs $(XTOOLLIB) $(XLIB) SharedThreadReqs
#define SharedXmReqs SharedXReqs
#define SharedMrmReqs $(XMLIB) SharedXReqs
#define SharedUilReqs $(MRESOURCELIB) $(XMLIB) SharedXReqs

2
cde/config/cf/ibmLib.tmpl
View File

@@ -39,7 +39,7 @@ XCOMM $XConsortium: ibmLib.tmpl /main/21 1996/12/04 12:21:49 swick $
#define SharedSMReqs $(ICELIB)
#define SharedXpReqs $(XLIB)
#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) SharedThreadReqs
#define SharedXReqs $(XTOOLLIB) $(XLIB) SharedThreadReqs
#define SharedXmReqs $(LDPRELIBS) SharedXReqs
#define SharedMrmReqs $(LDPRELIBS) $(XMLIB) SharedXReqs
#define SharedUilReqs $(LDPRELIBS) $(MRESOURCELIB) $(XMLIB) SharedXReqs

2
cde/config/cf/lnxLib.tmpl
View File

@@ -23,7 +23,7 @@ XMULIB = -lXmu $(XLIB)
#endif
#ifndef SharedXReqs
# define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS)
# define SharedXReqs $(XTOOLLIB) $(XLIB) $(LDPOSTLIBS)
#endif
#ifndef SharedXmReqs

2
cde/config/cf/osfLib.tmpl
View File

@@ -31,7 +31,7 @@ XCOMM $XConsortium: osfLib.tmpl /main/22 1996/09/28 16:12:00 rws $
#define SharedSMReqs $(LDPRELIBS) $(ICELIB)
#define SharedXpReqs $(LDPRELIBS) $(XLIB)
#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) SharedThreadReqs $(LDPOSTLIBS)
#define SharedXReqs $(XTOOLLIB) $(XLIB) SharedThreadReqs $(LDPOSTLIBS)
#define SharedXmReqs $(LDPRELIBS) SharedXReqs
#define SharedMrmReqs $(LDPRELIBS) $(XMLIB) SharedXReqs
#define SharedUilReqs $(LDPRELIBS) $(MRESOURCELIB) $(XMLIB) SharedXReqs

2
cde/config/cf/sgiLib.tmpl
View File

@@ -8,7 +8,7 @@ XCOMM $XConsortium: sgiLib.tmpl /main/2 1996/09/28 16:12:44 rws $
#define SharedXawReqs -lw
#define SharedXpReqs $(LDPRELIBS) $(XLIB)
#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) -lgen
#define SharedXReqs $(XTOOLLIB) $(XLIB) -lgen
#define SharedXmReqs $(LDPRELIBS) SharedXReqs
#define SharedMrmReqs $(LDPRELIBS) $(XMLIB) SharedXReqs
#define SharedUilReqs $(LDPRELIBS) $(MRESOURCELIB) $(XMLIB) SharedXReqs

8
cde/config/cf/sunLib.tmpl
View File

@@ -56,14 +56,14 @@ XCOMM $TOG: sunLib.tmpl /main/47 1997/12/12 14:53:33 kaleb $
# define SharedPamRhostsAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lsocket SharedThreadReqs
# define SharedPamDceAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -ldce -lnsl -lsocket SharedThreadReqs
# define SharedTtReqs $(XTOOLLIB) -lnsl -lsocket -lintl -ldl -lc -lw $(CXXLIB)
# define SharedDtSvcReqs $(LDPRELIBS) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl -ldl $(CXXLIB)
# define SharedDtMmdbReqs $(LDPRELIBS) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl -ldl
# define SharedDtSvcReqs $(LDPRELIBS) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl -ldl $(CXXLIB)
# define SharedDtMmdbReqs $(LDPRELIBS) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl -ldl
# define SharedDtSearchReqs -lm -lc
# define SharedDtWidgetReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc
# define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lgen -lm -lc -ljpeg
# define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) $(LDPOSTLIBS) -lw -lgen -lm -lc -ljpeg
# define SharedDtPrintReqs $(LDPRELIBS) $(DTSVCLIB) $(DTHELPLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc
# define SharedDtTermReqs SharedDtHelpReqs -ldl -lgen
# define SharedDtMrmReqs $(LDPRELIBS) $(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lsocket -lnsl -lc $(CXXLIB)
# define SharedDtMrmReqs $(LDPRELIBS) $(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XLIB) $(LDPOSTLIBS) -lw -lsocket -lnsl -lc $(CXXLIB)
# define SharedDtMailReqs $(LDPRELIBS) -lw $(CXXLIB) -lm -ldl
# define SharedCsaReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXmReqs

2
cde/config/cf/sv4Lib.tmpl
View File

@@ -32,7 +32,7 @@ XMULIB = $(XMULIBONLY) -z nodefs
#endif
#ifndef SharedXReqs
# define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) SharedThreadReqs $(LDPOSTLIBS)
# define SharedXReqs $(XTOOLLIB) $(XLIB) SharedThreadReqs $(LDPOSTLIBS)
#endif
#ifndef SharedXmReqs