From 7e0481eefffe4faba50b8ddae9236f22638cfb60 Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Thu, 21 Sep 2017 16:45:40 +0200
Subject: [PATCH] renamed server names

---
 .../jctbDetectorServer/Makefile               |  56 ++++++++++++++-
 .../jctbDetectorServer/Makefile.ctb           |  65 ------------------
 ...uDetectorServerTest => jctbDetectorServer} | Bin 118716 -> 118716 bytes
 3 files changed, 55 insertions(+), 66 deletions(-)
 mode change 120000 => 100644 slsDetectorSoftware/jctbDetectorServer/Makefile
 delete mode 100644 slsDetectorSoftware/jctbDetectorServer/Makefile.ctb
 rename slsDetectorSoftware/jctbDetectorServer/{jungfrauDetectorServerTest => jctbDetectorServer} (99%)

diff --git a/slsDetectorSoftware/jctbDetectorServer/Makefile b/slsDetectorSoftware/jctbDetectorServer/Makefile
deleted file mode 120000
index ce28cc2a0..000000000
--- a/slsDetectorSoftware/jctbDetectorServer/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.ctb
\ No newline at end of file
diff --git a/slsDetectorSoftware/jctbDetectorServer/Makefile b/slsDetectorSoftware/jctbDetectorServer/Makefile
new file mode 100644
index 000000000..9a125a2df
--- /dev/null
+++ b/slsDetectorSoftware/jctbDetectorServer/Makefile
@@ -0,0 +1,55 @@
+# $Id: Makefile,v 1.1.1.1 2006/02/04 03:35:01 freza Exp $
+# first compile
+# make cris-axis-linux-gnu
+
+
+CROSS  = bfin-uclinux-
+CC    = $(CROSS)gcc
+
+CFLAGS += -Wall -DMOENCHD -DMCB_FUNCS -DDACS_INT  -DDEBUG -DV1 -DCTB #-DVERBOSE #-DVERYVERBOSE  #-DVIRTUAL  #-DDACS_INT_CSERVER
+
+
+PROGS= 	 jctbDetectorServer
+INSTDIR= 	/tftpboot
+INSTMODE= 	0777
+
+
+
+BINS = testlib_sharedlibc
+SRCS = server.c server_funcs.c communication_funcs.c firmware_funcs.c slow_adc.c blackfin.c
+#mcb_funcs.c  sharedmemory.c 
+OBJS = $(SRCS:%.c=%.o) 
+
+
+
+all:	clean versioning $(PROGS) 
+
+test: 	clean jungfrauADCTEst
+
+boot: $(OBJS)
+
+versioning: 
+	@echo `tput setaf 6;	./updateGitVersion.sh; tput sgr0;`
+
+jctbDetectorServer: $(OBJS)
+	echo $(OBJS)
+	$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@)
+
+jungfrauADCTEst: $(OBJS)
+	echo $(OBJS)
+	$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@) -DTESTADC 
+
+
+
+
+install:	$(PROGS)
+	$(INSTALL) -d $(INSTDIR)
+	$(INSTALL) -m $(INSTMODE) $(PROGS) $(INSTDIR)
+
+
+romfs:
+	$(ROMFSINST)	/bin/$(PROGS) 
+
+clean:
+	rm -rf $(PROGS)  *.o *.gdb
+
diff --git a/slsDetectorSoftware/jctbDetectorServer/Makefile.ctb b/slsDetectorSoftware/jctbDetectorServer/Makefile.ctb
deleted file mode 100644
index 788977390..000000000
--- a/slsDetectorSoftware/jctbDetectorServer/Makefile.ctb
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: Makefile,v 1.1.1.1 2006/02/04 03:35:01 freza Exp $
-# first compile
-# make cris-axis-linux-gnu
-
-
-CROSS  = bfin-uclinux-
-CC    = $(CROSS)gcc
-
-CFLAGS += -Wall -DMOENCHD -DMCB_FUNCS -DDACS_INT  -DDEBUG -DV1 -DCTB #-DVERBOSE #-DVERYVERBOSE  #-DVIRTUAL  #-DDACS_INT_CSERVER
-
-
-PROGS= 	 jungfrauDetectorServerTest
-INSTDIR= 	/tftpboot
-INSTMODE= 	0777
-
-
-
-BINS = testlib_sharedlibc
-SRCS = server.c server_funcs.c communication_funcs.c firmware_funcs.c slow_adc.c blackfin.c
-#mcb_funcs.c  sharedmemory.c 
-OBJS = $(SRCS:%.c=%.o) 
-
-
-
-all:	clean versioning $(PROGS) 
-
-test: 	clean jungfrauADCTEst
-
-boot: $(OBJS)
-
-versioning: 
-	@echo `tput setaf 6;	./updateGitVersion.sh; tput sgr0;`
-
-jungfrauDetectorServerTest: $(OBJS)
-	echo $(OBJS)
-	$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@)
-
-
-jungfrauDetectorServer: $(OBJS)
-	echo $(OBJS)
-	$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@)
-
-jungfrauADCTEst: $(OBJS)
-	echo $(OBJS)
-	$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS_$@) $(LDFLAGS_$@) -DTESTADC 
-
-
-
-
-install:	$(PROGS)
-	$(INSTALL) -d $(INSTDIR)
-	$(INSTALL) -m $(INSTMODE) $(PROGS) $(INSTDIR)
-
-
-romfs:
-	$(ROMFSINST)	/bin/$(PROGS) 
-
-clean:
-	rm -rf $(PROGS)  *.o *.gdb
-
-
-
-
-
-
diff --git a/slsDetectorSoftware/jctbDetectorServer/jungfrauDetectorServerTest b/slsDetectorSoftware/jctbDetectorServer/jctbDetectorServer
similarity index 99%
rename from slsDetectorSoftware/jctbDetectorServer/jungfrauDetectorServerTest
rename to slsDetectorSoftware/jctbDetectorServer/jctbDetectorServer
index 6ad6ee1be4cad429cb1fbd946cf156252654779c..548f90505bd849ef0dcd2e056b376696d3733292 100755
GIT binary patch
delta 23
fcmdlppMB4K_6b@{7s97ARx?U8x@>h}tT+z<ZhQ#Z

delta 23
fcmdlppMB4K_6b@{=d7nQRx?U8x@>h}tT+z<Z1f1c