From: hadaq <hadaq>
Date: Mon, 9 Jan 2012 00:23:53 +0000 (+0000)
Subject: update
X-Git-Tag: v6.0~87
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=b0697135b3a6e7a20cd047b1d1ad442c59ef830f;p=trbnettools.git

update
---

diff --git a/libtrbnet/Makefile b/libtrbnet/Makefile
index 8c9ea3f..1cbb087 100644
--- a/libtrbnet/Makefile
+++ b/libtrbnet/Makefile
@@ -90,6 +90,11 @@ distclean: clean
 depend:
 	$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(INCDIR) *.c
 
+install: $(TARGETS) $(LIB_TARGETS)
+	install -m 775 $(TARGETS) ../binlocal/
+	install -m 775 $(LIB_TARGETS) ../liblocal/
+	install -m 664 trbnet.h trberror.h pexor_user.h ../include/
+
 # ------------ Dependencies --------------------------------------------
 
 ifndef AXIS_TOP_DIR
diff --git a/pexor/Makefile b/pexor/Makefile
index 9f0ad3f..c21becb 100644
--- a/pexor/Makefile
+++ b/pexor/Makefile
@@ -74,18 +74,22 @@ all: $(LIB_TARGETS) $(TARGETS)
 .PHONY: clean 
 clean:
 	rm -f *.o core core.*
-	rcsclean
+	make -C kernel-module clean
 
 .PHONY: distclean
 distclean: clean
 	rm -f $(TARGETS) $(LIB_TARGETS)
 	find . -type l -exec rm {} \;
-	rcsclean -u
+	make -C kernel-module distclean
 
 .PHONY: depend
 depend:
 	$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(INCDIR) *.c
 
+install: $(TARGETS)
+	install -m 775 $(TARGETS) ../binlocal/
+	make -C kernel-module install
+
 # ------------ Dependencies --------------------------------------------
 
 pexorflash: pexorflash.o
diff --git a/pexor/kernel-module/Makefile b/pexor/kernel-module/Makefile
index 3a5f568..d28f4ac 100644
--- a/pexor/kernel-module/Makefile
+++ b/pexor/kernel-module/Makefile
@@ -5,8 +5,24 @@ pexor-objs := pexor_trb.o
 KERNELDIR ?= /lib/modules/$(shell uname -r)/build
 PWD       := $(shell pwd)
 
-all:
-	$(MAKE) -C $(KERNELDIR) M=$(PWD)
+# --- Targets ----------------------------------------------------------
+
+TARGETS = pexor.ko
+
+all: $(TARGETS)
+
+.PHONY: distclean
+distclean:
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
 
+.PHONY: clean
 clean:
 	$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
+
+install: $(TARGETS)
+	install -m 775  $(TARGETS) ../../kernel-modules/
+
+# ------------ Dependencies --------------------------------------------
+
+pexor.ko:
+	$(MAKE) -C $(KERNELDIR) M=$(PWD)
diff --git a/trbnetd/Makefile b/trbnetd/Makefile
index 9ed6753..c0d9ea7 100644
--- a/trbnetd/Makefile
+++ b/trbnetd/Makefile
@@ -95,6 +95,10 @@ cleanrpc:
 depend:
 	$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(INCDIR) *.c
 
+install: $(TARGETS) $(LIB_TARGETS)
+	install -m 775 $(TARGETS) ../bin/
+	install -m 775 $(LIB_TARGETS) ../lib/
+
 # ------------ Dependencies --------------------------------------------
 
 trbcmd: trbcmd.o libtrbnet.a 
diff --git a/trbnetd/server/Makefile b/trbnetd/server/Makefile
index 29d2dc6..3fbe6d2 100644
--- a/trbnetd/server/Makefile
+++ b/trbnetd/server/Makefile
@@ -94,6 +94,9 @@ cleanrpc:
 depend:
 	$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(INCDIR) *.c
 
+install: $(TARGETS)
+	install -m 775 $(TARGETS) ../../binlocal/
+
 # ------------ Dependencies --------------------------------------------
 
 trbnetd: trbnetd.o rpcserver.o trbrpc_xdr.o
diff --git a/trbrich/Makefile b/trbrich/Makefile
index 997b019..1957640 100644
--- a/trbrich/Makefile
+++ b/trbrich/Makefile
@@ -83,6 +83,9 @@ distclean: clean
 depend:
 	$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(INCDIR) *.c
 
+install: $(TARGETS)
+	install -m 775 $(TARGETS) ../binlocal/
+
 # ------------ Dependencies --------------------------------------------
 
 pulser: pulser.o