From: chase Date: Fri, 5 Oct 2018 20:26:13 +0000 (-0500) Subject: Remove hpversion.h from repository X-Git-Tag: 2.3.0a~25^2~8 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dd68514e4f423e48de52b01fb1f8b829f1232a1e;p=oweals%2Fcde.git Remove hpversion.h from repository This patch removes hpversion.h from the repository, this also untangles a lot of ifdef mess. This closes bug CDExc19524. --- diff --git a/cde/historical/OPENBUGS b/cde/historical/OPENBUGS index c7648e16..9f5b6371 100644 --- a/cde/historical/OPENBUGS +++ b/cde/historical/OPENBUGS @@ -1064,7 +1064,6 @@ CDExc11471 We need lots of mapfiles to specify versioning informatio CDExc12248 Varient builds needed for performance wor CDExc16152 assert after dragging file to Trash for Trash putback fil CDExc19504 make clean doesnt remove .map file -CDExc19524 hpversion.h should be removed from the source tre CDExc19593 If dtlogin fails to build, none of the config files get buil CDExc22064 help graphics unavailable from build tre CDExc23091 misc. compiler warning diff --git a/cde/include/EUSCompat.h b/cde/include/EUSCompat.h index 44e4b9c3..f73afb29 100644 --- a/cde/include/EUSCompat.h +++ b/cde/include/EUSCompat.h @@ -47,13 +47,6 @@ extern "C" { #endif -#if defined(SunOS) -#if (RELMAJOR==5) -#if (RELMINOR<2) -#define STRCASECMP_NOT_DEFINED -#endif /* RELMINOR */ -#endif /* RELMAJOR */ -#endif /* ** System V R4 based systems define the stuff we need in @@ -162,14 +155,6 @@ typedef enum {B_FALSE, B_TRUE} boolean_t; #endif /* AIX */ -/* - * A bug in Solaris 2.1 and the GNU compilers, these are not defined. - */ -#ifdef STRCASECMP_NOT_DEFINED - extern int strcasecmp(const char *, const char *); - extern int strncasecmp(const char *, const char *, size_t); -#endif - #ifdef __cplusplus } #endif diff --git a/cde/include/Imakefile b/cde/include/Imakefile index d6fe5b9d..cbe3a7a4 100644 --- a/cde/include/Imakefile +++ b/cde/include/Imakefile @@ -2,7 +2,7 @@ XCOMM $TOG: Imakefile /main/4 1997/07/09 10:03:24 samborn $ #define PassCDebugFlags /**/ #define IHaveSubdirs -HEADERS = hpversion.h EUSCompat.h +HEADERS = EUSCompat.h SUBDIRS = Xm MakeSubdirs($(SUBDIRS)) diff --git a/cde/include/hpversion.h b/cde/include/hpversion.h deleted file mode 100644 index ac0758a4..00000000 --- a/cde/include/hpversion.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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 - */ -/* $XConsortium: hpversion.h /main/5 1996/08/30 15:22:49 drk $ */ -/* -*-C-*- -**************************************************************** -*/ -/* The following macro should be invoked once by each of the X11 components - to provide standard revision information. */ -#ifndef lint -#define version_tag(FILE_VERSION) \ -static char _hp_merge_version[] = "@(#)" FILE_VERSION; -#else /* lint */ -#define version_tag(FILE_VERSION) -#endif /* lint */ - -/* Any revision information other than the standard 'hpversion' macro shoud - be conditionally compiled using the VERBOSE_REV_INFO constant so that it - can be excluded for official X11 releases. To set VERBOSE_REV_INFO, comment - out one of the following 2 blocks. */ - -/* This block turns on VERBOSE_REV_INFO */ -/* -#ifndef lint -#define VERBOSE_REV_INFO 1 -#else -#ifdef VERBOSE_REV_INFO -#undef VERBOSE_REV_INFO -#endif -#endif -*/ - -/* This block turns off VERBOSE_REV_INFO */ -#ifdef VERBOSE_REV_INFO -#undef VERBOSE_REV_INFO -#endif diff --git a/cde/lib/DtHelp/Imakefile b/cde/lib/DtHelp/Imakefile index 3713f0f6..f30ca5b2 100644 --- a/cde/lib/DtHelp/Imakefile +++ b/cde/lib/DtHelp/Imakefile @@ -78,7 +78,7 @@ SRCS1 = \ HyperText.c JpegUtils.c Messages.c \ PathArea.c Print.c Resize.c \ SetList.c VolSelect.c XInterface.c \ - XUICreate.c XbmUtils.c version.c + XUICreate.c XbmUtils.c OBJS1 = \ Actions.o AsciiSpc.o Callbacks.o \ @@ -91,7 +91,7 @@ OBJS1 = \ HyperText.o JpegUtils.o Messages.o \ PathArea.o Print.o Resize.o \ SetList.o VolSelect.o XInterface.o \ - XUICreate.o XbmUtils.o version.o + XUICreate.o XbmUtils.o SRCS2 = \ Access.c AccessCCDF.c AccessSDL.c \ diff --git a/cde/lib/DtHelp/version.c b/cde/lib/DtHelp/version.c deleted file mode 100644 index ada99e5d..00000000 --- a/cde/lib/DtHelp/version.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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 - */ -#ifndef lint -#ifdef VERBOSE_REV_INFO - /* add any additional revision info here */ -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - -/******************************************************** - -Copyright (c) 1988 by Hewlett-Packard Company -Copyright (c) 1988 by the Massachusetts Institute of Technology - -Permission to use, copy, modify, and distribute this software -and its documentation for any purpose and without fee is hereby -granted, provided that the above copyright notice appear in all -copies and that both that copyright notice and this permission -notice appear in supporting documentation, and that the names of -Hewlett-Packard or M.I.T. not be used in advertising or publicity -pertaining to distribution of the software without specific, written -prior permission. - -(c) Copyright 1993, 1994 Hewlett-Packard Company -(c) Copyright 1993, 1994 International Business Machines Corp. -(c) Copyright 1993, 1994 Sun Microsystems, Inc. -(c) Copyright 1993, 1994 Novell, Inc. -********************************************************/ - -#include - -#ifndef lint -version_tag("$XConsortium: version.c /main/7 1996/08/30 15:23:51 drk $") -#endif /* lint */ diff --git a/cde/lib/DtSvc/Imakefile b/cde/lib/DtSvc/Imakefile index 82f38fd0..ec295348 100644 --- a/cde/lib/DtSvc/Imakefile +++ b/cde/lib/DtSvc/Imakefile @@ -44,12 +44,6 @@ REQUIREDLIBS = SharedDtSvcReqs $(XINLIB) #endif #endif - -#ifdef AlphaArchitecture -EXTRA_SRCS = svc_init.c -EXTRA_OBJS = svc_init.o -#endif - #if defined(SunArchitecture) DTUTIL2_EXTRA_OBJS = DtUtil2/SunDtHelp.o #endif @@ -60,83 +54,78 @@ DTUTIL2_EXTRA_OBJS = DtUtil2/SunDtHelp.o * Each .o must have a listing in *OBJS macros below. */ DTUTIL1_OBJS1 = \ - DtUtil1/Action.o DtUtil1/ActionTt.o \ - DtUtil1/ActionFind.o DtUtil1/ActionDb.o \ - DtUtil1/ActionUtil.o DtUtil1/CmdSpc.o \ - DtUtil1/CmdMain.o DtUtil1/CmdProcess.o \ - DtUtil1/CmdUtilityP.o DtUtil1/DbReader.o \ - DtUtil1/DbUtil.o DtUtil1/Dnd.o \ - DtUtil1/DndDrag.o DtUtil1/DndDrop.o \ - DtUtil1/DndIcon.o DtUtil1/DndBuff.o \ - DtUtil1/DndFile.o DtUtil1/DndText.o \ + DtUtil1/Action.o DtUtil1/ActionTt.o \ + DtUtil1/ActionFind.o DtUtil1/ActionDb.o \ + DtUtil1/ActionUtil.o DtUtil1/CmdSpc.o \ + DtUtil1/CmdMain.o DtUtil1/CmdProcess.o \ + DtUtil1/CmdUtilityP.o DtUtil1/DbReader.o \ + DtUtil1/DbUtil.o DtUtil1/Dnd.o \ + DtUtil1/DndDrag.o DtUtil1/DndDrop.o \ + DtUtil1/DndIcon.o DtUtil1/DndBuff.o \ + DtUtil1/DndFile.o DtUtil1/DndText.o \ DtUtil1/Dt.o DtUtil1/Dts.o \ - DtUtil1/DtsDb.o DtUtil1/DtsSort.o \ - DtUtil1/DbLoad.o DtUtil1/DtsInit.o \ - DtUtil1/DtHash.o DtUtil1/intarray.o \ - DtUtil1/inttab.o DtUtil1/strtab.o \ + DtUtil1/DtsDb.o DtUtil1/DtsSort.o \ + DtUtil1/DbLoad.o DtUtil1/DtsInit.o \ + DtUtil1/DtHash.o DtUtil1/intarray.o \ + DtUtil1/inttab.o DtUtil1/strtab.o \ DtUtil1/MMDb.o DtUtil1/DtsMM.o \ - DtUtil1/GetMwmW.o DtUtil1/GetVWmHint.o \ - DtUtil1/Qualify.o DtUtil1/Saver.o \ - DtUtil1/SetVWmHint.o DtUtil1/SmComm.o \ - DtUtil1/SmUtil.o DtUtil1/WmAddDelWs.o \ - DtUtil1/WmBackWin.o DtUtil1/WmChBackD.o \ - DtUtil1/WmGWsInfo.o DtUtil1/WmGWsList.o \ - DtUtil1/WmMarquee.o DtUtil1/WmRestart.o \ - DtUtil1/WmRmWsFcn.o DtUtil1/WmSetTitle.o \ - DtUtil1/WmSetWs.o DtUtil1/WmWsCallB.o \ - DtUtil1/WmWsHints.o DtUtil1/WmWsOccupy.o + DtUtil1/GetMwmW.o DtUtil1/GetVWmHint.o \ + DtUtil1/Qualify.o DtUtil1/Saver.o \ + DtUtil1/SetVWmHint.o DtUtil1/SmComm.o \ + DtUtil1/SmUtil.o DtUtil1/WmAddDelWs.o \ + DtUtil1/WmBackWin.o DtUtil1/WmChBackD.o \ + DtUtil1/WmGWsInfo.o DtUtil1/WmGWsList.o \ + DtUtil1/WmMarquee.o DtUtil1/WmRestart.o \ + DtUtil1/WmRmWsFcn.o DtUtil1/WmSetTitle.o \ + DtUtil1/WmSetWs.o DtUtil1/WmWsCallB.o \ + DtUtil1/WmWsHints.o DtUtil1/WmWsOccupy.o DTUTIL2_OBJS = \ $(DTUTIL2_EXTRA_OBJS) \ - DtUtil2/ChkpntClient.o DtUtil2/ChkpntListen.o \ - DtUtil2/DtEnvMap.o DtUtil2/DtNlUtils.o \ - DtUtil2/EnvControl.o DtUtil2/FileUtil.o \ - DtUtil2/GetDispRes.o DtUtil2/GetMessage.o \ - DtUtil2/HourGlass.o DtUtil2/SharedProcs.o \ - DtUtil2/SmCreateDirs.o DtUtil2/UErrNoBMS.o \ - DtUtil2/Utility.o DtUtil2/ActIndicator.o \ - DtUtil2/CmdUtility.o DtUtil2/DtGetMessage.o \ - DtUtil2/DtUtil.o DtUtil2/GetEmbed.o \ + DtUtil2/ChkpntClient.o DtUtil2/ChkpntListen.o \ + DtUtil2/DtEnvMap.o DtUtil2/DtNlUtils.o \ + DtUtil2/EnvControl.o DtUtil2/FileUtil.o \ + DtUtil2/GetDispRes.o DtUtil2/GetMessage.o \ + DtUtil2/HourGlass.o DtUtil2/SharedProcs.o \ + DtUtil2/SmCreateDirs.o DtUtil2/UErrNoBMS.o \ + DtUtil2/Utility.o DtUtil2/ActIndicator.o \ + DtUtil2/CmdUtility.o DtUtil2/DtGetMessage.o \ + DtUtil2/DtUtil.o DtUtil2/GetEmbed.o \ DtUtil2/Hash.o DtUtil2/PrintXErr.o \ - DtUtil2/XmWrap.o DtUtil2/addToRes.o \ + DtUtil2/XmWrap.o DtUtil2/addToRes.o \ DtUtil2/lock.o DtUtil2/SvcTT.o \ - DtUtil2/MsgCat.o DtUtil2/MsgLog.o \ + DtUtil2/MsgCat.o DtUtil2/MsgLog.o \ DtUtil2/Info.o DtUtil2/LocaleXlate.o \ DtUtil2/XlationSvc.o DTCODELIBS_OBJS3 = \ - DtCodelibs/buf.o DtCodelibs/filegen.o \ - DtCodelibs/mbschr.o DtCodelibs/pathcollapse.o \ - DtCodelibs/privbuf.o DtCodelibs/shellscan.o \ - DtCodelibs/strcase.o DtCodelibs/strend.o \ - DtCodelibs/strhash.o DtCodelibs/stringio.o \ - DtCodelibs/strtokx.o DtCodelibs/strwcmp.o + DtCodelibs/buf.o DtCodelibs/filegen.o \ + DtCodelibs/mbschr.o DtCodelibs/pathcollapse.o \ + DtCodelibs/privbuf.o DtCodelibs/shellscan.o \ + DtCodelibs/strcase.o DtCodelibs/strend.o \ + DtCodelibs/strhash.o DtCodelibs/stringio.o \ + DtCodelibs/strtokx.o DtCodelibs/strwcmp.o DTENCAP_OBJS4 = \ - DtEncap/MemoryMgr.o DtEncap/SbEvent.o \ - DtEncap/Symbolic.o DtEncap/bmsglob.o \ - DtEncap/connect.o DtEncap/local.o \ + DtEncap/MemoryMgr.o DtEncap/SbEvent.o \ + DtEncap/Symbolic.o DtEncap/bmsglob.o \ + DtEncap/connect.o DtEncap/local.o \ DtEncap/nls.o DtEncap/noio.o \ - DtEncap/pathwexp.o DtEncap/pipe.o \ + DtEncap/pathwexp.o DtEncap/pipe.o \ DtEncap/pty.o DtEncap/remote.o \ - DtEncap/sbstdinc.o DtEncap/scoop.o \ - DtEncap/spc-env.o DtEncap/spc-error.o \ - DtEncap/spc-exec.o DtEncap/spc-net.o \ - DtEncap/spc-obj.o DtEncap/spc-proto.o \ - DtEncap/spc-sm.o DtEncap/spc-termio.o \ - DtEncap/spc-util.o DtEncap/spc-xt.o \ + DtEncap/sbstdinc.o DtEncap/scoop.o \ + DtEncap/spc-env.o DtEncap/spc-error.o \ + DtEncap/spc-exec.o DtEncap/spc-net.o \ + DtEncap/spc-obj.o DtEncap/spc-proto.o \ + DtEncap/spc-sm.o DtEncap/spc-termio.o \ + DtEncap/spc-util.o DtEncap/spc-xt.o \ DtEncap/spc.o DtEncap/stringbuf.o \ DtEncap/usersig.o DTXPM_OBJS5 = \ DtXpm/xpm.o - -SRCS = version.c $(EXTRA_SRCS) -OBJS = version.o $(EXTRA_OBJS) \ - $(DTUTIL1_OBJS1) $(DTUTIL1_OBJS2) $(DTUTIL2_OBJS) \ +OBJS = $(EXTRA_OBJS) $(DTUTIL1_OBJS1) $(DTUTIL1_OBJS2) $(DTUTIL2_OBJS) \ $(DTCODELIBS_OBJS3) $(DTENCAP_OBJS4) $(DTXPM_OBJS5) #include - -DependTarget() diff --git a/cde/lib/DtSvc/svc_init.c b/cde/lib/DtSvc/svc_init.c deleted file mode 100644 index cb8228e1..00000000 --- a/cde/lib/DtSvc/svc_init.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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 - */ -/* $XConsortium: svc_init.c /main/3 1996/07/09 14:47:28 drk $ */ - -#include -#include - -/* - * Activate System V Null pointer treatment. This allows dereferences - * of NULL pointers in the CDE executables to work. - * - * This procedure is obsolete. Dereferencing a NULL pointer is - * an error, and such code should be repaired. - */ - -svc_init() -{ - int usw_val; - - usw_val=uswitch(USC_GET,0); - if ((uswitch(USC_SET, usw_val | USW_NULLP)) == 01) { - perror("svc_init"); - return(-1); - } - return(0); -} diff --git a/cde/lib/DtSvc/version.c b/cde/lib/DtSvc/version.c deleted file mode 100644 index e0cfe15c..00000000 --- a/cde/lib/DtSvc/version.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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 - */ -/* - * (c) Copyright 1993, 1994 Hewlett-Packard Company * - * (c) Copyright 1993, 1994 International Business Machines Corp. * - * (c) Copyright 1993, 1994 Sun Microsystems, Inc. * - * (c) Copyright 1993, 1994 Novell, Inc. * - */ -#ifndef lint -#ifdef VERBOSE_REV_INFO - /* add any additional revision info here */ -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - -/******************************************************** - -Copyright (c) 1988 by Hewlett-Packard Company -Copyright (c) 1988 by the Massachusetts Institute of Technology - -Permission to use, copy, modify, and distribute this software -and its documentation for any purpose and without fee is hereby -granted, provided that the above copyright notice appear in all -copies and that both that copyright notice and this permission -notice appear in supporting documentation, and that the names of -Hewlett-Packard or M.I.T. not be used in advertising or publicity -pertaining to distribution of the software without specific, written -prior permission. - -********************************************************/ - -#include - -#ifndef lint -version_tag("$XConsortium: version.c /main/5 1996/08/30 15:24:25 drk $") -#endif /* lint */ diff --git a/cde/lib/DtTerm/Term/Term.c b/cde/lib/DtTerm/Term/Term.c index 8d98f208..22a12a6c 100644 --- a/cde/lib/DtTerm/Term/Term.c +++ b/cde/lib/DtTerm/Term/Term.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$TOG: Term.c /main/2 1998/01/21 14:57:06 mgreess $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/Term/TermAction.c b/cde/lib/DtTerm/Term/TermAction.c index dc078854..12c163ea 100644 --- a/cde/lib/DtTerm/Term/TermAction.c +++ b/cde/lib/DtTerm/Term/TermAction.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermAction.c /main/1 1996/04/21 19:15:17 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/Term/TermBuffer.c b/cde/lib/DtTerm/Term/TermBuffer.c index 095fed27..238e18bd 100644 --- a/cde/lib/DtTerm/Term/TermBuffer.c +++ b/cde/lib/DtTerm/Term/TermBuffer.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$TOG: TermBuffer.c /main/2 1997/04/17 18:04:41 samborn $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/Term/TermColor.c b/cde/lib/DtTerm/Term/TermColor.c index f332e187..c6bb6aea 100644 --- a/cde/lib/DtTerm/Term/TermColor.c +++ b/cde/lib/DtTerm/Term/TermColor.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermColor.c /main/2 1996/05/08 13:31:00 ageorge $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/Term/TermEnhance.c b/cde/lib/DtTerm/Term/TermEnhance.c index d7763486..9c03d00a 100644 --- a/cde/lib/DtTerm/Term/TermEnhance.c +++ b/cde/lib/DtTerm/Term/TermEnhance.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermEnhance.c /main/1 1996/04/21 19:15:41 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994 Hewlett-Packard Company * * (c) Copyright 1993, 1994 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/Term/TermFunction.c b/cde/lib/DtTerm/Term/TermFunction.c index 2a8e8972..dfc425af 100644 --- a/cde/lib/DtTerm/Term/TermFunction.c +++ b/cde/lib/DtTerm/Term/TermFunction.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$TOG: TermFunction.c /main/2 1998/03/16 14:41:27 mgreess $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/Term/TermFunctionKey.c b/cde/lib/DtTerm/Term/TermFunctionKey.c index 8a2ab8e6..27a87d4c 100644 --- a/cde/lib/DtTerm/Term/TermFunctionKey.c +++ b/cde/lib/DtTerm/Term/TermFunctionKey.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermFunctionKey.c /main/1 1996/04/21 19:15:53 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994 Hewlett-Packard Company * * (c) Copyright 1993, 1994 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/Term/TermParse.c b/cde/lib/DtTerm/Term/TermParse.c index 594b3c62..d41035d1 100644 --- a/cde/lib/DtTerm/Term/TermParse.c +++ b/cde/lib/DtTerm/Term/TermParse.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$TOG: TermParse.c /main/3 1999/10/15 12:25:13 mgreess $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/Term/TermVersion.c b/cde/lib/DtTerm/Term/TermVersion.c index 32c21ed8..6c801e56 100644 --- a/cde/lib/DtTerm/Term/TermVersion.c +++ b/cde/lib/DtTerm/Term/TermVersion.c @@ -30,11 +30,4 @@ * (c) Copyright 1996 FUJITSU LIMITED. * (c) Copyright 1996 Hitachi. */ - -#include - -#ifndef lint -version_tag("dtterm1.0: $XConsortium: TermVersion.c /main/2 1996/08/30 15:24:52 drk $") -#endif /* lint */ - char _DtTermPullInTermWhatString[] = ""; diff --git a/cde/lib/DtTerm/TermPrim/TermPrim.c b/cde/lib/DtTerm/TermPrim/TermPrim.c index b1398709..9e064a76 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrim.c +++ b/cde/lib/DtTerm/TermPrim/TermPrim.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$TOG: TermPrim.c /main/15 1999/10/14 16:35:04 mgreess $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimAction.c b/cde/lib/DtTerm/TermPrim/TermPrimAction.c index 4a108aad..4287e3e8 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimAction.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimAction.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermPrimAction.c /main/1 1996/04/21 19:16:44 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimBuffer.c b/cde/lib/DtTerm/TermPrim/TermPrimBuffer.c index 24f633af..fcc251a9 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimBuffer.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimBuffer.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermPrimBuffer.c /main/1 1996/04/21 19:16:49 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c b/cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c index b6a27e15..faf67b12 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimBufferWc.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermPrimBufferWc.c /main/1 1996/04/21 19:16:59 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimCursor.c b/cde/lib/DtTerm/TermPrim/TermPrimCursor.c index 2f648190..05c6418d 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimCursor.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimCursor.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermPrimCursor.c /main/1 1996/04/21 19:17:13 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimDebug.c b/cde/lib/DtTerm/TermPrim/TermPrimDebug.c index 42fe1780..9990ebfb 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimDebug.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimDebug.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermPrimDebug.c /main/4 1996/11/21 19:58:15 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimFunction.c b/cde/lib/DtTerm/TermPrim/TermPrimFunction.c index 370648f6..dad8e351 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimFunction.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimFunction.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermPrimFunction.c /main/1 1996/04/21 19:17:27 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994 Hewlett-Packard Company * * (c) Copyright 1993, 1994 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c index 5b29ace6..0beb1d19 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-bsd.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermPrimGetPty-bsd.c /main/4 1996/11/21 19:58:32 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994 Hewlett-Packard Company * * (c) Copyright 1993, 1994 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-clone.c b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-clone.c index e0bfa6f3..d22bb810 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-clone.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-clone.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$TOG: TermPrimGetPty-clone.c /main/7 1998/04/03 17:11:08 mgreess $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994 Hewlett-Packard Company * * (c) Copyright 1993, 1994 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-svr4.c b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-svr4.c index fbe2f3dc..5973b23f 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimGetPty-svr4.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimGetPty-svr4.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermPrimGetPty-svr4.c /main/1 1996/04/21 19:17:39 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994 Hewlett-Packard Company * * (c) Copyright 1993, 1994 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimLineDraw.c b/cde/lib/DtTerm/TermPrim/TermPrimLineDraw.c index f696e2ac..1a5417b6 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimLineDraw.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimLineDraw.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermPrimLineDraw.c /main/1 1996/04/21 19:17:48 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimParse.c b/cde/lib/DtTerm/TermPrim/TermPrimParse.c index 82b2686f..d061d60b 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimParse.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimParse.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermPrimParse.c /main/1 1996/04/21 19:18:12 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994 Hewlett-Packard Company * * (c) Copyright 1993, 1994 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimParser.c b/cde/lib/DtTerm/TermPrim/TermPrimParser.c index 667e2df5..6a953ea0 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimParser.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimParser.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$TOG: TermPrimParser.c /main/2 1999/10/15 12:23:41 mgreess $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimPendingText.c b/cde/lib/DtTerm/TermPrim/TermPrimPendingText.c index 8c1df1b5..5dbf1d3d 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimPendingText.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimPendingText.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$TOG: TermPrimPendingText.c /main/3 1997/07/03 15:40:05 samborn $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994 Hewlett-Packard Company * * (c) Copyright 1993, 1994 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimRender.c b/cde/lib/DtTerm/TermPrim/TermPrimRender.c index 63bbf462..040e5a25 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimRender.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimRender.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$TOG: TermPrimRender.c /main/3 1999/07/20 17:34:54 mgreess $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimRenderFont.c b/cde/lib/DtTerm/TermPrim/TermPrimRenderFont.c index 222177d9..1675a71d 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimRenderFont.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimRenderFont.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermPrimRenderFont.c /main/1 1996/04/21 19:18:47 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994 Hewlett-Packard Company * * (c) Copyright 1993, 1994 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimRenderFontSet.c b/cde/lib/DtTerm/TermPrim/TermPrimRenderFontSet.c index 4bf962f5..af852f6b 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimRenderFontSet.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimRenderFontSet.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermPrimRenderFontSet.c /main/1 1996/04/21 19:18:53 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994 Hewlett-Packard Company * * (c) Copyright 1993, 1994 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimRenderLineDraw.c b/cde/lib/DtTerm/TermPrim/TermPrimRenderLineDraw.c index 3c4a9089..6c585534 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimRenderLineDraw.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimRenderLineDraw.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermPrimRenderLineDraw.c /main/1 1996/04/21 19:18:59 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994 Hewlett-Packard Company * * (c) Copyright 1993, 1994 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimRenderMb.c b/cde/lib/DtTerm/TermPrim/TermPrimRenderMb.c index c5991a46..3454cfcf 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimRenderMb.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimRenderMb.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermPrimRenderMb.c /main/1 1996/04/21 19:19:05 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimRepType.c b/cde/lib/DtTerm/TermPrim/TermPrimRepType.c index 469f640b..91bb2b10 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimRepType.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimRepType.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermPrimRepType.c /main/1 1996/04/21 19:19:11 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimScroll.c b/cde/lib/DtTerm/TermPrim/TermPrimScroll.c index c3551b8e..f142f3fe 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimScroll.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimScroll.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermPrimScroll.c /main/1 1996/04/21 19:19:17 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994 Hewlett-Packard Company * * (c) Copyright 1993, 1994 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSelect.c b/cde/lib/DtTerm/TermPrim/TermPrimSelect.c index 5f2c302a..cd2338fe 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimSelect.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimSelect.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$TOG: TermPrimSelect.c /main/6 1999/10/14 16:22:53 mgreess $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c b/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c index 02448bdd..e200ed89 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimSetPty.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$TOG: TermPrimSetPty.c /main/2 1998/04/03 17:11:24 mgreess $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c b/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c index 96ec4811..49e10bd5 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimSetUtmp.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$TOG: TermPrimSetUtmp.c /main/10 1998/04/03 17:11:42 mgreess $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimSubproc.c b/cde/lib/DtTerm/TermPrim/TermPrimSubproc.c index fe22a4e1..367cf694 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimSubproc.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimSubproc.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$TOG: TermPrimSubproc.c /main/11 1998/04/20 12:45:57 mgreess $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimUtil.c b/cde/lib/DtTerm/TermPrim/TermPrimUtil.c index 66bdc12e..0184b88c 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimUtil.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimUtil.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$TOG: TermPrimUtil.c /main/3 1997/04/17 18:25:29 samborn $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermPrim/TermPrimVersion.c b/cde/lib/DtTerm/TermPrim/TermPrimVersion.c index 7d6d275a..73acaeb7 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimVersion.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimVersion.c @@ -30,11 +30,4 @@ * (c) Copyright 1996 FUJITSU LIMITED. * (c) Copyright 1996 Hitachi. */ - -#include - -#ifndef lint -version_tag("DtTermPrimitiveWidget: $XConsortium: TermPrimVersion.c /main/2 1996/08/30 15:25:43 drk $") -#endif /* lint */ - char _DtTermPrimPullInTermWhatString[] = ""; diff --git a/cde/lib/DtTerm/TermPrim/TermPrimWMProtocols.c b/cde/lib/DtTerm/TermPrim/TermPrimWMProtocols.c index ee7e8ca1..7af6e14b 100644 --- a/cde/lib/DtTerm/TermPrim/TermPrimWMProtocols.c +++ b/cde/lib/DtTerm/TermPrim/TermPrimWMProtocols.c @@ -20,11 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermPrimWMProtocols.c /main/1 1996/04/21 19:20:04 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermView/TermView.c b/cde/lib/DtTerm/TermView/TermView.c index 8c276865..fd1a5c30 100644 --- a/cde/lib/DtTerm/TermView/TermView.c +++ b/cde/lib/DtTerm/TermView/TermView.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermView.c /main/1 1996/04/21 19:20:13 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermView/TermViewGlobalDialog.c b/cde/lib/DtTerm/TermView/TermViewGlobalDialog.c index 5f8766f1..ec2bf55b 100644 --- a/cde/lib/DtTerm/TermView/TermViewGlobalDialog.c +++ b/cde/lib/DtTerm/TermView/TermViewGlobalDialog.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermViewGlobalDialog.c /main/2 1996/08/28 16:49:57 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermView/TermViewMenu.c b/cde/lib/DtTerm/TermView/TermViewMenu.c index 06b8ad18..0ad1437c 100644 --- a/cde/lib/DtTerm/TermView/TermViewMenu.c +++ b/cde/lib/DtTerm/TermView/TermViewMenu.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermViewMenu.c /main/4 1996/09/26 16:42:48 samborn $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994, 1996 Hewlett-Packard Company * * (c) Copyright 1993, 1994, 1996 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/TermView/TermViewTerminalDialog.c b/cde/lib/DtTerm/TermView/TermViewTerminalDialog.c index 76f807af..af10e2e5 100644 --- a/cde/lib/DtTerm/TermView/TermViewTerminalDialog.c +++ b/cde/lib/DtTerm/TermView/TermViewTerminalDialog.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: TermViewTerminalDialog.c /main/2 1996/08/28 16:50:55 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994 Hewlett-Packard Company * * (c) Copyright 1993, 1994 International Business Machines Corp. * diff --git a/cde/lib/DtTerm/util/lineToData.c b/cde/lib/DtTerm/util/lineToData.c index 7c8803b1..5813ba41 100644 --- a/cde/lib/DtTerm/util/lineToData.c +++ b/cde/lib/DtTerm/util/lineToData.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: lineToData.c /main/1 1996/04/21 19:20:58 drk $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994 Hewlett-Packard Company * * (c) Copyright 1993, 1994 International Business Machines Corp. * diff --git a/cde/lib/DtWidget/version.c b/cde/lib/DtWidget/version.c deleted file mode 100644 index 080074f3..00000000 --- a/cde/lib/DtWidget/version.c +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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 - */ -#ifndef lint -#ifdef VERBOSE_REV_INFO - /* add any additional revision info here */ -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - -/******************************************************** - -Copyright (c) 1988 by Hewlett-Packard Company -Copyright (c) 1988 by the Massachusetts Institute of Technology - -Permission to use, copy, modify, and distribute this software -and its documentation for any purpose and without fee is hereby -granted, provided that the above copyright notice appear in all -copies and that both that copyright notice and this permission -notice appear in supporting documentation, and that the names of -Hewlett-Packard or M.I.T. not be used in advertising or publicity -pertaining to distribution of the software without specific, written -prior permission. - -********************************************************/ - -#include - -#ifndef lint -version_tag("$XConsortium: version.c /main/4 1996/08/30 15:26:32 drk $") -#endif /* lint */ diff --git a/cde/programs/Imakefile b/cde/programs/Imakefile index 72f2224d..c588ada8 100644 --- a/cde/programs/Imakefile +++ b/cde/programs/Imakefile @@ -7,16 +7,6 @@ NSGMLSDIR = nsgmls #endif EXTRADIRS = types localized tttypes $(NSGMLSDIR) util dtopen -XCOMM some of these cannot be built on linux yet. -XCOMM dtinfo -#if defined(LinuxArchitecture) -DTINFODIR = dtinfo -#elif defined(BSDArchitecture) -DTINFODIR = dtinfo -#else -DTINFODIR = dtinfo -#endif - SUBDIRS = dthelp dsdm dtmail dtpad dtfile dtwm dtlogin \ dtsession dthello dtstyle dtexec dtdbcache dticon dtterm \ @@ -25,7 +15,7 @@ SUBDIRS = dthelp dsdm dtmail dtpad dtfile dtwm dtlogin \ dtappbuilder dtappintegrate dtprintegrate dtconfig \ dtcreate dtprintinfo fontaliases dtdspmsg ttsnoop \ dtudcfonted dtudcexch dtimsstart dtdocbook dtpdm dtsr \ - dtpdmd $(DTINFODIR) $(EXTRADIRS) + dtpdmd dtinfo $(EXTRADIRS) LINTSUBDIRS = dthelp dsdm dtmail dtpad dtfile dtwm dtlogin \ dtsession dthello dtstyle dtexec dtdbcache dticon dtterm \ @@ -33,7 +23,7 @@ LINTSUBDIRS = dthelp dsdm dtmail dtpad dtfile dtwm dtlogin \ dtscreen dtksh dtcm dtsearchpath \ dtappbuilder dtappintegrate dtprintegrate dtprintinfo dtdspmsg \ dtudcfonted dtudcexch dtimsstart dtdocbook dtpdm dtsr \ - dtpdmd $(DTINFODIR) $(EXTRADIRS) + dtpdmd dtinfo $(EXTRADIRS) MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) diff --git a/cde/programs/dtaction/Imakefile b/cde/programs/dtaction/Imakefile index c1cb7fff..4eb25cea 100644 --- a/cde/programs/dtaction/Imakefile +++ b/cde/programs/dtaction/Imakefile @@ -12,15 +12,8 @@ SYS_LIBRARIES = -lm EXTRA_DEFINES = +e #endif -#ifdef LinuxArchitecture -SYS_LIBRARIES = -lm -lcrypt -#endif - -#ifdef FreeBSDArchitecture -SYS_LIBRARIES = -lm -lcrypt -#endif - -#ifdef NetBSDArchitecture +#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || \ +defined(NetBSDArchitecture) SYS_LIBRARIES = -lm -lcrypt #endif diff --git a/cde/programs/dtcalc/Imakefile b/cde/programs/dtcalc/Imakefile index 2b66f7aa..afc1e1cf 100644 --- a/cde/programs/dtcalc/Imakefile +++ b/cde/programs/dtcalc/Imakefile @@ -21,18 +21,15 @@ SYS_LIBRARIES = -lmsaa -liconv SYS_LIBRARIES = -lintl -lm -ldl #endif -#if defined(HPOSFArchitecture) -#endif - SRCS = calctool.c ds_common.c ds_popup.c \ ds_widget.c ds_xlib.c functions.c \ help.c motif.c mp.c \ - text.c version.c + text.c OBJS = calctool.o ds_common.o ds_popup.o \ ds_widget.o ds_xlib.o functions.o \ help.o motif.o mp.o \ - text.o version.o + text.o ComplexProgramTarget(dtcalc) diff --git a/cde/programs/dtcalc/version.c b/cde/programs/dtcalc/version.c deleted file mode 100644 index 03d1f265..00000000 --- a/cde/programs/dtcalc/version.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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 - */ -/* $XConsortium: version.c /main/5 1996/08/30 15:28:16 drk $ - * - * (c) Copyright 1996 Digital Equipment Corporation. - * (c) Copyright 1993,1994,1996 Hewlett-Packard Company. - * (c) Copyright 1993,1994,1996 International Business Machines Corp. - * (c) Copyright 1993,1994,1996 Sun Microsystems, Inc. - * (c) Copyright 1993,1994,1996 Novell, Inc. - * (c) Copyright 1996 FUJITSU LIMITED. - * (c) Copyright 1996 Hitachi. - */ - -#include - -#ifndef lint -version_tag("dtcalc: $XConsortium: version.c /main/5 1996/08/30 15:28:16 drk $") -#endif /* lint */ - - - - - - - diff --git a/cde/programs/dtcreate/Imakefile b/cde/programs/dtcreate/Imakefile index fdf66c58..5daaad49 100644 --- a/cde/programs/dtcreate/Imakefile +++ b/cde/programs/dtcreate/Imakefile @@ -62,8 +62,7 @@ SRCS = \ fileio.c \ af_aux.c \ icon_selection_dialog.c \ - parser.c \ - version.c + parser.c OBJS = \ main.o \ @@ -81,8 +80,7 @@ OBJS = \ fileio.o \ af_aux.o \ icon_selection_dialog.o \ - parser.o \ - version.o + parser.o NormalLibraryObjectRule() @@ -91,8 +89,7 @@ ComplexProgramTarget(dtcreate) /***** For dtge make a client_OBJS.o using client_main.o ******/ /***** This implies the existence of client_main.c ******/ /***** dtge hidden symbols *******/ -#ifdef BuildHugeObject -#ifdef HPArchitecture +#if defined(BuildHugeObject) && defined(HPArchitecture) #ifdef __hp9000s300 HIDDEN_SYMBOLS = -h _main -h _HelpOnItemCB -h _CreateHelpDialog \ -h _DisplayHelpDialog -h _ChangeTitle @@ -100,6 +97,5 @@ HIDDEN_SYMBOLS = -h _main -h _HelpOnItemCB -h _CreateHelpDialog \ HIDDEN_SYMBOLS = -h main -h HelpOnItemCB -h CreateHelpDialog \ -h DisplayHelpDialog -h ChangeTitle #endif -#endif SpecialRelocatableTarget(dtcreate,$(HIDDEN_SYMBOLS),$(OBJS)) #endif diff --git a/cde/programs/dtcreate/version.c b/cde/programs/dtcreate/version.c deleted file mode 100644 index 3f621af0..00000000 --- a/cde/programs/dtcreate/version.c +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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 - */ -#include - -#ifndef lint -version_tag("dtcreate: $XConsortium: version.c /main/5 1996/08/30 15:29:02 drk $") -#endif /* lint */ diff --git a/cde/programs/dtexec/Imakefile b/cde/programs/dtexec/Imakefile index 883cb2e9..a5528a59 100644 --- a/cde/programs/dtexec/Imakefile +++ b/cde/programs/dtexec/Imakefile @@ -6,8 +6,8 @@ DEPEND_DEFINES = $(DEPENDDEFINES) DEFINES = -DMSGLOG_CLIENT_ONLY INCLUDES = -I. $(TIRPCINC) -SRCS = DtGetMessage.c Main.c MsgLog.c Version.c -OBJS = DtGetMessage.o Main.o MsgLog.o Version.o +SRCS = DtGetMessage.c Main.c MsgLog.c +OBJS = DtGetMessage.o Main.o MsgLog.o ComplexProgramTarget(dtexec) diff --git a/cde/programs/dtexec/Version.c b/cde/programs/dtexec/Version.c deleted file mode 100644 index 2fa99b4d..00000000 --- a/cde/programs/dtexec/Version.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * 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 - */ -/* $XConsortium: Version.c /main/5 1996/08/30 15:30:02 drk $ - * - * (c) Copyright 1996 Digital Equipment Corporation. - * (c) Copyright 1993,1994,1996 Hewlett-Packard Company. - * (c) Copyright 1993,1994,1996 International Business Machines Corp. - * (c) Copyright 1993,1994,1996 Sun Microsystems, Inc. - * (c) Copyright 1993,1994,1996 Novell, Inc. - * (c) Copyright 1996 FUJITSU LIMITED. - * (c) Copyright 1996 Hitachi. - */ - -/******************************************************** - -Copyright (c) 1988, 1990 by Hewlett-Packard Company -Copyright (c) 1988 by the Massachusetts Institute of Technology - -Permission to use, copy, modify, and distribute this software -and its documentation for any purpose and without fee is hereby -granted, provided that the above copyright notice appear in all -copies and that both that copyright notice and this permission -notice appear in supporting documentation, and that the names of -Hewlett-Packard or M.I.T. not be used in advertising or publicity -pertaining to distribution of the software without specific, written -prior permission. - -********************************************************/ - -#include - -#ifndef lint -version_tag("dtexec: $XConsortium: Version.c /main/5 1996/08/30 15:30:02 drk $") -#endif /* lint */ - - - - - - - diff --git a/cde/programs/dtfile/Imakefile b/cde/programs/dtfile/Imakefile index 70a939d5..7e470201 100644 --- a/cde/programs/dtfile/Imakefile +++ b/cde/programs/dtfile/Imakefile @@ -55,8 +55,7 @@ SRCS = ChangeDir.c ChangeDirP.c Command.c Common.c \ IconicPath.c Main.c Menu.c MkDir.c \ ModAttr.c ModAttrP.c MultiView.c OverWrite.c \ Prefs.c PrefsP.c SharedMsgs.c SharedProcs.c \ - ToolTalk.c Trash.c Utils.c fsDialog.c \ - version.c + ToolTalk.c Trash.c Utils.c fsDialog.c DTCOPY_OBJS = dtcopy/sharedFuncs.o dtcopy/fsrtns.o @@ -69,7 +68,7 @@ OBJS = ChangeDir.o ChangeDirP.o Command.o Common.o \ ModAttr.o ModAttrP.o MultiView.o OverWrite.o \ Prefs.o PrefsP.o SharedMsgs.o SharedProcs.o \ ToolTalk.o Trash.o Utils.o fsDialog.o \ - version.o $(DTCOPY_OBJS) + $(DTCOPY_OBJS) ComplexProgramTarget(dtfile) diff --git a/cde/programs/dtfile/version.c b/cde/programs/dtfile/version.c deleted file mode 100644 index 2cc1223d..00000000 --- a/cde/programs/dtfile/version.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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 - */ -/************************************<+>************************************* - **************************************************************************** - * - * FILE: version.c - * - * COMPONENT_NAME: Desktop File Manager (dtfile) - * - * Description: Contains functions related to version. - * - * FUNCTIONS: hpversion - * - * (c) Copyright 1993, 1994, 1995 Hewlett-Packard Company - * (c) Copyright 1993, 1994, 1995 International Business Machines Corp. - * (c) Copyright 1993, 1994, 1995 Sun Microsystems, Inc. - * (c) Copyright 1993, 1994, 1995 Novell, Inc. - * - **************************************************************************** - ************************************<+>*************************************/ - -#include - -#ifndef lint -version_tag("dtfile: $XConsortium: version.c /main/5 1996/08/30 15:30:40 drk $") -#endif /* lint */ - - - - - - - diff --git a/cde/programs/dthello/Imakefile b/cde/programs/dthello/Imakefile index 67a3dc65..868d3209 100644 --- a/cde/programs/dthello/Imakefile +++ b/cde/programs/dthello/Imakefile @@ -14,9 +14,9 @@ EXTRA_DEFINES = -DHP_COLOR SYS_LIBRARIES = -lm -ldl -lgen #endif - SRCS1 = dthello.c version.c + SRCS1 = dthello.c SRCS = $(SRCS1) - OBJS = dthello.o version.o \ + OBJS = dthello.o \ $(CDELIBSRC)/DtSvc/DtUtil2/EnvControl.o \ $(CDELIBSRC)/DtSvc/DtUtil2/DtNlUtils.o \ $(CDELIBSRC)/DtSvc/DtUtil2/GetDispRes.o diff --git a/cde/programs/dthello/dthello.c b/cde/programs/dthello/dthello.c index eec7e5b8..7789e721 100644 --- a/cde/programs/dthello/dthello.c +++ b/cde/programs/dthello/dthello.c @@ -26,9 +26,6 @@ * (c) Copyright 1993, 1994 Sun Microsystems, Inc. * * (c) Copyright 1993, 1994 Novell, Inc. * */ -#ifdef VERBOSE_REV_INFO -static char rcsid[] = "$TOG: dthello.c /main/9 1998/04/20 12:52:17 mgreess $"; -#endif /* VERBOSE_REV_INFO */ /******************************<+>************************************* ********************************************************************** ** diff --git a/cde/programs/dthello/version.c b/cde/programs/dthello/version.c deleted file mode 100644 index 8245bef2..00000000 --- a/cde/programs/dthello/version.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * 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 - */ -/* $XConsortium: version.c /main/5 1996/08/30 15:31:27 drk $ - * - * (c) Copyright 1996 Digital Equipment Corporation. - * (c) Copyright 1993,1994,1996 Hewlett-Packard Company. - * (c) Copyright 1993,1994,1996 International Business Machines Corp. - * (c) Copyright 1993,1994,1996 Sun Microsystems, Inc. - * (c) Copyright 1993,1994,1996 Novell, Inc. - * (c) Copyright 1996 FUJITSU LIMITED. - * (c) Copyright 1996 Hitachi. - */ - -/******************************************************** - -Copyright (c) 1988, 1990 by Hewlett-Packard Company -Copyright (c) 1988 by the Massachusetts Institute of Technology - -Permission to use, copy, modify, and distribute this software -and its documentation for any purpose and without fee is hereby -granted, provided that the above copyright notice appear in all -copies and that both that copyright notice and this permission -notice appear in supporting documentation, and that the names of -Hewlett-Packard or M.I.T. not be used in advertising or publicity -pertaining to distribution of the software without specific, written -prior permission. - -********************************************************/ - -#include - -#ifndef lint -version_tag("dthello: $XConsortium: version.c /main/5 1996/08/30 15:31:27 drk $") -#endif /* lint */ - - - - - - - diff --git a/cde/programs/dthelp/dthelpgen/Imakefile b/cde/programs/dthelp/dthelpgen/Imakefile index b700e28b..ab3ce818 100644 --- a/cde/programs/dthelp/dthelpgen/Imakefile +++ b/cde/programs/dthelp/dthelpgen/Imakefile @@ -11,7 +11,7 @@ SYS_LIBRARIES = DtClientSysLibs $(CXXLIB) EXTRA_INCLUDES = -I$(DTHELPSRC) -SRCS = helpgen.c version.c -OBJS = helpgen.o version.o +SRCS = helpgen.c +OBJS = helpgen.o ComplexProgramTarget($(PROGRAMS)) diff --git a/cde/programs/dthelp/dthelpgen/version.c b/cde/programs/dthelp/dthelpgen/version.c deleted file mode 100644 index 9176fdca..00000000 --- a/cde/programs/dthelp/dthelpgen/version.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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 - */ -/******************************************************** - -Copyright (c) 1988 by the Massachusetts Institute of Technology - -Permission to use, copy, modify, and distribute this software -and its documentation for any purpose and without fee is hereby -granted, provided that the above copyright notice appear in all -copies and that both that copyright notice and this permission -notice appear in supporting documentation, and that the names of -Hewlett-Packard or M.I.T. not be used in advertising or publicity -pertaining to distribution of the software without specific, written -prior permission. - -(c) Copyright 1996 Digital Equipment Corporation. -(c) Copyright 1988,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 FUJITSU LIMITED. -(c) Copyright 1996 Hitachi. - -********************************************************/ - -#include - -#ifndef lint -version_tag("dthelpgen: $XConsortium: version.c /main/5 1996/08/30 15:39:04 drk $") -#endif /* lint */ diff --git a/cde/programs/dthelp/dthelpprint/Imakefile b/cde/programs/dthelp/dthelpprint/Imakefile index 95633ef8..82137eec 100644 --- a/cde/programs/dthelp/dthelpprint/Imakefile +++ b/cde/programs/dthelp/dthelpprint/Imakefile @@ -16,7 +16,7 @@ SYS_LIBRARIES = DtClientSysLibs -lw $(CXXLIB) SYS_LIBRARIES = DtClientSysLibs $(CXXLIB) #endif -SRCS = Main.c Initialize.c PrintUtil.c PrintTopics.c PrintManStrFile.c version.c -OBJS = Main.o Initialize.o PrintUtil.o PrintTopics.o PrintManStrFile.o version.o +SRCS = Main.c Initialize.c PrintUtil.c PrintTopics.c PrintManStrFile.c +OBJS = Main.o Initialize.o PrintUtil.o PrintTopics.o PrintManStrFile.o ComplexProgramTarget($(PROGRAMS)) diff --git a/cde/programs/dthelp/dthelpprint/version.c b/cde/programs/dthelp/dthelpprint/version.c deleted file mode 100644 index b320971e..00000000 --- a/cde/programs/dthelp/dthelpprint/version.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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 - */ -/******************************************************** - -Copyright (c) 1988 by the Massachusetts Institute of Technology - -Permission to use, copy, modify, and distribute this software -and its documentation for any purpose and without fee is hereby -granted, provided that the above copyright notice appear in all -copies and that both that copyright notice and this permission -notice appear in supporting documentation, and that the names of -Hewlett-Packard or M.I.T. not be used in advertising or publicity -pertaining to distribution of the software without specific, written -prior permission. - -(c) Copyright 1993-1994,1996 Digital Equipment Corporation. -(c) Copyright 1988,1993-1994,1996 Hewlett-Packard Company. -(c) Copyright 1993-1994,1996 International Business Machines Corp. -(c) Copyright 1993-1994,1996 Sun Microsystems, Inc. -(c) Copyright 1996 Novell, Inc. -(c) Copyright 1996 FUJITSU LIMITED. -(c) Copyright 1996 Hitachi. - -********************************************************/ - -#include - -#ifndef lint -version_tag("dthelpprint: $XConsortium: version.c /main/5 1996/08/30 15:37:29 drk $") -#endif /* lint */ diff --git a/cde/programs/dthelp/dthelpview/Imakefile b/cde/programs/dthelp/dthelpview/Imakefile index 59ca67c5..57832206 100644 --- a/cde/programs/dthelp/dthelpview/Imakefile +++ b/cde/programs/dthelp/dthelpview/Imakefile @@ -9,7 +9,7 @@ DEPLIBS = $(DEPDTHELPLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) SYS_LIBRARIES = DtClientSysLibs $(CXXLIB) -SRCS = Main.c ManPage.c Util.c version.c -OBJS = Main.o ManPage.o Util.o version.o +SRCS = Main.c ManPage.c Util.c +OBJS = Main.o ManPage.o Util.o ComplexProgramTarget($(PROGRAMS)) diff --git a/cde/programs/dthelp/dthelpview/version.c b/cde/programs/dthelp/dthelpview/version.c deleted file mode 100644 index d037cc74..00000000 --- a/cde/programs/dthelp/dthelpview/version.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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 - */ -/******************************************************** - -Copyright (c) 1988 by the Massachusetts Institute of Technology - -Permission to use, copy, modify, and distribute this software -and its documentation for any purpose and without fee is hereby -granted, provided that the above copyright notice appear in all -copies and that both that copyright notice and this permission -notice appear in supporting documentation, and that the names of -Hewlett-Packard or M.I.T. not be used in advertising or publicity -pertaining to distribution of the software without specific, written -prior permission. - -(c) Copyright 1993-1994,1996 Digital Equipment Corporation. -(c) Copyright 1987-1994,1996 Hewlett-Packard Company. -(c) Copyright 1993-1994,1996 International Business Machines Corp. -(c) Copyright 1993-1994,1996 Sun Microsystems, Inc. -(c) Copyright 1996 Novell, Inc. -(c) Copyright 1996 FUJITSU LIMITED. -(c) Copyright 1996 Hitachi. - -********************************************************/ - -#include - -#ifndef lint -version_tag("dthelpview: $XConsortium: version.c /main/5 1996/08/30 15:38:24 drk $") -#endif /* lint */ diff --git a/cde/programs/dticon/Imakefile b/cde/programs/dticon/Imakefile index 12ddd046..6b504df1 100644 --- a/cde/programs/dticon/Imakefile +++ b/cde/programs/dticon/Imakefile @@ -50,12 +50,12 @@ SRCS = dtIconShell.c event.c fileIO.c \ fileIODialog.c globals.c graphics.c \ help.c image.c main.c \ newIconDialog.c process.c queryDialog.c \ - stdErrDialog.c utils.c version.c + stdErrDialog.c utils.c OBJS = dtIconShell.o event.o fileIO.o \ fileIODialog.o globals.o graphics.o \ help.o image.o main.o \ newIconDialog.o process.o queryDialog.o \ - stdErrDialog.o utils.o version.o + stdErrDialog.o utils.o ComplexProgramTarget(dticon) diff --git a/cde/programs/dticon/version.c b/cde/programs/dticon/version.c deleted file mode 100644 index 66b51270..00000000 --- a/cde/programs/dticon/version.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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 - */ -/* $XConsortium: version.c /main/5 1996/08/30 15:32:43 drk $ - * - * (c) Copyright 1996 Digital Equipment Corporation. - * (c) Copyright 1993,1994,1996 Hewlett-Packard Company. - * (c) Copyright 1993,1994,1996 International Business Machines Corp. - * (c) Copyright 1993,1994,1996 Sun Microsystems, Inc. - * (c) Copyright 1993,1994,1996 Novell, Inc. - * (c) Copyright 1996 FUJITSU LIMITED. - * (c) Copyright 1996 Hitachi. - */ -#include - -#ifndef lint -version_tag("dticon: $XConsortium: version.c /main/5 1996/08/30 15:32:43 drk $") -#endif /* lint */ diff --git a/cde/programs/dtinfo/dtinfo/src/Imakefile b/cde/programs/dtinfo/dtinfo/src/Imakefile index 56b7ed1b..fc56b564 100644 --- a/cde/programs/dtinfo/dtinfo/src/Imakefile +++ b/cde/programs/dtinfo/dtinfo/src/Imakefile @@ -80,10 +80,8 @@ OLIASTLIBS= \ #endif OLIASLIBS= $(OLIASNORMALLIBS) $(OLIASTLIBS) -#ifndef HPArchitecture -# ifdef UseDlOpen +#if !defined(HPArchitecture) && defined(UseDlOpen) DLLIB=-ldl -# endif #endif OTHEROBJS=Support/InputNotifier.o diff --git a/cde/programs/dtksh/Imakefile b/cde/programs/dtksh/Imakefile index 6be8ec40..872874d2 100644 --- a/cde/programs/dtksh/Imakefile +++ b/cde/programs/dtksh/Imakefile @@ -74,8 +74,7 @@ SRCS = \ extra.c \ xmdtksym.c \ findsym.c \ - msgs.c \ - version.c + msgs.c OBJS = \ $(KSH93OBJ) \ @@ -91,7 +90,6 @@ OBJS = \ xmdtksym.o \ findsym.o \ msgs.o \ - version.o \ $(LOCAL_LIBRARIES2) all:: dtksh diff --git a/cde/programs/dtksh/version.c b/cde/programs/dtksh/version.c deleted file mode 100644 index 8d1e1ac9..00000000 --- a/cde/programs/dtksh/version.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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 - */ -/******************************************************** - -Copyright (c) 1988, 1990, 1991, 1992 by Hewlett-Packard Company -Copyright (c) 1988 by the Massachusetts Institute of Technology - -Permission to use, copy, modify, and distribute this software -and its documentation for any purpose and without fee is hereby -granted, provided that the above copyright notice appear in all -copies and that both that copyright notice and this permission -notice appear in supporting documentation, and that the names of -Hewlett-Packard or M.I.T. not be used in advertising or publicity -pertaining to distribution of the software without specific, written -prior permission. - -********************************************************/ - -#include - -#ifndef lint -version_tag("dtksh: $XConsortium: version.c /main/5 1996/08/30 15:36:49 drk $") -#endif /* lint */ - - - - - - - diff --git a/cde/programs/dtlogin/Imakefile b/cde/programs/dtlogin/Imakefile index 3ff67a06..120add7e 100644 --- a/cde/programs/dtlogin/Imakefile +++ b/cde/programs/dtlogin/Imakefile @@ -24,8 +24,7 @@ HEADERS = dm.h vg.h vglogo.h vgmsg.h vgproto.h DESDEFS = -DHASDES -DHASXDMAUTH -DSILLYEXPORTRULE DESOBJS = xdmauth.o DESSRCS = xdmauth.c -#else -#if HasDESLibrary +#elif HasDESLibrary DESDEFS = -DHASDES DESOBJS = xdmauth.o DESSRCS = xdmauth.c @@ -34,7 +33,6 @@ DESDEFS = DESOBJS = DESSRCS = #endif -#endif #ifndef UsePamLibrary # define UsePamLibrary NO @@ -85,15 +83,14 @@ LOGINDEPXLIB = $(DEPXLIB) LOGINXLIB = $(XLIB) #ifdef HPArchitecture -# if (! defined(UseInstalled)) && (! defined(UseMitLibrariesFromSystemOnly)) -# ifdef SHLIB +# if !defined(UseInstalled) && !defined(UseMitLibrariesFromSystemOnly) && \ + defined(SHLIB) LOGINDEPXMULIB = $(XMUSRC)/libXmu.a LOGINXMULIB = $(LOGINDEPXMULIB) LOGINDEPXLIB = $(XLIBSRC)/libX11.a LOGINXLIB = $(LOGINDEPXLIB) /* This is really a kludge !! */ LOGINLDOPTIONS = -Wl,-a archive -# endif # endif # if OSMajorVersion >= 10 SYS_LIBRARIES = -lsec @@ -162,28 +159,22 @@ INCLUDES = -I$(XPROJECTROOT)/include/freetype2 SRCS1 = access.c account.c auth.c genauth.c daemon.c dm.c \ dpylist.c error.c file.c mitauth.c protodpy.c policy.c \ reset.c resource.c server.c session.c socket.c util.c \ - verify.c version.c sysauth.c fontpath.c $(DESSRCS) \ - qualify.c choose.c netaddr.c xdmcp.c \ - $(PAM_SRCS) $(SOLARIS_SRCS) + verify.c sysauth.c fontpath.c $(DESSRCS) qualify.c choose.c \ + netaddr.c xdmcp.c $(PAM_SRCS) $(SOLARIS_SRCS) OBJS1 = access.o account.o auth.o genauth.o daemon.o dm.o \ dpylist.o error.o file.o mitauth.o protodpy.o policy.o \ reset.o resource.o server.o session.o socket.o util.o \ - verify.o version.o sysauth.o fontpath.o $(DESOBJS) \ - qualify.o choose.o netaddr.o xdmcp.o \ - $(PAM_OBJS) $(SOLARIS_OBJS) + verify.o sysauth.o fontpath.o $(DESOBJS) qualify.o choose.o \ + netaddr.o xdmcp.o $(PAM_OBJS) $(SOLARIS_OBJS) PROG2 = dtgreet #ifdef AlphaArchitecture - SRCS2 = vgcallback.c vglogo.c vgmain.c vgutil.c \ - vgversion.c vglang.c vgsiaform.c - OBJS2 = vgcallback.o vglogo.o vgmain.o vgutil.o \ - vgversion.o vglang.o vgsiaform.o + SRCS2 = vgcallback.c vglogo.c vgmain.c vgutil.c vglang.c vgsiaform.c + OBJS2 = vgcallback.o vglogo.o vgmain.o vgutil.o vglang.o vgsiaform.o #else - SRCS2 = vgcallback.c vglogo.c vgmain.c vgutil.c \ - vgversion.c vglang.c - OBJS2 = vgcallback.o vglogo.o vgmain.o vgutil.o \ - vgversion.o vglang.o + SRCS2 = vgcallback.c vglogo.c vgmain.c vgutil.c vglang.c + OBJS2 = vgcallback.o vglogo.o vgmain.o vgutil.o vglang.o #endif PROG3 = dtchooser @@ -324,12 +315,9 @@ EXTRA_RES_DEFINES = \ * **************************************************************************/ -#ifndef BLS -# ifdef HPArchitecture -# if (OSMajorVersion == 8) && (OSMinorVersion == 8) -# define BLS -# endif -# endif +#if !defined(BLS) && defined(HPArchitecture) && (OSMajorVersion == 8) && \ + (OSMinorVersion == 8) +# define BLS #endif #ifdef BLS @@ -461,11 +449,9 @@ vgutil.o: #endif SpecialObjectRule(resource.o, $(ICONFIGFILES), $(EXTRA_RES_DEFINES) $(RES_DEFINES) $(CCINLIBS)) -#ifdef HPArchitecture -#ifndef DEBUGTREE +#if defined(HPArchitecture) && !defined(DEBUGTREE) SpecialObjectRule(session.o,,+O1 $(CCINLIBS)) #endif -#endif #if !defined(USE_KRB) && !defined(USE_RGY) @@ -487,13 +473,10 @@ MakeDirectories(install,$(XDMDIR)) InstallProgramWithFlags(xdmshell,$(XBINDIR), /**/) #endif -#if !defined(USE_KRB) && !defined(USE_RGY) +#if !defined(USE_KRB) && !defined(USE_RGY) && defined(BuildHugeObject) && \ + defined(HPArchitecture) && !defined(BLS) /***** For dtge make a client_OBJS.o using client_main.o ******/ /***** This implies the existence of client_main.c ******/ -# ifdef BuildHugeObject -# if defined (HPArchitecture) && ! defined (BLS) SpecialRelocatableTarget(dtlogin,$(HIDDEN_SYMBOLS1),$(OBJS1)) SpecialRelocatableTarget(dtgreet,$(HIDDEN_SYMBOLS2),$(OBJS2)) -# endif -# endif #endif diff --git a/cde/programs/dtlogin/genauth.c b/cde/programs/dtlogin/genauth.c index 66157e39..a2b4ea7d 100644 --- a/cde/programs/dtlogin/genauth.c +++ b/cde/programs/dtlogin/genauth.c @@ -106,25 +106,18 @@ extern int errno; #define Time_t time_t #endif -#ifndef DONT_USE_DES -# ifndef USE_CRYPT -# if defined(AIXV3) || defined(hpux) || defined(__FreeBSD__) -# define USE_CRYPT -# endif -# ifdef __OpenBSD__ -# define DONT_USE_DES -# endif -# ifdef sun -# define USE_CRYPT -# if (OSMAJORVERSION >= 4) - /* avoid strange sun crypt hackery */ -# define crypt _crypt -# endif +#if !defined(DONT_USE_DES) && !defined(USE_CRYPT) +# if defined(AIXV3) || defined(hpux) || defined(__FreeBSD__) +# define USE_CRYPT +# elif defined(__OpenBSD__) +# define DONT_USE_DES +# elif defined(sun) +# define USE_CRYPT +# if (OSMAJORVERSION >= 4) + /* avoid strange sun crypt hackery */ +# define crypt _crypt # endif # endif -#endif - -#if !defined (DONT_USE_DES) && !defined (USE_CRYPT) # define USE_ENCRYPT #endif diff --git a/cde/programs/dtlogin/version.c b/cde/programs/dtlogin/version.c deleted file mode 100644 index fcef0362..00000000 --- a/cde/programs/dtlogin/version.c +++ /dev/null @@ -1,78 +0,0 @@ -/* - * 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 - */ -/* $XConsortium: version.c /main/6 1996/08/30 15:33:21 drk $ - * - * (c) Copyright 1996 Digital Equipment Corporation. - * (c) Copyright 1993,1994,1996 Hewlett-Packard Company. - * (c) Copyright 1993,1994,1996 International Business Machines Corp. - * (c) Copyright 1993,1994,1996 Sun Microsystems, Inc. - * (c) Copyright 1993,1994,1996 Novell, Inc. - * (c) Copyright 1996 FUJITSU LIMITED. - * (c) Copyright 1996 Hitachi. - */ - -/******************************************************** - -Copyright (c) 1988, 1990 by Hewlett-Packard Company -Copyright (c) 1988 by the Massachusetts Institute of Technology - -Permission to use, copy, modify, and distribute this software -and its documentation for any purpose and without fee is hereby -granted, provided that the above copyright notice appear in all -copies and that both that copyright notice and this permission -notice appear in supporting documentation, and that the names of -Hewlett-Packard or M.I.T. not be used in advertising or publicity -pertaining to distribution of the software without specific, written -prior permission. - -********************************************************/ - -#include - -#ifndef lint -version_tag("dtlogin: $XConsortium: version.c /main/6 1996/08/30 15:33:21 drk $") - -#ifdef __AFS -static char _afs_version[] = "@(#)AFS 3 Authentication"; -#endif - -#ifdef __KERBEROS -static char _krb_version[] = "@(#)Kerberos Authentication"; -#endif - -#ifdef __PASSWD_ETC -static char _rgy_version[] = "@(#)Passwd Etc. - Domain Registry Authentication"; -#endif - -#ifdef BLS -static char _bls_version[] = "@(#)HP BLS Authentication"; -#endif - -#endif /* lint */ - - - - - - - diff --git a/cde/programs/dtlogin/vgversion.c b/cde/programs/dtlogin/vgversion.c deleted file mode 100644 index 3c1ff6b7..00000000 --- a/cde/programs/dtlogin/vgversion.c +++ /dev/null @@ -1,78 +0,0 @@ -/* - * 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 - */ -/* $XConsortium: vgversion.c /main/6 1996/08/30 15:34:13 drk $ - * - * (c) Copyright 1996 Digital Equipment Corporation. - * (c) Copyright 1993,1994,1996 Hewlett-Packard Company. - * (c) Copyright 1993,1994,1996 International Business Machines Corp. - * (c) Copyright 1993,1994,1996 Sun Microsystems, Inc. - * (c) Copyright 1993,1994,1996 Novell, Inc. - * (c) Copyright 1996 FUJITSU LIMITED. - * (c) Copyright 1996 Hitachi. - */ - -/******************************************************** - -Copyright (c) 1988, 1990 by Hewlett-Packard Company -Copyright (c) 1988 by the Massachusetts Institute of Technology - -Permission to use, copy, modify, and distribute this software -and its documentation for any purpose and without fee is hereby -granted, provided that the above copyright notice appear in all -copies and that both that copyright notice and this permission -notice appear in supporting documentation, and that the names of -Hewlett-Packard or M.I.T. not be used in advertising or publicity -pertaining to distribution of the software without specific, written -prior permission. - -********************************************************/ - -#include - -#ifndef lint -version_tag("dtgreet: $XConsortium: vgversion.c /main/6 1996/08/30 15:34:13 drk $") - -#ifdef __AFS -static char _afs_version[] = "@(#)AFS 3 Authentication"; -#endif - -#ifdef __KERBEROS -static char _krb_version[] = "@(#)Kerberos Authentication"; -#endif - -#ifdef __PASSWD_ETC -static char _rgy_version[] = "@(#)Passwd Etc. - Domain Registry Authentication"; -#endif - -#ifdef BLS -static char _bls_version[] = "@(#)HP BLS Authentication"; -#endif - -#endif /* lint */ - - - - - - - diff --git a/cde/programs/dtpad/Imakefile b/cde/programs/dtpad/Imakefile index b4300dec..0714cab7 100644 --- a/cde/programs/dtpad/Imakefile +++ b/cde/programs/dtpad/Imakefile @@ -19,7 +19,7 @@ SRCS = \ helpCB.c helpDlg.c main.c \ optionsCB.c printJob.c printOutput.c \ printSetup.c session.c ttMsgSupport.c \ - ttSaveSupport.c version.c + ttSaveSupport.c OBJS = \ dtpad.o editCB.o fileCB.o \ @@ -27,7 +27,7 @@ OBJS = \ helpCB.o helpDlg.o main.o \ optionsCB.o printJob.o printOutput.o \ printSetup.o session.o ttMsgSupport.o \ - ttSaveSupport.o version.o + ttSaveSupport.o ComplexProgramTarget(dtpad) diff --git a/cde/programs/dtpad/version.c b/cde/programs/dtpad/version.c deleted file mode 100644 index 97b4c6b6..00000000 --- a/cde/programs/dtpad/version.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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 - */ -/******************************************************** - -Copyright (c) 1988, 1990 by Hewlett-Packard Company -Copyright (c) 1988 by the Massachusetts Institute of Technology - -Permission to use, copy, modify, and distribute this software -and its documentation for any purpose and without fee is hereby -granted, provided that the above copyright notice appear in all -copies and that both that copyright notice and this permission -notice appear in supporting documentation, and that the names of -Hewlett-Packard or M.I.T. not be used in advertising or publicity -pertaining to distribution of the software without specific, written -prior permission. - -******************************************************************** -** (c) Copyright 1993, 1994 Hewlett-Packard Company -** (c) Copyright 1993, 1994 International Business Machines Corp. -** (c) Copyright 1993, 1994 Sun Microsystems, Inc. -** (c) Copyright 1993, 1994 Novell, Inc. -******************************************************************** - -********************************************************/ - -#include - -#ifndef lint -/* NOTE: Be sure to update the corresponding version argument for - * ttdt_open() in TTstartDesktopMediaExchange() (in ttMsgSupport.c). - */ -version_tag("dtpad: $XConsortium: version.c /main/5 1996/08/30 15:27:22 drk $") -#endif /* lint */ - - - - - - diff --git a/cde/programs/dtsession/Imakefile b/cde/programs/dtsession/Imakefile index 62f60c0b..cdd0fa30 100644 --- a/cde/programs/dtsession/Imakefile +++ b/cde/programs/dtsession/Imakefile @@ -89,8 +89,7 @@ OBJS= $(ALTDIRECTORY)SmMain.o \ $(ALTDIRECTORY)SmAuth.o \ $(ALTDIRECTORY)SmWatch.o \ $(ALTDIRECTORY)SmProp.o \ - $(ALTDIRECTORY)SmDB.o \ - version.o + $(ALTDIRECTORY)SmDB.o SRCS= SmMain.c \ SmHelp.c \ @@ -114,8 +113,7 @@ SRCS= SmMain.c \ SmAuth.c \ SmWatch.c \ SmProp.c \ - SmDB.c \ - version.c + SmDB.c /************************************************************************** * @@ -132,14 +130,6 @@ SRCS= SmMain.c \ /******* RGY or KRB CASE *******************************/ #if (defined(USE_KRB) || defined(USE_RGY)) && defined(HPArchitecture) /*******************************************************/ -ALTDIRECTORY = $(CDESRC)/dtsession/ -SRCS= version.c - -includes:: - @echo " linking $(ALTDIRECTORY)version.c to version.c";\ - ln -f -s $(ALTDIRECTORY)version.c . -version.o: version.c - ObjectCompile($(_NOOP_)) /* don't build other .o's */ .c.o: diff --git a/cde/programs/dtsession/version.c b/cde/programs/dtsession/version.c deleted file mode 100644 index 5d1c8f78..00000000 --- a/cde/programs/dtsession/version.c +++ /dev/null @@ -1,66 +0,0 @@ -/* - * 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 - */ -/* $XConsortium: version.c /main/5 1996/08/30 15:34:51 drk $ - * - * (c) Copyright 1996 Digital Equipment Corporation. - * (c) Copyright 1993,1994,1996 Hewlett-Packard Company. - * (c) Copyright 1993,1994,1996 International Business Machines Corp. - * (c) Copyright 1993,1994,1996 Sun Microsystems, Inc. - * (c) Copyright 1993,1994,1996 Novell, Inc. - * (c) Copyright 1996 FUJITSU LIMITED. - * (c) Copyright 1996 Hitachi. - */ - -/******************************************************** - -Copyright (c) 1988, 1990 by Hewlett-Packard Company -Copyright (c) 1988 by the Massachusetts Institute of Technology - -Permission to use, copy, modify, and distribute this software -and its documentation for any purpose and without fee is hereby -granted, provided that the above copyright notice appear in all -copies and that both that copyright notice and this permission -notice appear in supporting documentation, and that the names of -Hewlett-Packard or M.I.T. not be used in advertising or publicity -pertaining to distribution of the software without specific, written -prior permission. - -********************************************************/ - -#include - -#ifndef lint -version_tag("dtsession: $XConsortium: version.c /main/5 1996/08/30 15:34:51 drk $") - -#ifdef __PASSWD_ETC -static char _rgy_version[] = "@(#)Passwd Etc. - Domain Registry Authentication"; -#endif - -#endif /* lint */ - - - - - - - diff --git a/cde/programs/dtstyle/Imakefile b/cde/programs/dtstyle/Imakefile index 8af15c18..0d4ca3bb 100644 --- a/cde/programs/dtstyle/Imakefile +++ b/cde/programs/dtstyle/Imakefile @@ -21,13 +21,13 @@ EXTRA_DEFINES = -D$(PROGRAMS) PROGRAMS = dtstyle -OBJS = Main.o version.o MainWin.o Font.o Audio.o \ +OBJS = Main.o MainWin.o Font.o Audio.o \ Startup.o Mouse.o SaveRestore.o Backdrop.o Screen.o \ Keyboard.o ColorMain.o ColorPalette.o ColorFile.o ColorEdit.o \ Resource.o Protocol.o Dtwm.o Help.o HelpCB.o I18nMain.o \ I18nEnv.o I18nUtil.o $(EXTRA_OBJS) -SRCS = Main.c version.c MainWin.c Font.c Audio.c \ +SRCS = Main.c MainWin.c Font.c Audio.c \ Startup.c Mouse.c SaveRestore.c Backdrop.c Screen.c \ Keyboard.c ColorMain.c ColorPalette.c ColorFile.c ColorEdit.c \ Resource.c Protocol.c Dtwm.c Help.c HelpCB.c I18nMain.c \ diff --git a/cde/programs/dtstyle/version.c b/cde/programs/dtstyle/version.c deleted file mode 100644 index 9d8df89a..00000000 --- a/cde/programs/dtstyle/version.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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 - */ -/* $XConsortium: version.c /main/5 1996/08/30 15:35:36 drk $ - * - * (c) Copyright 1996 Digital Equipment Corporation. - * (c) Copyright 1993,1994,1996 Hewlett-Packard Company. - * (c) Copyright 1993,1994,1996 International Business Machines Corp. - * (c) Copyright 1993,1994,1996 Sun Microsystems, Inc. - * (c) Copyright 1993,1994,1996 Novell, Inc. - * (c) Copyright 1996 FUJITSU LIMITED. - * (c) Copyright 1996 Hitachi. - */ - -#include -version_tag("dtstyle: $XConsortium: version.c /main/5 1996/08/30 15:35:36 drk $") diff --git a/cde/programs/dtterm/DtTermMain.c b/cde/programs/dtterm/DtTermMain.c index 282efb3d..c5486f2e 100644 --- a/cde/programs/dtterm/DtTermMain.c +++ b/cde/programs/dtterm/DtTermMain.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$TOG: DtTermMain.c /main/19 1999/09/17 13:26:34 mgreess $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994 Hewlett-Packard Company * * (c) Copyright 1993, 1994 International Business Machines Corp. * diff --git a/cde/programs/dtterm/DtTermServer.c b/cde/programs/dtterm/DtTermServer.c index 7af26027..4cdb2cbd 100644 --- a/cde/programs/dtterm/DtTermServer.c +++ b/cde/programs/dtterm/DtTermServer.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$TOG: DtTermServer.c /main/5 1998/07/23 18:09:38 mgreess $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994 Hewlett-Packard Company * * (c) Copyright 1993, 1994 International Business Machines Corp. * diff --git a/cde/programs/dtterm/DtTermSyntax.c b/cde/programs/dtterm/DtTermSyntax.c index 3a134ac9..c284d2dd 100644 --- a/cde/programs/dtterm/DtTermSyntax.c +++ b/cde/programs/dtterm/DtTermSyntax.c @@ -20,12 +20,6 @@ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth * Floor, Boston, MA 02110-1301 USA */ -#ifndef lint -#ifdef VERBOSE_REV_INFO -static char rcs_id[] = "$XConsortium: DtTermSyntax.c /main/4 1996/05/16 11:22:57 ageorge $"; -#endif /* VERBOSE_REV_INFO */ -#endif /* lint */ - /* * * (c) Copyright 1993, 1994 Hewlett-Packard Company * * (c) Copyright 1993, 1994 International Business Machines Corp. * diff --git a/cde/programs/dtterm/util/Imakefile b/cde/programs/dtterm/util/Imakefile index 61605bbc..bc82f04e 100644 --- a/cde/programs/dtterm/util/Imakefile +++ b/cde/programs/dtterm/util/Imakefile @@ -1,6 +1,6 @@ XCOMM $XConsortium: Imakefile /main/4 1996/04/21 19:51:51 drk $ - DEFINES = -DVERBOSE_REV_INFO + DEFINES = SRCS = logger.c OBJS = logger.o SYS_LIBRARIES = -lm diff --git a/cde/programs/dtwm/Imakefile b/cde/programs/dtwm/Imakefile index 3241de39..1d62ac6e 100644 --- a/cde/programs/dtwm/Imakefile +++ b/cde/programs/dtwm/Imakefile @@ -33,8 +33,7 @@ SRCSXM = \ WmMenu.c WmProperty.c WmProtocol.c \ WmResCvt.c WmResParse.c WmResource.c \ WmSignal.c WmWinConf.c WmWinInfo.c \ - WmWinList.c WmWinState.c version.c \ - WmMultiHead.c + WmWinList.c WmWinState.c WmMultiHead.c SRCSDT = \ Button.c Callback.c Clock.c \ @@ -55,8 +54,7 @@ OBJSXM = \ WmMenu.o WmProperty.o WmProtocol.o \ WmResCvt.o WmResParse.o WmResource.o \ WmSignal.o WmWinConf.o WmWinInfo.o \ - WmWinList.o WmWinState.o version.o \ - WmMultiHead.o + WmWinList.o WmWinState.o WmMultiHead.o OBJSDT = \ Button.o Callback.o Clock.o \ diff --git a/cde/programs/dtwm/version.c b/cde/programs/dtwm/version.c deleted file mode 100644 index f446ba2e..00000000 --- a/cde/programs/dtwm/version.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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 - */ -/* - * (c) Copyright 1989, 1990, 1991, 1992, 1993 OPEN SOFTWARE FOUNDATION, INC. - * ALL RIGHTS RESERVED - * - * (c) Copyright 1993, 1994 Hewlett-Packard Company - * (c) Copyright 1993, 1994 International Business Machines Corp. - * (c) Copyright 1993, 1994 Sun Microsystems, Inc. - * (c) Copyright 1993, 1994 Novell, Inc. -*/ - -#include - -#ifndef lint -version_tag("dtwm: $XConsortium: version.c /main/5 1996/08/30 15:36:22 drk $") -#endif /* lint */