sync up changes from the build submitted to Germany

c_adlib/ad_gk/Makefile.am

@@ -34,11 +34,7 @@ EXTRA_DIST = $(CSFILES)
 
 CASAROOT = ../..
 
-if cpu_64
-CASALIBDIR = $(CASAROOT)/lib64
-else
-CASALIBDIR = $(CASAROOT)/lib
-endif
+CASALIBDIR = $(CASAROOT)/$(LIB)
 
 # handle Mono secondary dependencies
 export MONO_PATH := $(MONO_PATH)
@@ -57,12 +53,7 @@ CS_RESOURCES =
 CS_LIBS = 
 CS_LIBPATH =  
 
-if cpu_64
-OBJDIR = ./$(TARGET_CFG)/lib64
-else
-OBJDIR = ./$(TARGET_CFG)/lib
-endif
-
+OBJDIR = ./$(TARGET_CFG)/$(LIB)
 
 #OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs))
 

c_adlib/ad_gk/native/Makefile.am

@@ -32,11 +32,7 @@ DIST_SUBDIRS =
 
 CASAROOT = ../../..
 
-if cpu_64
-CASALIBDIR = $(CASAROOT)/lib64
-else
-CASALIBDIR = $(CASAROOT)/lib
-endif
+CASALIBDIR = $(CASAROOT)/$(LIB)
 
 BUILD_VER = 1.1.1
 
@@ -51,11 +47,7 @@ MODULE_EXT = so
 
 CFILES = $(srcdir)/ad_gk.c 
 
-if cpu_64
-LIBDIR = lib64
-else
-LIBDIR = lib
-endif
+LIBDIR = $(LIB)
 
 CSFILES_CSC :=
 INCLUDES = -I. -I.. -I$(CASAROOT)/include \
@@ -68,7 +60,7 @@ RESOURCES =
 EXTRA_CFLAGS = 
 CFLAGS += $(INCLUDES) $(DEFINES) 
 	
-LIBS = -lpthread -lc -ldl
+LIBS = -lpthread -ldl
 LDFLAGS = -fno-exceptions -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2 \
 	-Wl,-rpath -Wl,/usr/$(LIBDIR) -Wl,-soname -Wl,libad_gk.so.1