From 7787d74d2503f9af1130614fef7cccae6123f6f1 Mon Sep 17 00:00:00 2001 From: Hades DAQ Date: Fri, 1 Feb 2013 01:21:38 +0100 Subject: [PATCH] changed to be able to compile from script 3, mt --- allParam/Makefile | 28 +++++++------- allParam/{ => include}/allParam.h | 0 include/allParam.h | 62 ------------------------------- 3 files changed, 14 insertions(+), 76 deletions(-) rename allParam/{ => include}/allParam.h (100%) delete mode 100644 include/allParam.h diff --git a/allParam/Makefile b/allParam/Makefile index 1caa4de..5ce2ad2 100644 --- a/allParam/Makefile +++ b/allParam/Makefile @@ -210,18 +210,18 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print VPATH = . ./ora -ACLOCAL = ${SHELL} /home/hadaq/daqdata/allParam/config/missing --run aclocal-1.12 +ACLOCAL = ${SHELL} /home/hadaq/daqdata3/allParam/config/missing --run aclocal-1.12 ALLPARAM_H = include/allParam.h AMTAR = $${TAR-tar} -AUTOCONF = ${SHELL} /home/hadaq/daqdata/allParam/config/missing --run autoconf -AUTOHEADER = ${SHELL} /home/hadaq/daqdata/allParam/config/missing --run autoheader -AUTOMAKE = ${SHELL} /home/hadaq/daqdata/allParam/config/missing --run automake-1.12 +AUTOCONF = ${SHELL} /home/hadaq/daqdata3/allParam/config/missing --run autoconf +AUTOHEADER = ${SHELL} /home/hadaq/daqdata3/allParam/config/missing --run autoheader +AUTOMAKE = ${SHELL} /home/hadaq/daqdata3/allParam/config/missing --run automake-1.12 AWK = gawk CC = gcc -ansi CCDEPMODE = depmode=gcc3 CFLAGS = -Wall -pedantic -g -O3 -fconserve-space -finline-functions CPP = gcc -E -CPPFLAGS = -I/home/hadaq/daqdata/include +CPPFLAGS = -I/home/hadaq/daqdata3/include CXX = g++ -ansi CXXDEPMODE = depmode=gcc3 CXXFLAGS = -Wall -pedantic -g -O3 -fconserve-space -finline-functions @@ -239,17 +239,17 @@ INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = $(install_sh) -c -s -LDFLAGS = -L/home/hadaq/daqdata/lib64 +LDFLAGS = -L/home/hadaq/daqdata3/lib64 LIBCAPARAM_A = LIBFILEPARAM_A = LIBOBJS = LIBORAPARAM_A = LIBRPCPARAM_A = -LIBS = -ltclParam_p -ltcl8.5 -lpthread -lcompat +LIBS = -ltcl8.5 -lpthread LIBTCLPARAM_A = libtclParam.a libtclParam_p.a LTLIBOBJS = MAINT = # -MAKEINFO = ${SHELL} /home/hadaq/daqdata/allParam/config/missing --run makeinfo +MAKEINFO = ${SHELL} /home/hadaq/daqdata3/allParam/config/missing --run makeinfo MKDIR_P = /bin/mkdir -p OBJEXT = o PACKAGE = allParam @@ -269,10 +269,10 @@ SET_MAKE = SHELL = /bin/sh STRIP = VERSION = 0.4 -abs_builddir = /home/hadaq/daqdata/allParam -abs_srcdir = /home/hadaq/daqdata/allParam -abs_top_builddir = /home/hadaq/daqdata/allParam -abs_top_srcdir = /home/hadaq/daqdata/allParam +abs_builddir = /home/hadaq/daqdata3/allParam +abs_srcdir = /home/hadaq/daqdata3/allParam +abs_top_builddir = /home/hadaq/daqdata3/allParam +abs_top_srcdir = /home/hadaq/daqdata3/allParam ac_ct_CC = gcc ac_ct_CXX = g++ am__include = include @@ -292,7 +292,7 @@ host_alias = htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /home/hadaq/daqdata/allParam/config/install-sh +install_sh = ${SHELL} /home/hadaq/daqdata3/allParam/config/install-sh libdir = ${exec_prefix}/lib64 libexecdir = ${exec_prefix}/lib localedir = ${datarootdir}/locale @@ -301,7 +301,7 @@ mandir = ${datarootdir}/man mkdir_p = /bin/mkdir -p oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /home/hadaq/daqdata +prefix = /home/hadaq/daqdata3 program_transform_name = s,$$,_tcl, psdir = ${docdir} sbindir = ${exec_prefix}/sbin diff --git a/allParam/allParam.h b/allParam/include/allParam.h similarity index 100% rename from allParam/allParam.h rename to allParam/include/allParam.h diff --git a/include/allParam.h b/include/allParam.h deleted file mode 100644 index a022ddb..0000000 --- a/include/allParam.h +++ /dev/null @@ -1,62 +0,0 @@ -#ifndef ALLPARAM_H -#define ALLPARAM_H - -#ifdef __cplusplus -extern "C" { -#endif -#include -#ifdef __cplusplus -} -#endif - -/* limitations */ -#define PARAM_MAX_ARRAY_LEN 128 -#define PARAM_MAX_VALUE_LEN 128 -#define PARAM_MAX_NAME_LEN 128 - -/* class */ -typedef struct ParamS { - char *basedir; - char *setup; - void *specParam; - char *strerror; -} Param; - -void Param_registerLogMsg(void (*f) (int, const char *, ...)); - -/* constructors and destructor */ -int conSetupParam(Param *param, const char *setup); -int conSetupParamOnly(Param *param, const char *setup); -int conParam(Param *param); -void desParam(Param *param); - -/* get data */ -int Param_getInt(const Param *param, const char *name, const char *idx, - int *rows, unsigned long int *value); -int Param_getString(const Param *param, const char *name, const char *idx, - int *rows, char *value); -int Param_getFilename(const Param *param, const char *name, const char *idx, - int *rows, char *value); -int Param_getIntArray(const Param *param, const char *name, const char *idx, - int maxrows, int *rows, unsigned long int *value); -int Param_getStringArray(const Param *param, const char *name, - const char *idx, int maxrows, int *rows, - char **value); -int Param_getFilenameArray(const Param *param, const char *name, - const char *idx, int maxrows, int *rows, - char **value); -int Param_getBlob(const Param *param, const char *name, const char *idx, - size_t * size, FILE ** value); - -/* store data */ -int Param_storeInt(const Param *param, const char *name, const char *idx, - unsigned long int value); -int Param_storeString(const Param *param, const char *name, const char *idx, - const char *value); - -/* misc */ -void Param_clearCache(const Param *param); - -const char *Param_getErrStr(const Param *param); - -#endif /* !ALLPARAM_H */ -- 2.43.0