X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cde%2Fconfig%2Fimake%2Fimakemdep.h;h=bad190de04a590623d199d595acf2b65f61bc1ed;hb=904a48b8229911fd59f4dbc98b010ed2380c319f;hp=3a4614c83c93817fd7b82f311c46c1f8d1af426b;hpb=29294e0373de1afa0c2cb57f08ba5fb985494b56;p=oweals%2Fcde.git diff --git a/cde/config/imake/imakemdep.h b/cde/config/imake/imakemdep.h index 3a4614c8..bad190de 100644 --- a/cde/config/imake/imakemdep.h +++ b/cde/config/imake/imakemdep.h @@ -16,7 +16,7 @@ * details. * * You should have received a copy of the GNU Lesser General Public - * License along with these librararies and programs; if not, write + * 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 */ @@ -65,26 +65,14 @@ in this Software without prior written authorization from The Open Group. #endif #endif -#if defined(macII) || defined(_AUX_SOURCE) -#define imake_ccflags "-DmacII -DSYSV" -#endif - #ifdef stellar #define imake_ccflags "-DSYSV" #endif -#if defined(USL) || defined(__USLC__) || defined(Oki) || defined(NCR) +#if defined(Oki) || defined(NCR) #define imake_ccflags "-Xa -DSVR4" #endif -/* SCO may define __USLC__ so put this after the USL check */ -#if defined(M_UNIX) || defined(_SCO_DS) -#ifdef imake_ccflags -#undef imake_ccflags -#endif -#define imake_ccflags "-Dsco" -#endif - #ifdef sony #if defined(SYSTYPE_SYSV) || defined(_SYSTYPE_SYSV) #define imake_ccflags "-DSVR4" @@ -144,10 +132,6 @@ in this Software without prior written authorization from The Open Group. #define imake_ccflags "-fn -tm c1" #endif -#ifdef apollo -#define imake_ccflags "-DX_NOT_POSIX" -#endif - #ifdef WIN32 #if _MSC_VER < 1000 #define imake_ccflags "-nologo -batch -D__STDC__" @@ -156,10 +140,6 @@ in this Software without prior written authorization from The Open Group. #endif #endif -#ifdef __uxp__ -#define imake_ccflags "-DSVR4 -DANSICPP" -#endif - #ifdef __sxg__ #define imake_ccflags "-DSYSV -DUSG -DNOSTDHDRS" #endif @@ -212,7 +192,7 @@ in this Software without prior written authorization from The Open Group. * descriptor onto another, define such a mechanism here (if you don't * already fall under the existing category(ies). */ -#if defined(SYSV) && !defined(_CRAY) && !defined(Mips) && !defined(_SEQUENT_) && !defined(sco) +#if defined(SYSV) && !defined(_CRAY) && !defined(Mips) && !defined(_SEQUENT_) #define dup2(fd1,fd2) ((fd1 == fd2) ? fd1 : (close(fd2), \ fcntl(fd1, F_DUPFD, fd2))) #endif @@ -227,7 +207,7 @@ in this Software without prior written authorization from The Open Group. * all colons). One way to tell if you need this is to see whether or not * your Makefiles have no tabs in them and lots of @@ strings. */ -#if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || defined(sco) || defined(__llvm__) || (defined(AMOEBA) && defined(CROSS_COMPILE)) +#if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || defined(__llvm__) || (defined(AMOEBA) && defined(CROSS_COMPILE)) #define FIXUP_CPP_WHITESPACE #endif #ifdef WIN32 @@ -249,22 +229,15 @@ in this Software without prior written authorization from The Open Group. #define USE_CC_E #define DEFAULT_CC "cl" #endif -#ifdef apollo -#define DEFAULT_CPP "/usr/lib/cpp" -#endif #if defined(_IBMR2) && !defined(DEFAULT_CPP) #define DEFAULT_CPP "/usr/ccs/lib/cpp" #endif #if defined(sun) && (defined(SVR4) || defined(__svr4__) || defined(__SVR4) || defined(__sol__)) #define DEFAULT_CPP "/usr/ccs/lib/cpp" #endif -#if defined(__bsdi__) || defined(__NetBSD__) \ - || (defined(__FreeBSD__) && !defined(CPP_IN_LIBEXEC)) +#if defined(__NetBSD__) || (defined(__FreeBSD__) && !defined(CPP_IN_LIBEXEC)) #define DEFAULT_CPP "/usr/bin/cpp" #endif -#ifdef __uxp__ -#define DEFAULT_CPP "/usr/ccs/lib/cpp" -#endif #ifdef __sxg__ #define DEFAULT_CPP "/usr/lib/cpp" #endif @@ -316,7 +289,7 @@ char *cpp_argv[ARGUMENTS] = { #ifdef unix "-Uunix", /* remove unix symbol so that filename unix.c okay */ #endif -#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(USL) || defined(sco) || defined(ISC) || defined(__bsdi__) || defined(linux) || defined(__hpux__) || defined(__vxworks) +#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(ISC) || defined(__linux__) || defined(__hpux__) || defined(__vxworks) # ifdef __i386__ "-D__i386__", # endif @@ -370,12 +343,6 @@ char *cpp_argv[ARGUMENTS] = { #ifdef M4310 "-DM4310", /* Tektronix */ #endif -#if defined(macII) || defined(_AUX_SOURCE) - "-DmacII", /* Apple A/UX */ -#endif -#if defined(USL) || defined(__USLC__) - "-DUSL", /* USL */ -#endif #ifdef sony "-Dsony", /* Sony */ #if !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV) && NEWSOS < 42 @@ -432,12 +399,6 @@ char *cpp_argv[ARGUMENTS] = { "-DSVR4", # endif #endif /* MOTOROLA */ -#if defined(M_UNIX) || defined(sco) - "-Dsco", -# if defined(sco324) - "-Dsco324", -# endif -#endif #ifdef i386 "-Di386", # ifdef SVR4 @@ -461,12 +422,6 @@ char *cpp_argv[ARGUMENTS] = { # endif # endif # endif -# ifdef SCO - "-DSCO", -# ifdef SCO324 - "-DSCO324", -# endif -# endif # ifdef ESIX "-DESIX", # endif @@ -501,12 +456,6 @@ char *cpp_argv[ARGUMENTS] = { # endif # endif # endif -# ifdef SCO - "-DSCO", -# ifdef SCO324 - "-DSCO324", -# endif -# endif # ifdef ESIX "-DESIX", # endif @@ -518,21 +467,6 @@ char *cpp_argv[ARGUMENTS] = { # endif # endif #endif -#ifdef __osf__ - "-D__osf__", -# ifdef __mips__ - "-D__mips__", -# endif -# ifdef __alpha - "-D__alpha", -# endif -# ifdef __i386__ - "-D__i386__", -# endif -# ifdef __GNUC__ - "-traditional", -# endif -#endif #ifdef Oki "-DOki", #endif @@ -554,10 +488,7 @@ char *cpp_argv[ARGUMENTS] = { #endif #ifdef linux "-traditional", - "-Dlinux", -#endif -#ifdef __uxp__ - "-D__uxp__", + "-D__linux__", #endif #ifdef __sxg__ "-D__sxg__", @@ -622,7 +553,7 @@ char *cpp_argv[ARGUMENTS] = { # define DEFAULT_OS_MINOR_REV "r %[0-9]" /* No information available to generate default OSTeenyVersion value. */ # define DEFAULT_OS_NAME "srvm %[^\n]" -#elif defined(sun) || defined(sgi) || defined(ultrix) || defined(__uxp__) || defined(linux) || defined(sony) +#elif defined(sun) || defined(sgi) || defined(ultrix) || defined(__linux__) || defined(sony) /* uname -r returns "x.y[.z]", e.g. "5.4" or "4.1.3" */ # define DEFAULT_OS_MAJOR_REV "r %[0-9]" # define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]" @@ -634,23 +565,6 @@ char *cpp_argv[ARGUMENTS] = { # define DEFAULT_OS_MINOR_REV "r %*[^.].%*d.%1s" # define DEFAULT_OS_TEENY_REV "r %*[^.].%*d.%*c%[0-9]" # define DEFAULT_OS_NAME "srvm %[^\n]" -#elif defined(USL) || defined(__USLC__) -/* uname -v returns "x.yz" or "x.y.z", e.g. "2.02" or "2.1.2". */ -# define DEFAULT_OS_MAJOR_REV "v %[0-9]" -# define DEFAULT_OS_MINOR_REV "v %*d.%1s" -# define DEFAULT_OS_TEENY_REV "v %*d.%*c%[.0-9]" -# define DEFAULT_OS_NAME "srvm %[^\n]" -#elif defined(__osf__) -/* uname -r returns "Wx.y", e.g. "V3.2" or "T4.0" */ -# define DEFAULT_OS_MAJOR_REV "r %*[^0-9]%[0-9]" -# define DEFAULT_OS_MINOR_REV "r %*[^.].%[0-9]" -# define DEFAULT_OS_NAME "srvm %[^\n]" -#elif defined(__uxp__) -/* NOTE: "x.y[.z]" above handles UXP/DF. This is a sample alternative. */ -/* uname -v returns "VxLy Yzzzzz ....", e.g. "V20L10 Y95021 Increment 5 ..." */ -# define DEFAULT_OS_MAJOR_REV "v V%[0-9]" -# define DEFAULT_OS_MINOR_REV "v V%*dL%[0-9]" -# define DEFAULT_OS_NAME "srvm %[^\n]" #elif defined(__FreeBSD__) /* uname -r returns "x.y[.z]-mumble", e.g. "9.0-RELEASE" or "11.0-CURRENT" */ # define DEFAULT_OS_MAJOR_REV "r %[0-9]" @@ -683,9 +597,6 @@ char *cpp_argv[ARGUMENTS] = { #define DEF_STRINGIFY(_x) DEF_EVALUATE(_x) struct symtab predefs[] = { -#ifdef apollo - {"apollo", "1"}, -#endif #ifdef ibm032 {"ibm032", "1"}, #endif @@ -761,7 +672,7 @@ struct symtab predefs[] = { #ifdef mc68020 {"mc68020", "1"}, #endif -#if defined(__GNUC__) && !defined(linux) +#if defined(__GNUC__) && !defined(__linux__) {"__GNUC__", DEF_STRINGIFY(__GNUC__)}, #endif #ifdef __GNUC_MINOR__ @@ -824,27 +735,12 @@ struct symtab predefs[] = { {"_SYSTYPE_SYSV", "1"}, #endif #endif -#ifdef __OSF__ - {"__OSF__", "1"}, -#endif -#ifdef __osf__ - {"__osf__", "1"}, -#endif #ifdef __alpha {"__alpha", "1"}, #endif -#ifdef __DECC - {"__DECC", "1"}, -#endif -#ifdef __decc - {"__decc", "1"}, -#endif #ifdef __unix__ {"__unix__", "1"}, #endif -#ifdef __uxp__ - {"__uxp__", "1"}, -#endif #ifdef __sxg__ {"__sxg__", "1"}, #endif @@ -852,9 +748,6 @@ struct symtab predefs[] = { {"_SEQUENT_", "1"}, {"__STDC__", "1"}, #endif -#ifdef __bsdi__ - {"__bsdi__", "1"}, -#endif #ifdef nec_ews_svr2 {"nec_ews_svr2", "1"}, #endif