external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Fix Linux rpc problems with new glibc

Browse source
This commit is contained in:
Ulrich Wilkens 2018-05-31 22:50:44 +02:00 • committed by Jon Trulson
parent 16fbb15ecc
commit 07f272122d
49 changed files with 93 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cde/config/imake/imake.c
View file

@ -1229,7 +1229,7 @@ get_gcc_incdir(FILE *inFile)
if ((gccproc = popen (cmd, "r")) != NULL) {
if (fgets (buf, PATH_MAX - 1, gccproc) != NULL) {
ptr = strstr (buf, "libgcc.a");
if (ptr) strncpy (ptr, "include", 7);
if (ptr) strncpy (ptr, "include", 8);
}
(void) pclose (gccproc);
break;
@ -1720,6 +1720,6 @@ Strdup(const char *cp)
{
char *new = Emalloc(strlen(cp) + 1);
strncpy(new, cp, strlen(cp) + 1);
memcpy(new, cp, strlen(cp) + 1);
return new;
}

2
cde/lib/DtSvc/DtEncap/Imakefile
View file

@ -27,7 +27,7 @@ DEFINES = DtSvcDefines \
-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-DCDE_LOGFILES_TOP=\"$(CDE_LOGFILES_TOP)/tmp\"
INCLUDES = -I. -I../include -I../DtUtil2
INCLUDES = -I. -I../include -I../DtUtil2 $(TIRPCINC)
SRCS = MemoryMgr.c SbEvent.c Symbolic.c bmsglob.c \

2
cde/lib/DtSvc/DtUtil1/Imakefile
View file

@ -18,7 +18,7 @@ DEPEND_DEFINES = $(DEPENDDEFINES)
DEFINES = DtSvcDefines \
-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
INCLUDES = -I. -I../include
INCLUDES = -I. -I../include $(TIRPCINC)
HEADERS = \

2
cde/lib/DtSvc/DtUtil2/Imakefile
View file

@ -22,7 +22,7 @@ DEFINES = DtSvcDefines $(XINOPT) \
-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
INCLUDES = -I. -I../include
INCLUDES = -I. -I../include $(TIRPCINC)
#ifdef SunArchitecture
EXTRA_INCLUDES = -I$(DTHELPSRC)

2
cde/lib/DtSvc/Imakefile
View file

@ -31,7 +31,7 @@ DependSubdirs($(SUBDIRS))
#endif
DEFINES = DtSvcDefines $(XINOPT)
INCLUDES = -I.
INCLUDES = -I. $(TIRPCINC)
#ifdef SharedDtSvcReqs
#ifdef SunArchitecture

2
cde/lib/csa/Imakefile
View file

@ -10,7 +10,7 @@ XCOMM $TOG: Imakefile /main/4 1998/03/19 19:01:27 mgreess $
#include <Threads.tmpl>
INCLUDES = -I.
INCLUDES = -I. $(TIRPCINC)
OSMAJORVERSION = OSMajorVersion
OSMINORVERSION = OSMinorVersion

2
cde/programs/dtcm/dtcm/Imakefile
View file

@ -2,7 +2,7 @@ XCOMM $TOG: Imakefile /main/19 1998/04/09 11:46:13 mgreess $
#include <Threads.tmpl>
INCLUDES = -I. -I$(CSASRC) -I../libDtCmP -I$(DTHELPSRC)
INCLUDES = -I. -I$(CSASRC) -I../libDtCmP -I$(DTHELPSRC) $(TIRPCINC)
SYS_LIBRARIES = -lm $(ICONVSYSLIB)
DTCMPLIB = ../libDtCmP/libDtCmP.a

1
cde/programs/dtcm/libDtCmP/getdate.h
View file

@ -84,6 +84,7 @@ extern time_t monthadd P((time_t, time_t));
extern time_t daylcorr P((time_t, time_t));
extern time_t cm_getdate P((char*, struct timeb *));
int yylex();
extern void yyerror(char *s);
#endif

29
cde/programs/dtcm/libDtCmP/getdate.y
View file

@ -28,6 +28,7 @@
%{
#ifndef lint
__attribute__((unused))
static char sccsid[] = "@(#)getdate.y 1.10 94/11/07 Copyr 1993 Sun Microsystems, Inc.";
#endif
%}
@ -112,8 +113,8 @@ dyspec: DAY
{dayord = 1; dayreq = $1;}
| DAY ','
{dayord = 1; dayreq = $1;}
| NUMBER DAY
{dayord = $1; dayreq = $2;};
| NUMBER ' ' DAY
{dayord = $1; dayreq = $3;};
dtspec: NUMBER '/' NUMBER
{month = $1; day = $3; noyear = 1;}
@ -127,17 +128,17 @@ dtspec: NUMBER '/' NUMBER
{month = $1; day = $2; noyear = 1;}
| MONTH NUMBER ',' NUMBER
{month = $1; day = $2; year = $4;}
| NUMBER MONTH
{month = $2; day = $1; noyear = 1;}
| NUMBER MONTH NUMBER
{month = $2; day = $1; year = $3;};
| NUMBER ' ' MONTH
{month = $3; day = $1; noyear = 1;}
| NUMBER ' ' MONTH ' ' NUMBER
{month = $3; day = $1; year = $5;};
rspec: NUMBER UNIT
{relsec += 60L * $1 * $2;}
| NUMBER MUNIT
{relmonth += $1 * $2;}
| NUMBER SUNIT
rspec: NUMBER ' ' UNIT
{relsec += 60L * $1 * $3;}
| NUMBER ' ' MUNIT
{relmonth += $1 * $3;}
| NUMBER ' ' SUNIT
{relsec += $1;}
| UNIT
{relsec += 60L * $1;}
@ -406,7 +407,7 @@ static int
lookup(char *id)
{
#define gotit (yylval=i->value, i->type)
#define getid for(j=idvar, k=id; *j++ = *k++; )
#define getid for(j=idvar, k=id; (*j++ = *k++); )
char idvar[20];
register char *j, *k;
@ -463,7 +464,7 @@ lookup(char *id)
static char *lptr;
yylex()
int yylex()
{
extern int yylval;
int sign;
@ -550,7 +551,7 @@ time_t cm_getdate(char *p, struct timeb *now)
hh = mm = ss = 0;
merid = 24;
if (err = yyparse()) return (-1);
if ((err = yyparse())) return (-1);
mcheck(timeflag);
mcheck(zoneflag);

4
cde/programs/dtcm/server/Imakefile
View file

@ -20,8 +20,8 @@ XCOMM (c) Copyright 1996 Hitachi.
PROGRAM = rpc.cmsd
INCLUDES = -I. -I$(CSASRC) -I$(DTHELPSRC)
SYS_LIBRARIES = DtClientSysLibs
INCLUDES = -I. -I$(CSASRC) -I$(DTHELPSRC) $(TIRPCINC)
SYS_LIBRARIES = DtClientSysLibs $(TIRPCLIB)
#ifdef SunArchitecture
LOCAL_LIBRARIES = $(CSALIB) $(DTSVCLIB) $(TTLIB)
#else

2
cde/programs/dtcreate/Imakefile
View file

@ -15,7 +15,7 @@ XCOMM
*/
DEPEND_DEFINES = $(DEPENDDEFINES)
INCLUDES = -I.
INCLUDES = -I. $(TIRPCINC)
#if defined (SunArchitecture)
DEPLIBS = $(DEPDTWIDGETLIB) $(DEPDTSVCLIB) \
$(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)

2
cde/programs/dtdbcache/Imakefile
View file

@ -9,7 +9,7 @@ XCOMM $XConsortium: Imakefile /main/5 1996/09/14 15:26:52 drk $
* It should be set when necessary to the real library macro name.
*/
INCLUDES = -I.
INCLUDES = -I. $(TIRPCINC)
/* DEPLIBS contains the list of library depencies for a client.
* LOCAL_LIBRARIES contains the list of libraries on the link line.

2
cde/programs/dtexec/Imakefile
View file

@ -4,7 +4,7 @@ DEPLIBS = $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
LOCAL_LIBRARIES = $(TTLIB) $(XTOOLLIB) $(XLIB)
DEPEND_DEFINES = $(DEPENDDEFINES)
DEFINES = -DMSGLOG_CLIENT_ONLY
INCLUDES = -I.
INCLUDES = -I. $(TIRPCINC)
SRCS = DtGetMessage.c Main.c MsgLog.c Version.c
OBJS = DtGetMessage.o Main.o MsgLog.o Version.o

2
cde/programs/dtfile/Imakefile
View file

@ -19,7 +19,7 @@ DEFINES = -DMULTIBYTE -DSHAPE -D_ILS_MACROS -DSUN_PERF \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
-DKORNSHELL=\"$(KORNSHELL)\" $(XINOPT)
INCLUDES = -I./dtcopy
INCLUDES = -I./dtcopy $(TIRPCINC)
DEPLIBS = DepDtClientLibs
LOCAL_LIBRARIES = DtClientLibs $(XINLIB)

2
cde/programs/dticon/Imakefile
View file

@ -15,7 +15,7 @@ XCOMM
DEPEND_DEFINES = $(DEPENDDEFINES)
DEFINES = -D__TOOLTALK
INCLUDES = -I.
INCLUDES = -I. $(TIRPCINC)
#if defined (SunArchitecture)
DEPLIBS = $(DEPDTWIDGETLIB) $(DEPDTSVCLIB) $(DEPTTLIB) \

2
cde/programs/dtinfo/DtMmdb/StyleSheet/FeatureSet.C
View file

@ -81,7 +81,7 @@ FeatureSet::evaluate(FeatureSet *result_set) const
result_set->append(new Feature(next.key()->name(),
value));
}
mcatch_noarg(badEvaluationException)
mcatch_noarg(badEvaluationException&)
{
/* do nothing...we just ignore any that will not evaluate */
}

2
cde/programs/dtinfo/DtMmdb/dstr/memory_pool.h
View file

@ -139,7 +139,7 @@ protected:
};
#ifdef C_API
#define g_memory_pool (*g_memory_pool_ptr)
#define g_memory_pool *g_memory_pool_ptr
extern memory_pool* g_memory_pool_ptr;
#endif

4
cde/programs/dtinfo/DtMmdb/dynhash/data_t.C
View file

@ -349,12 +349,12 @@ int data_t::slot_num(int k, int rotate, int prime, int M )
void* data_t::operator new( size_t x )
{
//return (void*)data_t_space_pool.alloc(x);
return (void*)g_memory_pool.alloc(x);
return (void*)(g_memory_pool).alloc(x);
}
void data_t::operator delete( void* ptr )
{
//data_t_space_pool.free((char*)ptr);
g_memory_pool.free((char*)ptr);
(g_memory_pool).free((char*)ptr);
}

4
cde/programs/dtinfo/DtMmdb/oliasdb/c_api_common.C
View file

@ -136,7 +136,11 @@ void DtMmdbQuit()
}
#if __cplusplus < 201103L
void* operator new( size_t sz ) throw(std::bad_alloc)
#else
void* operator new( size_t sz )
#endif
{
void* p = (void*)malloc(sz);
//printf("a::operator new called(). sz= %d, allo=%x\n", sz, p);

2
cde/programs/dtinfo/DtMmdb/oliasdb/user_base.C
View file

@ -160,7 +160,7 @@ user_base::checking_status_t user_base::check_mode()
user_base::checking_status_t user_base::check_lock()
{
char lock_dir[PATHSIZ];
char lock_dir[PATHSIZ+5];
int len;
snprintf(lock_dir, sizeof(lock_dir), "%s/%s", base_path, LOCK_DIR);

4
cde/programs/dtinfo/DtMmdb/storage/heap_comp_funcs.C
View file

@ -75,12 +75,12 @@ Boolean fbytes_t_eq(const void* x, const void* y)
void* fbytes_t::operator new( size_t x )
{
//return (void*)heap_cell_space_pool.alloc(x);
return (void*)g_memory_pool.alloc(x);
return (void*)(g_memory_pool).alloc(x);
}
void fbytes_t::operator delete( void* ptr )
{
//heap_cell_space_pool.free((char*)ptr);
g_memory_pool.free((char*)ptr);
(g_memory_pool).free((char*)ptr);
}

2
cde/programs/dtinfo/clients/dtinfo_start/Imakefile
View file

@ -12,7 +12,7 @@ XCOMM $XConsortium: Imakefile /main/5 1996/06/11 17:45:12 cde-hal $
NormalCplusplusObjectRule()
DEPEND_DEFINES = $(DEPENDDEFINES)
INCLUDES = -I.
INCLUDES = -I. $(TIRPCINC)
#ifdef AIXArchitecture
LDPOSTLIB=-blibpath:/usr/dt/lib:/X11/lib:/usr/lib/threads:/usr/lib:/lib

6
cde/programs/dtinfo/dtinfo/src/Agents/Imakefile
View file

@ -10,11 +10,13 @@ LIBNAME=Agents
NormalCplusplusObjectRule()
#ifdef DoLicenseManagement
INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(MMDB_INCLUDES) $(LICENSE_L_INCLUDES)
INCLUDES = $(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) \
$(MMDB_INCLUDES) $(LICENSE_L_INCLUDES) $(TIRPCINC)
EXTRA_DEFINES=-DLICENSE_MANAGEMENT
#else
XCOMM Should remove LICENSE_L_INCLUDES from this list in this case
INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
INCLUDES = $(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) \
$(COMMON_CLASS_INCLUDES) $(TIRPCINC)
#endif
#include "Classlist.mk"

3
cde/programs/dtinfo/dtinfo/src/Imakefile
View file

@ -48,7 +48,8 @@ SYS_LIBRARIES=-lm -L$(XPROJECTROOT)/lib -L$(MPROJECTROOT)/lib
SYS_LIBRARIES=-lm
#endif
INCLUDES = $(CXXDEPENDINCLUDES) -I. $(BROWSER_INCLUDES) $(MMDB_INCLUDES)
INCLUDES = $(CXXDEPENDINCLUDES) -I. $(BROWSER_INCLUDES) $(MMDB_INCLUDES) \
$(TIRPCINC)
OLIASNORMALLIBS= \
Agents/libAgents.a \

3
cde/programs/dtinfo/dtinfo/src/Managers/Imakefile
View file

@ -23,7 +23,8 @@ LIBNAME=Managers
NormalCplusplusObjectRule()
INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
INCLUDES = $(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) \
$(COMMON_CLASS_INCLUDES) $(TIRPCINC)
#include "Classlist.mk"

2
cde/programs/dtinfo/dtinfo/src/Managers/NodeMgr.C
View file

@ -345,7 +345,7 @@ NodeMgr::load(UAS_Pointer<UAS_Common> &node_ptr)
{
style_sheet_mgr().initOnlineStyleSheet(node_ptr);
}
mcatch_noarg (StyleSheetSyntaxError)
mcatch_noarg (StyleSheetSyntaxError&)
{
message_mgr().error_dialog(
(char*)UAS_String(CATGETS(Set_Messages, 39, "File a Bug")));

2
cde/programs/dtinfo/dtinfo/src/Managers/PrintMgr.C
View file

@ -209,7 +209,7 @@ PrintMgr::load(UAS_Pointer<UAS_Common> &node_ptr)
{
style_sheet_mgr().initPrintStyleSheet(node_ptr);
}
mcatch_noarg (StyleSheetSyntaxError)
mcatch_noarg (StyleSheetSyntaxError&)
{
message_mgr().error_dialog(
(char*)UAS_String(CATGETS(Set_Messages, 39,

4
cde/programs/dtinfo/dtinfo/src/Managers/StyleSheetMgr.C
View file

@ -163,7 +163,7 @@ StyleSheetMgr::initOnlineStyleSheet (UAS_Pointer<UAS_Common> &doc) {
mtry {
styleparse ();
}
mcatch_noarg (StyleSheetSyntaxError) {
mcatch_noarg (StyleSheetSyntaxError&) {
fLastSS = 0;
delete fCurrent;
{ // Don't remove these curlies. For destructors before rethrow
@ -221,7 +221,7 @@ StyleSheetMgr::initPrintStyleSheet (UAS_Pointer<UAS_Common> &doc) {
mtry {
styleparse ();
}
mcatch_noarg (StyleSheetSyntaxError) {
mcatch_noarg (StyleSheetSyntaxError&) {
fLastSS = 0;
delete fCurrent;
{ // Don't remove these curlies. For destructors before rethrow

22
cde/programs/dtinfo/dtinfo/src/Registration.hh
View file

@ -1,25 +1,3 @@
/*
* CDE - Common Desktop Environment
*
* Copyright (c) 1993-2012, The Open Group. All rights reserved.
*
* These libraries and programs are free software; you can
* redistribute them and/or modify them under the terms of the GNU
* Lesser General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* These libraries and programs are distributed in the hope that
* they will be useful, but WITHOUT ANY WARRANTY; without even the
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU Lesser General Public License for more
* details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with these libraries and programs; if not, write
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
#define Set_CatMgr 1
#define Set_DtSR_Parser 2
#define Set_SearchMgr 3

2
cde/programs/dtinfo/dtinfogen/infolib/etc/DataBase.h
View file

@ -40,7 +40,7 @@ public:
PosixError(int error_no, const char *msg)
{ f_errno = error_no;
*((char *) memcpy(f_msg, msg, MAXMSG+1) + MAXMSG+1) = '\0'; };
strncpy(f_msg, msg, MAXMSG+1); };
const char *msg(void) const { return f_msg; };
int error_no(void) const { return f_errno; };

3
cde/programs/dtksh/Imakefile
View file

@ -3,7 +3,8 @@ DESKTOP_VERSION_STRING = DesktopVersionString
KSH93SRC = ./ksh93
DEPEND_DEFINES = $(DEPENDDEFINES)
INCLUDES = -I. -I$(KSH93SRC)/include/ast -I$(KSH93SRC)/src/cmd/ksh93/include -I$(KSH93SRC)/src/cmd/ksh93
INCLUDES = -I. -I$(KSH93SRC)/include/ast -I$(KSH93SRC)/src/cmd/ksh93/include \
-I$(KSH93SRC)/src/cmd/ksh93 $(TIRPCINC)
/* DEPLIBS contains the list of library depencies for a client.
* LOCAL_LIBRARIES contains the list of libraries on the link line.

2
cde/programs/dtmail/MotifApp/Imakefile
View file

@ -11,7 +11,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
#include <Threads.tmpl>
INCLUDES = -I../include/MotifApp -I../include -I../include/utils
INCLUDES = -I../include/MotifApp -I../include -I../include/utils $(TIRPCINC)
#ifndef DtMailDefines
# define DtMailDefines

3
cde/programs/dtmail/dtmail/Imakefile
View file

@ -6,7 +6,8 @@ EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
INCLUDES = -I. -I../include -I../include/MotifApp \
-I../include/utils -I../include/DtMail \
-I../libDtMail/RFC -I$(CDELIBSRC) -I$(DTHELPSRC) $(STD_INCLUDES)
-I../libDtMail/RFC -I$(CDELIBSRC) -I$(DTHELPSRC) \
$(STD_INCLUDES) $(TIRPCINC)
#ifndef DtMailDefines
# define DtMailDefines

2
cde/programs/dtmail/dtmailpr/Imakefile
View file

@ -5,7 +5,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
INCLUDES = -I. -I../include -I../../dtcompat -I../../../. \
-I$(CDELIBSRC) $(STD_INCLUDES)
-I$(CDELIBSRC) $(STD_INCLUDES) $(TIRPCINC)
#ifndef DtMailDefines
# define DtMailDefines

3
cde/programs/dtmail/libDtMail/Common/Imakefile
View file

@ -12,7 +12,8 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
#include <Threads.tmpl>
INCLUDES = -I. -I../../include -I../../include/utils -I$(CDELIBSRC) $(STD_INCLUDES)
INCLUDES = -I. -I../../include -I../../include/utils -I$(CDELIBSRC) \
$(STD_INCLUDES) $(TIRPCINC)
#if HasVFork
VFORK_DEFINES = -DHAS_VFORK

3
cde/programs/dtmail/libDtMail/RFC/Imakefile
View file

@ -12,7 +12,8 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
#include <Threads.tmpl>
INCLUDES = -I. -I../Common -I../../include -I../../include/utils -I$(CDELIBSRC) $(STD_INCLUDES)
INCLUDES = -I. -I../Common -I../../include -I../../include/utils \
-I$(CDELIBSRC) $(STD_INCLUDES) $(TIRPCINC)
#if HasVFork
VFORK_DEFINES = -DHAS_VFORK

1
cde/programs/dtpad/Imakefile
View file

@ -2,6 +2,7 @@ XCOMM $XConsortium: Imakefile /main/11 1996/09/14 15:16:29 drk $
DEPEND_DEFINES = $(DEPENDDEFINES)
DEFINES = -DDT_LITE -DWORDWRAP -UNLS16
INCLUDES = $(TIRPCINC)
DEPLIBS = DepDtClientLibs
LOCAL_LIBRARIES = DtClientLibs

2
cde/programs/dtsearchpath/dtsp/Imakefile
View file

@ -4,7 +4,7 @@ XCOMM $TOG: Imakefile /main/15 1998/08/05 13:21:49 mgreess $
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
INCLUDES = -I. -I../libCliSrv
INCLUDES = -I. -I../libCliSrv $(TIRPCINC)
LOCAL_LIBRARIES = ../libCliSrv/libCliSrv.a $(TTLIB) $(XTOOLLIB) $(XLIB)
DEPLIBS = ../libCliSrv/libCliSrv.a $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)

2
cde/programs/dtsearchpath/libCliSrv/Imakefile
View file

@ -10,7 +10,7 @@ XCOMM $TOG: Imakefile /main/5 1998/08/05 13:22:12 mgreess $
#define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
INCLUDES = -I.
INCLUDES = -I. $(TIRPCINC)
#ifdef SunArchitecture
SYS_LIBRARIES = -ldl -lintl

2
cde/programs/dtspcd/Imakefile
View file

@ -2,7 +2,7 @@ XCOMM $TOG: Imakefile /main/11 1999/02/26 11:29:47 mgreess $
DEFINES = -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\"
INCLUDES = -I. -I$(DTHELPSRC)
INCLUDES = -I. -I$(DTHELPSRC) $(TIRPCINC)
#ifdef HPArchitecture
EXTRA_DEFINES = -D_XOPEN_SOURCE -D__hpux_8_0 -DFUNCPROTO

2
cde/programs/dtstyle/Imakefile
View file

@ -3,7 +3,7 @@ XCOMM $XConsortium: Imakefile /main/8 1996/09/14 15:25:06 drk $
DEPEND_DEFINES = $(DEPENDDEFINES)
DEFINES = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
INCLUDES = -I. -I$(DTHELPSRC)/..
INCLUDES = -I. -I$(DTHELPSRC)/.. $(TIRPCINC)
DEPLIBS = DepDtClientLibs
LOCAL_LIBRARIES = DtClientLibs

3
cde/programs/dtterm/Imakefile
View file

@ -49,7 +49,8 @@ LOCAL_LIBRARIES = $(DTTERMLIB) $(USE_XHPLIB) $(XINPUTLIB) $(HELPLIB) \
$(XMLIB) $(XTOOLLIB) $(XLIB) $(UTILLIB)
SYS_LIBRARIES = DtClientSysLibs
INCLUDES = -I. -I$(DTTERMSRC)/TermPrim -I$(DTTERMSRC)/Term -I$(DTTERMSRC)/TermView
INCLUDES = -I. -I$(DTTERMSRC)/TermPrim -I$(DTTERMSRC)/Term \
-I$(DTTERMSRC)/TermView $(TIRPCINC)
SRCS = \
DtTermLogit.c \

1
cde/programs/dtwm/Imakefile
View file

@ -13,6 +13,7 @@ DTWMDEFINES = -DWSM -DPANELIST
DEPEND_DEFINES = $(DEPENDDEFINES)
DEFINES = $(MWMDEFINES) $(DTWMDEFINES) -DMULTIBYTE -DMINIMAL_DT
INCLUDES = $(TIRPCINC)
DEPLIBS = DepDtClientLibs
LOCAL_LIBRARIES = DtClientLibs -lDtXinerama

1
cde/programs/ttsnoop/Imakefile
View file

@ -6,6 +6,7 @@ UTILLIB = -lutil
#define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
INCLUDES = $(TIRPCINC)
EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
DEPLIBS = $(DEPDTTERMLIB) DepDtClientLibs $(DEPUTILLIB)