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.

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