make: unifdef for USE_DMS_CCR (undefined)

*** 37,52 ****
  #       include <avo/libcli.h>          /* libcli_init() */
  #       include <avo/cli_license.h>     /* avo_cli_get_license() */
  #       include <avo/find_dir.h>        /* avo_find_run_dir() */
  #       include <avo/version_string.h>
  #       include <avo/util.h>            /* avo_init() */
- #ifdef USE_DMS_CCR
- #       include <avo/usage_tracking.h>
- #else
  #       include <avo/cleanup.h>
  #endif
- #endif
  
  #if defined(TEAMWARE_MAKE_CMN)
  /* This is for dmake only (not for Solaris make).
   * Include code to check updates (dmake patches)
   */
--- 37,48 ----
*** 68,80 ****
  #include <mksdmsi18n/mksdmsi18n.h>      /* libmksdmsi18n_init() */
  #include <mksh/macro.h>         /* getvar() */
  #include <mksh/misc.h>          /* getmem(), setup_char_semantics() */
  
  #if defined(TEAMWARE_MAKE_CMN)
- #ifdef USE_DMS_CCR
- #       include <pubdmsi18n/pubdmsi18n.h>       /* libpubdmsi18n_init() */
- #endif
  #endif
  
  #include <pwd.h>                /* getpwnam() */
  #include <setjmp.h>
  #include <signal.h>
--- 64,73 ----
*** 145,160 ****
  
  #if defined(TEAMWARE_MAKE_CMN)
          static  time_t          start_time;
          static  int             g_argc;
          static  char            **g_argv;
- #ifdef USE_DMS_CCR
-         static  Avo_usage_tracking *usageTracking = NULL;
- #else
          static  Avo_cleanup     *cleanup = NULL;
  #endif
- #endif
  
  /*
   * File table of contents
   */
          extern "C" void         cleanup_after_exit(void);
--- 138,149 ----
*** 273,288 ****
  #if defined(TEAMWARE_MAKE_CMN) || defined(MAKETOOL)
          um = umask(0);
          avo_init(argv[0]);
          umask(um);
  
- #ifdef USE_DMS_CCR
-         usageTracking = new Avo_usage_tracking(NOCATGETS("dmake"), argc, argv);
- #else
          cleanup = new Avo_cleanup(NOCATGETS("dmake"), argc, argv);
  #endif
- #endif
  
  #if defined(TEAMWARE_MAKE_CMN)
          catd = catopen(AVO_DOMAIN_DMAKE, NL_CAT_LOCALE);
          libcli_init();
  
--- 262,273 ----
*** 309,321 ****
  /*
   * I put libmksdmsi18n_init() under #ifdef because it requires avo_i18n_init()
   * from avo_util library. 
   */
          libmksdmsi18n_init();
- #ifdef USE_DMS_CCR
-         libpubdmsi18n_init();
- #endif
  #endif
  
  
  #ifndef TEAMWARE_MAKE_CMN
          textdomain(NOCATGETS("SUNW_SPRO_MAKE"));
--- 294,303 ----
*** 794,805 ****
   *              report_dependencies
   *                              True if -P flag on
   *              running_list    List of parallel running processes
   *              temp_file_name  The temp file is removed, if any
   *              catd    the message catalog file
-  *              usage_tracking  Should have been constructed in main()
-  *                              should destroyed just before exiting
   */
  extern "C" void
  cleanup_after_exit(void)
  {
          Running         rp;
--- 776,785 ----
*** 932,949 ****
          /* Write .make.state */
          write_state_file(1, (Boolean) 1);
  
  #ifdef TEAMWARE_MAKE_CMN
          // Deleting the usage tracking object sends the usage mail 
- #ifdef USE_DMS_CCR
-         //usageTracking->setExitStatus(exit_status, NULL);
-         //delete usageTracking;
- #else
          cleanup->set_exit_status(exit_status);
          delete cleanup;
  #endif
- #endif
  
  /*
  #ifdef DISTRIBUTED
      }
  #endif
--- 912,924 ----