linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Linux compliant

Browse Source
This commit is contained in:
cvs
2000-10-24 14:35:14 +00:00
parent 9fda63cd79
commit e3e229f788
2 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
sinqhm/Makefile
View File

@ -10,33 +10,38 @@
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------
# #
#------------ for DigitalUnix (add -DFORTIFY to CFLAGS for fortified version) #------------ for DigitalUnix (add -DFORTIFY to CFLAGS for fortified version)
##FF = f90
##CC = cc ##CC = cc
##CFLAGS = -std -g -warnprotos -I. -I../hardsup ##CFLAGS = -std -g -warnprotos -I. -I../hardsup
##BIN = osf.axp ##BIN = osf.axp
##LFLAGS = -L../hardsup ##LFLAGS = -L../hardsup -L$PGPLOT_DIR
#------------ for Linux #------------ for Linux
FF = g77
CC = gcc CC = gcc
CFLAGS = -g -I. -I../hardsup -DLINUX CFLAGS = -g -I. -I../hardsup -DLINUX
BIN = linux.i686 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 \ all: $(HOME)/bin/$(BIN)/sinqhm_ctrl \
$(HOME)/bin/$(BIN)/sinqhm_client \ $(HOME)/bin/$(BIN)/sinqhm_client \
$(HOME)/bin/$(BIN)/sinqhm_bootutil_client \ $(HOME)/bin/$(BIN)/sinqhm_bootutil_client \
$(HOME)/bin/$(BIN)/lwl_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 \ $(CC) $(CFLAGS) -o $(HOME)/bin/$(BIN)/sinqhm_ctrl \
sinqhm_ctrl.c $(LFLAGS) -lhlib -lX11 sinqhm_ctrl.c $(LFLAGS) -lhlib -lX11
$(HOME)/bin/$(BIN)/sinqhm_client: $(HOME)/bin/$(BIN)/sinqhm_client: SinqHM_def.h sinqhm_client.c
@ echo "sinqhm_client not yet available." @ 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: $(HOME)/bin/$(BIN)/sinqhm_bootutil_client: SinqHM_def.h \
@ echo "sinqhm_bootutil_client not yet available." 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: $(HOME)/bin/$(BIN)/lwl_client: SinqHM_def.h lwl_client.c
@ echo "lwl_client not yet available." @ 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
#---------------------------------------------------------- #----------------------------------------------------------

2
sinqhm/sinqhm_client.c
View File

@ -483,7 +483,7 @@
*/ */
int i; int i;
char total_txt[21]; char total_txt[21];
char dev[] = "/XW"; char dev[] = "/XSERV";
char xlab[] = "Bins"; char xlab[] = "Bins";
char ylab[] = "Counts"; char ylab[] = "Counts";
float xlo, xhi, yhi; float xlo, xhi, yhi;