From 02eeba85bc84828d5e503e7fb3019ccd9a4a4d85 Mon Sep 17 00:00:00 2001
From: edgrif <edgrif>
Date: Wed, 2 Feb 2005 14:34:05 +0000
Subject: [PATCH] remove nothreads code refs.

---
 src/makefile             | 4 ++--
 src/zmapMake/common.defs | 9 ---------
 src/zmapManager/makefile | 2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/makefile b/src/makefile
index 977b73920..c9e56f162 100755
--- a/src/makefile
+++ b/src/makefile
@@ -22,7 +22,7 @@ include $(MAKE_DIR)/common.defs
 #
 APP_DIR = zmapApp
 MAKE_DIRS = $(APP_DIR) zmapManager zmapControl zmapView zmapWindow zmapDraw zmapFeature \
-                       zmapConfig zmapGFF zmapServer zmapThreads zmapUtils zmapNoThreads
+                       zmapConfig zmapGFF zmapServer zmapThreads zmapUtils
 
 DOXY_CONFIG = Doxyfile
 
@@ -39,7 +39,7 @@ clean: makebindir
 #	@for d in $(MAKE_DIRS); do \
 #	(cd $$d ; echo ; echo 'make '$@' in '$$d ; $(MAKE) $@ ; echo) ; \
 #	done
-#	@rm -f $(ZMAPAPP_LIB) $(ZMAP_LIB) $(ZMAPTHR_LIB) $(ZMAPNOTHR_LIB)
+#	@rm -f $(ZMAPAPP_LIB) $(ZMAP_LIB) $(ZMAPTHR_LIB)
 
 
 # note that we issue a "make all" in the subdirectories, not a "make libs"
diff --git a/src/zmapMake/common.defs b/src/zmapMake/common.defs
index f472baf4a..4d773116e 100755
--- a/src/zmapMake/common.defs
+++ b/src/zmapMake/common.defs
@@ -61,12 +61,9 @@ BINDIR = $(ROOT_DIRECTORY)/$(BINDIR_NAME)
 # libZMap.a       - contains code that is common to _all_ zmaps
 #
 # libZMapThr.a    - contains code that uses threads to get info. from databases.
-# libZMapNoThr.a  - contains code that uses function calls to get info. from databases.
 #
 # Stand alone client uses      libZMapApp.a libZMap.a libZMapThr.a
 #
-#   library for xace uses                   libZMap.a libZMapNoThr.a
-#
 #
 ZMAPAPP_LIBNAME = libZMapApp.a
 ZMAPAPP_LIB = $(BINDIR)/$(ZMAPAPP_LIBNAME)
@@ -77,9 +74,6 @@ ZMAP_LIB = $(BINDIR)/$(ZMAP_LIBNAME)
 ZMAPTHR_LIBNAME = libZMapThr.a
 ZMAPTHR_LIB = $(BINDIR)/$(ZMAPTHR_LIBNAME)
 
-ZMAPNOTHR_LIBNAME = libZMapNoThr.a
-ZMAPNOTHR_LIB = $(BINDIR)/$(ZMAPNOTHR_LIBNAME)
-
 
 #
 # COMPILE MACROS
@@ -146,9 +140,6 @@ ZMAP_LIB = $(BINDIR)/$(ZMAP_LIBNAME)
 ZMAPTHR_LIBNAME = libZMapThr.a
 ZMAPTHR_LIB = $(BINDIR)/$(ZMAPTHR_LIBNAME)
 
-ZMAPNOTHR_LIBNAME = libZMapNoThr.a
-ZMAPNOTHR_LIB = $(BINDIR)/$(ZMAPNOTHR_LIBNAME)
-
 
 #
 # SUFFICES/RULES
diff --git a/src/zmapManager/makefile b/src/zmapManager/makefile
index 3d5ea6718..2f91acfbe 100755
--- a/src/zmapManager/makefile
+++ b/src/zmapManager/makefile
@@ -11,7 +11,7 @@ MAKE_DIR = $(ROOT_DIRECTORY)/zmapMake
 
 
 # local macros
-PUB_HDRS = zmapConn.h zmapWindow.h zmapManager.h
+PUB_HDRS = zmapWindow.h zmapManager.h
 MAN_PRIV_HDRS = zmapManager_P.h
 MAN_SRC = zmapManager.c
 MAN_OBJ = zmapManager.o
-- 
GitLab