From e3e229f7883ea377e3924ed1c50c896d857dd93c Mon Sep 17 00:00:00 2001
From: cvs <cvs>
Date: Tue, 24 Oct 2000 14:35:14 +0000
Subject: [PATCH] Make Linux compliant

---
 sinqhm/Makefile        | 60 +++++++++++++++++++++++++++++-------------
 sinqhm/sinqhm_client.c |  2 +-
 2 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/sinqhm/Makefile b/sinqhm/Makefile
index e0487537..61cf4a9a 100644
--- a/sinqhm/Makefile
+++ b/sinqhm/Makefile
@@ -10,33 +10,38 @@
 #--------------------------------------------------------------------------
 #
 #------------ for DigitalUnix (add -DFORTIFY to CFLAGS for fortified version)
+##FF     = f90
 ##CC     = cc
 ##CFLAGS = -std -g -warnprotos -I. -I../hardsup
 ##BIN    = osf.axp
-##LFLAGS = -L../hardsup
+##LFLAGS = -L../hardsup -L$PGPLOT_DIR
 #------------ for Linux
+FF     = g77
 CC     = gcc
 CFLAGS = -g -I. -I../hardsup -DLINUX
 BIN    = linux.i686
-LFLAGS = -L../hardsup -L/usr/X11R6/lib
+LFLAGS = -L../hardsup -L$PGPLOT_DIR -L/usr/X11R6/lib
 #------------
 
-#----------------------------------------------------------
-dflt:
-	@ echo
-	@ echo " This directory contains SINQ histogram memory software."
-	@ echo " The make file will make the histogram memory client programs."
-	@ echo " To make them, you must specify:"
-	@ echo
-	@ echo "    make all"
-	@ echo
-
 #----------------------------------------------------------
 
 all:    $(HOME)/bin/$(BIN)/sinqhm_ctrl \
         $(HOME)/bin/$(BIN)/sinqhm_client \
         $(HOME)/bin/$(BIN)/sinqhm_bootutil_client \
         $(HOME)/bin/$(BIN)/lwl_client
+	@ echo
+	@ echo " This directory contains SINQ histogram memory software."
+	@ echo " The make file will make the histogram memory client programs:"
+	@ echo
+	@ echo "     sinqhm_ctrl"
+	@ echo "     sinqhm_client"
+	@ echo "     sinqhm_bootutil_client"
+	@ echo "     lwl_client"
+	@ echo
+	@ echo " To make them, simply specify:"
+	@ echo
+	@ echo "    make"
+	@ echo
 
 #----------------------------------------------------------
 
@@ -49,14 +54,33 @@ $(HOME)/bin/$(BIN)/sinqhm_ctrl: SinqHM_def.h sinqhm_ctrl.c
 	$(CC) $(CFLAGS) -o $(HOME)/bin/$(BIN)/sinqhm_ctrl \
                    sinqhm_ctrl.c $(LFLAGS) -lhlib -lX11
 
-$(HOME)/bin/$(BIN)/sinqhm_client: 
-	@ echo "sinqhm_client not yet available."
+$(HOME)/bin/$(BIN)/sinqhm_client: SinqHM_def.h sinqhm_client.c
+	@ rm -f $(HOME)/bin/$(BIN)/sinqhm_client.old
+	@ if test -f $(HOME)/bin/$(BIN)/sinqhm_client; then \
+           mv -f $(HOME)/bin/$(BIN)/sinqhm_client \
+                 $(HOME)/bin/$(BIN)/sinqhm_client.old; \
+        fi
+	$(FF) $(CFLAGS) -o $(HOME)/bin/$(BIN)/sinqhm_client \
+                   sinqhm_client.c $(LFLAGS) -lhlib -lcpgplot -lpgplot -lX11
 
-$(HOME)/bin/$(BIN)/sinqhm_bootutil_client: 
-	@ echo "sinqhm_bootutil_client not yet available."
+$(HOME)/bin/$(BIN)/sinqhm_bootutil_client:  SinqHM_def.h \
+                   sinqhm_bootutil_client.c
+	@ rm -f $(HOME)/bin/$(BIN)/sinqhm_bootutil_client.old
+	@ if test -f $(HOME)/bin/$(BIN)/sinqhm_bootutil_client; then \
+           mv -f $(HOME)/bin/$(BIN)/sinqhm_bootutil_client \
+                 $(HOME)/bin/$(BIN)/sinqhm_bootutil_client.old; \
+        fi
+	$(CC) $(CFLAGS) -o $(HOME)/bin/$(BIN)/sinqhm_bootutil_client \
+                   sinqhm_bootutil_client.c $(LFLAGS) -lhlib -lX11
 
-$(HOME)/bin/$(BIN)/lwl_client: 
-	@ echo "lwl_client not yet available."
+$(HOME)/bin/$(BIN)/lwl_client: SinqHM_def.h lwl_client.c
+	@ rm -f $(HOME)/bin/$(BIN)/lwl_client.old
+	@ if test -f $(HOME)/bin/$(BIN)/lwl_client; then \
+           mv -f $(HOME)/bin/$(BIN)/lwl_client \
+                 $(HOME)/bin/$(BIN)/lwl_client.old; \
+        fi
+	$(CC) $(CFLAGS) -o $(HOME)/bin/$(BIN)/lwl_client \
+                   lwl_client.c $(LFLAGS) -lhlib -lX11
 
 #----------------------------------------------------------
 
diff --git a/sinqhm/sinqhm_client.c b/sinqhm/sinqhm_client.c
index 28104b1a..f1c36f6a 100755
--- a/sinqhm/sinqhm_client.c
+++ b/sinqhm/sinqhm_client.c
@@ -483,7 +483,7 @@
 */
     int		i;
     char	total_txt[21];
-    char	dev[] = "/XW";
+    char	dev[] = "/XSERV";
     char	xlab[] = "Bins";
     char	ylab[] = "Counts";
     float	xlo, xhi, yhi;