From: hadaq <hadaq>
Date: Mon, 23 May 2011 00:59:48 +0000 (+0000)
Subject: update
X-Git-Tag: v6.0~148
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=eef3c8d9d7533e925a3a5bd23439337b5f88dba6;p=trbnettools.git

update
---

diff --git a/trbnetd/server/Makefile b/trbnetd/server/Makefile
index 76cfe2d..29d2dc6 100644
--- a/trbnetd/server/Makefile
+++ b/trbnetd/server/Makefile
@@ -1,15 +1,19 @@
 # ------------ Compiler / Linker Options -------------------------------
 
-ARCH=$(shell uname -m)
-ifeq ($(shell uname -m), x86_64)
-CPPFLAGS = -DX86_64
-else
-CPPFLAGS =
+ifdef AXIS_TOP_DIR
+	AXIS_USABLE_LIBS = UCLIBC GLIBC
+	include $(AXIS_TOP_DIR)/tools/build/Rules.axis
+else	
+	CC = gcc
+	ifeq ($(shell uname -m), x86_64)
+		CPPFLAGS = -DPEXOR -DX86_64
+	else	
+		CPPFLAGS = -DPEXOR
+	endif
 endif
 
-INCDIR = -I../../libtrbnetpexor
+INCDIR = -I../../libtrbnet
 
-CC = gcc
 CFLAGS = -pipe -g -Wall  -Winline -O3 -fPIC -finline-functions -finline-limit=600000
 
 CXX = g++
@@ -19,7 +23,7 @@ LD = $(CC)
 #LD = $(CXX)
 
 LDFLAGS = 
-LIBDIR = -L../../libtrbnetpexor
+LIBDIR = -L../../libtrbnet
 LOADLIBES = -ltrbnet
 
 # ------------ TARGETS -------------------------------------------------