update

diff --git a/trbnetd/server/Makefile b/trbnetd/server/Makefile
index 76cfe2dcd8a12d5a3dfd4807b8351782dc327300..29d2dc653132247a42bc560de6863b428526db8f 100644 (file)
--- 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 -------------------------------------------------