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

- cleaned up makefiles

Browse Source 
- polished code to avoid warnings


SKIPPED:
	psi/amorscan.c
	psi/amorstat.c
	psi/buffer.c
	psi/dornier2.c
	psi/ecb.c
	psi/ecbdriv.c
	psi/el737hpdriv.c
	psi/el737hpv2driv.c
	psi/eve.c
	psi/faverage.c
	psi/fowrite.c
	psi/ipsdriv.c
	psi/logger.c
	psi/make_gen
	psi/makefile
	psi/makefile_alpha
	psi/makefile_linux
	psi/oicom.c
	psi/psi.c
	psi/remob.c
	psi/ruli.c
	psi/tasinit.c
	psi/tasscan.c
	psi/tasutil.c
	psi/tricssupport.c
	psi/hardsup/itc4util.c
	psi/hardsup/make_gen
	psi/hardsup/makefile
	psi/hardsup/makefile_alpha
	psi/hardsup/makefile_linux
	psi/hardsup/makeprint.c
	psi/hardsup/serialsinq.c
	psi/tecs/coc_client.c
	psi/tecs/coc_logfile.c
	psi/tecs/coc_server.c
	psi/tecs/coc_server.h
	psi/tecs/didi
	psi/tecs/keep_running.c
	psi/tecs/macosx_def
	psi/tecs/make_crv.tcsh
	psi/tecs/make_gen
	psi/tecs/makefile
	psi/tecs/makefile_linux
	psi/tecs/makefile_macosx
	psi/tecs/myc_buf.c
	psi/tecs/myc_time.c
	psi/tecs/six.c
	psi/tecs/sys_select.c
	psi/tecs/tecs.c
	psi/tecs/tecs_cli.c
	psi/tecs/tecs_data.c
	psi/tecs/tecs_lsc.c
	psi/tecs/tecs_serial.c
	psi/tecs/term.c
	psi/utils/SerPortServer.c
	psi/utils/el734.c
	psi/utils/make_gen
	psi/utils/makefile
	psi/utils/makefile_alpha
	psi/utils/makefile_linux
This commit is contained in:
zolliker
2005-03-08 11:11:51 +00:00
parent 55645018de
commit f603985860
14 changed files with 40 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
alpha_def
View File

@ -5,11 +5,11 @@
#========================================================================== #==========================================================================
# the following lines only for fortified version # the following lines only for fortified version
#DFORTIFY=-DFORTIFY -I$(ROOT)/$(SRC) #DFORTIFY=-DFORTIFY
#FORTIFYOBJ=strdup.o fortify.o #FORTIFYOBJ=strdup.o fortify.o
#----------------select proper Makefile #----------------select proper Makefile
MFLAGS= -f $(SRC)makefile_alpha$(DUMMY) SRC=$(SRC) MFLAGS= -f makefile_alpha$(DUMMY)
#------------- path to HDF installation #------------- path to HDF installation
HDFROOT=/afs/psi.ch/project/sinq/tru64 HDFROOT=/afs/psi.ch/project/sinq/tru64

4
linux_def
View File

@ -4,9 +4,9 @@
# Mark Koennecke, July 2003 # Mark Koennecke, July 2003
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
#DFORTIFY= -DFORTIFY -I$(ROOT)/$(SRC) #DFORTIFY= -DFORTIFY
#FORTIFYOBJ= fortify.o strdup.o #FORTIFYOBJ= fortify.o strdup.o
MFLAGS=-f $(SRC)makefile_linux$(DUMMY) SRC=$(SRC) MFLAGS=-f makefile_linux$(DUMMY)
HDFROOT=/afs/psi.ch/project/sinq/linux HDFROOT=/afs/psi.ch/project/sinq/linux

23
make_gen
View File

@ -5,9 +5,6 @@
# Markus Zolliker March 2003 # Markus Zolliker March 2003
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
VPATH=$(SRC)
ROOT=.
COBJ = Sclient.o network.o ifile.o intcli.o $(FORTIFYOBJ) COBJ = Sclient.o network.o ifile.o intcli.o $(FORTIFYOBJ)
SOBJ = network.o ifile.o conman.o SCinter.o splitter.o passwd.o \ SOBJ = network.o ifile.o conman.o SCinter.o splitter.o passwd.o \
servlog.o sicvar.o nserver.o SICSmain.o \ servlog.o sicvar.o nserver.o SICSmain.o \
@ -40,10 +37,10 @@ VELOOBJ = velo.o velosim.o
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .tcl .htm .c .o .SUFFIXES: .tcl .htm .c .o
all: SICServer all: SICServer libmat libhlib libtecsl libpsi
# use this target when some of the libraries SUBLIBS might be incomplete # use this target when some of the libraries SUBLIBS might be incomplete
full: purge SICServer full: purge all
SICServer: $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) \ SICServer: $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) \
$(VELOOBJ) $(DIFIL) $(EXTRA) \ $(VELOOBJ) $(DIFIL) $(EXTRA) \
@ -52,16 +49,24 @@ SICServer: $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) \
$(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) \ $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) \
$(VELOOBJ) $(DIFOBJ) $(EXTRA) $(LIBS) $(VELOOBJ) $(DIFOBJ) $(EXTRA) $(LIBS)
matrix/libmatrix.a: matrix/libmatrix.a: libmat
libmat:
cd matrix; make $(MFLAGS) libmatrix.a cd matrix; make $(MFLAGS) libmatrix.a
psi/hardsup/libhlib.a: psi/hardsup/libhlib.a: libhlib
libhlib:
cd psi/hardsup; make $(MFLAGS) libhlib.a cd psi/hardsup; make $(MFLAGS) libhlib.a
psi/tecs/libtecsl.a: psi/tecs/libtecsl.a: libtecsl
libtecsl:
cd psi/tecs; make $(MFLAGS) libtecsl.a cd psi/tecs; make $(MFLAGS) libtecsl.a
psi/libpsi.a: psi/libpsi.a: libpsi
libpsi:
cd psi; make $(MFLAGS) libpsi.a cd psi; make $(MFLAGS) libpsi.a
purge: purge:

3
make_gen_dummy
View File

@ -5,9 +5,6 @@
# Markus Zolliker March 2003 # Markus Zolliker March 2003
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
VPATH=$(SRC)
ROOT=.
COBJ = Sclient.o network.o ifile.o intcli.o $(FORTIFYOBJ) COBJ = Sclient.o network.o ifile.o intcli.o $(FORTIFYOBJ)
SOBJ = network.o ifile.o conman.o SCinter.o splitter.o passwd.o \ SOBJ = network.o ifile.o conman.o SCinter.o splitter.o passwd.o \
servlog.o sicvar.o nserver.o SICSmain.o \ servlog.o sicvar.o nserver.o SICSmain.o \

24
makefile
View File

@ -1,15 +1,6 @@
# Forwards the execution to a version specific makefile.
# SICS_VERSION must be defined, else usage is printed
# M. Zolliker 03.2005 # M. Zolliker 03.2005
VERS_UNDEFINED= default:
VERS_UNDEFINED$(SICS_VERSION)=version_undefined
INCL_MF=makefile_$(SICS_VERSION)
-include $(INCL_MF)
version_undefined:
@ echo "" @ echo ""
@ echo "Usage:" @ echo "Usage:"
@ echo "" @ echo ""
@ -18,17 +9,4 @@ version_undefined:
@ echo ' where makefile_xxx is one of' @ echo ' where makefile_xxx is one of'
@ echo "" @ echo ""
@ ls -1 makefile_* | pr -t -o 4 @ ls -1 makefile_* | pr -t -o 4
@ echo ""
@ echo "Or, more convenient, define the following in the login script"
@ echo ""
@ echo " setenv SICS_VERSION version_xxx (assume we are using tcsh)"
@ echo ""
@ echo " where version_xxx is one of"
@ echo ""
@ ls -1 makefile_* | cut -b 10-99 | pr -t -o 4
@ echo ""
@ echo "and then use simply"
@ echo ""
@ echo " make [target]"
@ echo ""

2
makefile_alpha
View File

@ -15,7 +15,7 @@ include alpha_def
CC = cc CC = cc
CFLAGS = -I$(HDFROOT)/include $(DFORTIFY) -DHDF4 -DHDF5 \ CFLAGS = -I$(HDFROOT)/include $(DFORTIFY) -DHDF4 -DHDF5 \
-I$(SRC). -I$(SRC)psi/hardsup \ -Ipsi/hardsup -I. \
-g -std1 -warnprotos -g -std1 -warnprotos
BINTARGET = bin BINTARGET = bin
EXTRA= EXTRA=

2
makefile_alpha_dummy
View File

@ -12,7 +12,7 @@ include alpha_def
HDFROOT=/data/lnslib HDFROOT=/data/lnslib
CC = cc CC = cc
CFLAGS = -I$(HDFROOT)/include -I$(SRC). $(DFORTIFY) -DHDF4 -DHDF5 \ CFLAGS = -I$(HDFROOT)/include $(DFORTIFY) -DHDF4 -DHDF5 \
-g -std1 -warnprotos -g -std1 -warnprotos
BINTARGET = bin BINTARGET = bin
EXTRA= EXTRA=

11
makefile_linux
View File

@ -11,16 +11,11 @@ NI= -DHAVENI
NIOBJ= nigpib.o NIOBJ= nigpib.o
NILIB=$(SINQDIR)/linux/lib/cib.o NILIB=$(SINQDIR)/linux/lib/cib.o
# The variable SRC is needed for the case, where source and objects are include linux_def
# separated. In the case where objects are mixed up with sources, SRC
# is assumed to be empty and does not harm. I case of problems
# please ask Markus Zolliker.
include $(SRC)linux_def
CC = gcc CC = gcc
CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 $(NI) \ CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 $(NI) \
-I$(SRC)psi/hardsup -I$(SRC). \ -Ipsi/hardsup -I. \
-fwritable-strings -DCYGNUS -DNONINTF -g $(DFORTIFY) -fwritable-strings -DCYGNUS -DNONINTF -g $(DFORTIFY)
BINTARGET = bin BINTARGET = bin
@ -32,7 +27,7 @@ LIBS = -static -L$(HDFROOT)/lib $(SUBLIBS) $(NILIB)\
$(HDFROOT)/lib/libmfhdf.a $(HDFROOT)/lib/libdf.a \ $(HDFROOT)/lib/libmfhdf.a $(HDFROOT)/lib/libdf.a \
$(HDFROOT)/lib/libjpeg.a -ldl -lz -lm -lc $(HDFROOT)/lib/libjpeg.a -ldl -lz -lm -lc
include $(SRC)make_gen include make_gen

6
makefile_linux_dummy
View File

@ -11,10 +11,10 @@
#NILIB=-lgpibenet #NILIB=-lgpibenet
DUMMY=_dummy DUMMY=_dummy
include $(SRC)linux_def include linux_def
CC = gcc CC = gcc
CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 $(NI) -I$(SRC). \ CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 $(NI) \
-fwritable-strings -DCYGNUS -DNONINTF -g $(DFORTIFY) -fwritable-strings -DCYGNUS -DNONINTF -g $(DFORTIFY)
HDFROOT=/afs/psi.ch/project/sinq/linux HDFROOT=/afs/psi.ch/project/sinq/linux
@ -26,7 +26,7 @@ LIBS = -L$(HDFROOT)/lib $(SUBLIBS) \
$(HDFROOT)/lib/libjpeg.a -lz -lm -ll -lc $(HDFROOT)/lib/libjpeg.a -lz -lm -ll -lc
include $(SRC)make_gen_dummy include make_gen_dummy

11
makefile_slinux
View File

@ -11,16 +11,11 @@ NI= -DHAVENI
NIOBJ= nigpib.o NIOBJ= nigpib.o
NILIB=$(SINQDIR)/linux/lib/cib.o NILIB=$(SINQDIR)/linux/lib/cib.o
# The variable SRC is needed for the case, where source and objects are include sllinux_def
# separated. In the case where objects are mixed up with sources, SRC
# is assumed to be empty and does not harm. I case of problems
# please ask Markus Zolliker.
include $(SRC)sllinux_def
CC = gcc CC = gcc
CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 $(NI) \ CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 $(NI) \
-I$(SRC)psi/hardsup -I$(SRC). \ -Ipsi/hardsup -I. \
-fwritable-strings -DCYGNUS -DNONINTF -g $(DFORTIFY) \ -fwritable-strings -DCYGNUS -DNONINTF -g $(DFORTIFY) \
-Wall -Wno-unused -Wno-comment -Wno-switch -Wall -Wno-unused -Wno-comment -Wno-switch
@ -33,7 +28,7 @@ LIBS = -L$(HDFROOT)/lib $(SUBLIBS) $(NILIB)\
$(HDFROOT)/lib/libmfhdf.a $(HDFROOT)/lib/libdf.a \ $(HDFROOT)/lib/libmfhdf.a $(HDFROOT)/lib/libdf.a \
$(HDFROOT)/lib/libjpeg.a -lsz -ldl -lz -lm -lc $(HDFROOT)/lib/libjpeg.a -lsz -ldl -lz -lm -lc
include $(SRC)make_gen include make_gen

4
napi.c
View File

@ -23,7 +23,7 @@
----------------------------------------------------------------------------*/ ----------------------------------------------------------------------------*/
static const char* rscid = "$Id: napi.c,v 1.8 2004/11/17 10:50:16 cvs Exp $"; /* Revision interted by CVS */ static const char* rscid = "$Id: napi.c,v 1.9 2005/03/08 11:11:51 zolliker Exp $"; /* Revision interted by CVS */
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
@ -85,7 +85,7 @@ NXstatus CALLING_STYLE NXsetcache(long newVal)
/*---------------------------------------------------------------------*/ /*---------------------------------------------------------------------*/
static void NXNXNXReportError(void *pData, char *string) void NXNXNXReportError(void *pData, char *string)
{ {
printf("%s \n",string); printf("%s \n",string);
} }

6
napi5.c
View File

@ -128,7 +128,11 @@ NXstatus CALLING_STYLE NX5closegroup (NXhandle fid);
unsigned int vers_major, vers_minor, vers_release, am1 ; unsigned int vers_major, vers_minor, vers_release, am1 ;
hid_t fapl; hid_t fapl;
int mdc_nelmts; int mdc_nelmts;
unsigned long rdcc_nelmts; #ifdef H5_WANT_H5_V1_4_COMPAT
unsigned int rdcc_nelmts;
#else
size_t rdcc_nelmts;
#endif
size_t rdcc_nbytes; size_t rdcc_nbytes;
double rdcc_w0; double rdcc_w0;

2
nxdict.c
View File

@ -593,7 +593,7 @@
/*------------------- The Defintion String Parser -----------------------*/ /*------------------- The Defintion String Parser -----------------------*/
/*------- Data structures */ /*------- Data structures */
typedef struct { typedef struct {
char pText[20]; char *pText;
int iCode; int iCode;
} TokDat; } TokDat;
#define TERMSDS 100 #define TERMSDS 100

4
sllinux_def
View File

@ -4,9 +4,9 @@
# Mark Koennecke, July 2003 # Mark Koennecke, July 2003
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
#DFORTIFY= -DFORTIFY -I$(ROOT)/$(SRC) #DFORTIFY= -DFORTIFY
#FORTIFYOBJ= fortify.o strdup.o #FORTIFYOBJ= fortify.o strdup.o
MFLAGS=-f $(SRC)makefile_linux$(DUMMY) SRC=$(SRC) MFLAGS=-f makefile_linux$(DUMMY)
HDFROOT=/afs/psi.ch/project/sinq/sl-linux HDFROOT=/afs/psi.ch/project/sinq/sl-linux