From 3e874a365058e857d4cb449be793fcc094d8965e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Fr=C3=B6jdh?= Date: Mon, 19 Aug 2019 20:40:50 +0200 Subject: [PATCH] removed symlinks in jf server (#49) --- slsDetectorServers/jungfrauDetectorServer/AD9257.h | 1 - .../jungfrauDetectorServer/ALTERA_PLL.h | 1 - slsDetectorServers/jungfrauDetectorServer/LTC2620.h | 1 - slsDetectorServers/jungfrauDetectorServer/MAX1932.h | 1 - slsDetectorServers/jungfrauDetectorServer/Makefile | 13 ++++++++----- slsDetectorServers/jungfrauDetectorServer/ansi.h | 1 - .../jungfrauDetectorServer/blackfin.h | 1 - slsDetectorServers/jungfrauDetectorServer/common.h | 1 - .../jungfrauDetectorServer/commonServerFunctions.h | 1 - .../jungfrauDetectorServer/communication_funcs.c | 1 - .../jungfrauDetectorServer/communication_funcs.h | 1 - .../communication_funcs_UDP.h | 1 - slsDetectorServers/jungfrauDetectorServer/logger.h | 1 - .../jungfrauDetectorServer/programfpga.h | 1 - .../slsDetectorFunctionList.h | 1 - .../jungfrauDetectorServer/slsDetectorServer.c | 1 - .../slsDetectorServer_funcs.c | 1 - .../slsDetectorServer_funcs.h | 1 - .../jungfrauDetectorServer/sls_detector_defs.h | 1 - .../jungfrauDetectorServer/sls_detector_funcs.h | 1 - .../jungfrauDetectorServer/versionAPI.h | 1 - slsSupportLib/include/versionAPI.h | 2 +- 22 files changed, 9 insertions(+), 26 deletions(-) delete mode 120000 slsDetectorServers/jungfrauDetectorServer/AD9257.h delete mode 120000 slsDetectorServers/jungfrauDetectorServer/ALTERA_PLL.h delete mode 120000 slsDetectorServers/jungfrauDetectorServer/LTC2620.h delete mode 120000 slsDetectorServers/jungfrauDetectorServer/MAX1932.h delete mode 120000 slsDetectorServers/jungfrauDetectorServer/ansi.h delete mode 120000 slsDetectorServers/jungfrauDetectorServer/blackfin.h delete mode 120000 slsDetectorServers/jungfrauDetectorServer/common.h delete mode 120000 slsDetectorServers/jungfrauDetectorServer/commonServerFunctions.h delete mode 120000 slsDetectorServers/jungfrauDetectorServer/communication_funcs.c delete mode 120000 slsDetectorServers/jungfrauDetectorServer/communication_funcs.h delete mode 120000 slsDetectorServers/jungfrauDetectorServer/communication_funcs_UDP.h delete mode 120000 slsDetectorServers/jungfrauDetectorServer/logger.h delete mode 120000 slsDetectorServers/jungfrauDetectorServer/programfpga.h delete mode 120000 slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.h delete mode 120000 slsDetectorServers/jungfrauDetectorServer/slsDetectorServer.c delete mode 120000 slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.c delete mode 120000 slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.h delete mode 120000 slsDetectorServers/jungfrauDetectorServer/sls_detector_defs.h delete mode 120000 slsDetectorServers/jungfrauDetectorServer/sls_detector_funcs.h delete mode 120000 slsDetectorServers/jungfrauDetectorServer/versionAPI.h diff --git a/slsDetectorServers/jungfrauDetectorServer/AD9257.h b/slsDetectorServers/jungfrauDetectorServer/AD9257.h deleted file mode 120000 index 87b70e097..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/AD9257.h +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServer/AD9257.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/ALTERA_PLL.h b/slsDetectorServers/jungfrauDetectorServer/ALTERA_PLL.h deleted file mode 120000 index e665f009d..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/ALTERA_PLL.h +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServer/ALTERA_PLL.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/LTC2620.h b/slsDetectorServers/jungfrauDetectorServer/LTC2620.h deleted file mode 120000 index 13157cb8b..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/LTC2620.h +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServer/LTC2620.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/MAX1932.h b/slsDetectorServers/jungfrauDetectorServer/MAX1932.h deleted file mode 120000 index 8f7b239ea..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/MAX1932.h +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServer/MAX1932.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/Makefile b/slsDetectorServers/jungfrauDetectorServer/Makefile index f197d60dd..e9f4db5c4 100755 --- a/slsDetectorServers/jungfrauDetectorServer/Makefile +++ b/slsDetectorServers/jungfrauDetectorServer/Makefile @@ -1,13 +1,16 @@ +current_dir = $(shell pwd) +main_server = ../slsDetectorServer/ +support_lib = ../../slsSupportLib/include/ + CROSS = bfin-uclinux- CC = $(CROSS)gcc -CFLAGS += -Wall -DJUNGFRAUD -DSTOP_SERVER #-DVERBOSEI #-DVERBOSE -LDLIBS += -lm -lstdc++ - +CFLAGS += -Wall -DJUNGFRAUD -DSTOP_SERVER -I$(main_server) -I$(support_lib) -I$(current_dir)#-DVERBOSEI #-DVERBOSE +LDLIBS += -lm PROGS = jungfrauDetectorServer DESTDIR ?= bin INSTMODE = 0777 -SRC_CLNT = communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c slsDetectorFunctionList.c +SRC_CLNT = $(main_server)communication_funcs.c $(main_server)slsDetectorServer.c $(main_server)slsDetectorServer_funcs.c slsDetectorFunctionList.c OBJS = $(SRC_CLNT:.c=.o) all: clean versioning $(PROGS) @@ -23,7 +26,7 @@ versioning: $(PROGS): $(OBJS) # echo $(OBJS) mkdir -p $(DESTDIR) - $(CC) -o $@ $^ $(CFLAGS) $(LDLIBS) + $(CC) -o $@ $^ $(CFLAGS) $(LDLIBS) mv $(PROGS) $(DESTDIR) rm *.gdb diff --git a/slsDetectorServers/jungfrauDetectorServer/ansi.h b/slsDetectorServers/jungfrauDetectorServer/ansi.h deleted file mode 120000 index 4a82d0575..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/ansi.h +++ /dev/null @@ -1 +0,0 @@ -../../slsSupportLib/include/ansi.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/blackfin.h b/slsDetectorServers/jungfrauDetectorServer/blackfin.h deleted file mode 120000 index 2873c7dc6..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/blackfin.h +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServer/blackfin.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/common.h b/slsDetectorServers/jungfrauDetectorServer/common.h deleted file mode 120000 index 6776eb607..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/common.h +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServer/common.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/commonServerFunctions.h b/slsDetectorServers/jungfrauDetectorServer/commonServerFunctions.h deleted file mode 120000 index 33bdd8d53..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/commonServerFunctions.h +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServer/commonServerFunctions.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/communication_funcs.c b/slsDetectorServers/jungfrauDetectorServer/communication_funcs.c deleted file mode 120000 index 30435fdc4..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/communication_funcs.c +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServer/communication_funcs.c \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/communication_funcs.h b/slsDetectorServers/jungfrauDetectorServer/communication_funcs.h deleted file mode 120000 index c0c144994..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/communication_funcs.h +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServer/communication_funcs.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/communication_funcs_UDP.h b/slsDetectorServers/jungfrauDetectorServer/communication_funcs_UDP.h deleted file mode 120000 index 0d434a97d..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/communication_funcs_UDP.h +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServer/communication_funcs_UDP.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/logger.h b/slsDetectorServers/jungfrauDetectorServer/logger.h deleted file mode 120000 index ff1930ce3..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/logger.h +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServer/logger.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/programfpga.h b/slsDetectorServers/jungfrauDetectorServer/programfpga.h deleted file mode 120000 index 72c54d21d..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/programfpga.h +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServer/programfpga.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.h deleted file mode 120000 index 345b8c029..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.h +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServer/slsDetectorFunctionList.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer.c deleted file mode 120000 index a7eb59acb..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer.c +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServer/slsDetectorServer.c \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.c deleted file mode 120000 index a7532ccd4..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.c +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServer/slsDetectorServer_funcs.c \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.h deleted file mode 120000 index 7569daf47..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.h +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServer/slsDetectorServer_funcs.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/sls_detector_defs.h b/slsDetectorServers/jungfrauDetectorServer/sls_detector_defs.h deleted file mode 120000 index 2af30d73a..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/sls_detector_defs.h +++ /dev/null @@ -1 +0,0 @@ -../../slsSupportLib/include/sls_detector_defs.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/sls_detector_funcs.h b/slsDetectorServers/jungfrauDetectorServer/sls_detector_funcs.h deleted file mode 120000 index 3f48959a9..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/sls_detector_funcs.h +++ /dev/null @@ -1 +0,0 @@ -../../slsSupportLib/include/sls_detector_funcs.h \ No newline at end of file diff --git a/slsDetectorServers/jungfrauDetectorServer/versionAPI.h b/slsDetectorServers/jungfrauDetectorServer/versionAPI.h deleted file mode 120000 index 5e580d8bb..000000000 --- a/slsDetectorServers/jungfrauDetectorServer/versionAPI.h +++ /dev/null @@ -1 +0,0 @@ -../../slsSupportLib/include/versionAPI.h \ No newline at end of file diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index 6da66f7d4..fb289063e 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -5,6 +5,6 @@ #define APIRECEIVER 0x190722 #define APIGUI 0x190723 #define APIGOTTHARD 0x190816 -#define APIJUNGFRAU 0x190816 #define APIMOENCH 0x190816 #define APIEIGER 0x190816 +#define APIJUNGFRAU 0x190819