geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sync up changes from the build submitted to Germany

Browse Source
This commit is contained in:
soochoi
2006-03-28 17:36:31 +00:00
parent 0b3db62210
commit 189777ec3c
24 changed files with 83 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
c_adlib/Makefile.am
View File

@@ -32,11 +32,7 @@ DIST_SUBDIRS = ad_kw ad_gk ad_ff
CASAROOT = ..
if cpu_64
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
CASALIBDIR = $(CASAROOT)/$(LIB)
EXTRA_DIST = $(CSFILES)
@@ -71,12 +67,7 @@ CS_LIBPATH = $(CASALIBDIR)/$(TARGET_CFG) $(srcdir)/ad_gk/$(TARGET_CFG) $(srcdir)
$(srcdir)/ad_ff/$(TARGET_CFG)
if cpu_64
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
OBJDIR = ./$(TARGET_CFG)/$(LIB)
#OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs))

13
c_adlib/ad_ff/Makefile.am
View File

@@ -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)
@@ -58,12 +54,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))

24
c_adlib/ad_ff/native/Makefile.am
View File

@@ -33,11 +33,7 @@ EXTRA_DIST = $(CXXFILES) *.h
CASAROOT = ../../..
if cpu_64
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
CASALIBDIR = $(CASAROOT)/$(LIB)
BUILD_VER = 1.1.1
@@ -68,21 +64,13 @@ EXTRA_CXXFLAGS = -fPIC -DPIC -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_
-DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -g -D_REENTRANT \
-DALIGNMENT -DN_PLAT_UNIX -DUNIX -DLINUX -DIAPX386
CXX_RESOURCES =
LIBS = -lpthread -lc -ldl -L/opt/kde3/lib
LIBS = -lpthread -ldl -L/opt/kde3/lib
LDFLAGS = -fno-exception -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2 \
-Wl,-rpath -Wl,/usr/lib -Wl,-soname -Wl,libkwallets_rw.so.1
-Wl,-soname -Wl,libkwallets_rw.so.1
if cpu_64
EXTRA_LDFLAGS = -L/usr/lib64 -lqt-mt -L/usr/X11R6/lib64 -L/usr/lib/qt3/lib64
else
EXTRA_LddDFLAGS = -L/usr/lib -lqt-mt -L/usr/X11R6/lib -L/usr/lib/qt3/lib
endif
if cpu_64
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
EXTRA_LDFLAGS = -L/usr/$(LIB) -lqt-mt -L/usr/X11R6/$(LIB) -L/usr/lib/qt3/$(LIB)
OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJS = $(addprefix $(OBJDIR)/, $(CXXFILES:%.cpp=%.o))

13
c_adlib/ad_gk/Makefile.am
View File

@@ -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))

14
c_adlib/ad_gk/native/Makefile.am
View File

@@ -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

12
c_adlib/ad_kw/Makefile.am
View File

@@ -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)
@@ -59,11 +55,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))

25
c_adlib/ad_kw/native/Makefile.am
View File

@@ -33,11 +33,7 @@ EXTRA_DIST = $(CXXFILES) $(CXX_MOC_FILES) *.h
CASAROOT = ../../..
if cpu_64
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
CASALIBDIR = $(CASAROOT)/$(LIB)
BUILD_VER = 1.1.1
@@ -66,23 +62,14 @@ EXTRA_CXXFLAGS = -fPIC -DPIC -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_
-DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -g -D_REENTRANT \
-DALIGNMENT -DN_PLAT_UNIX -DUNIX -DLINUX -DIAPX386
CXX_RESOURCES =
LIBS = -lpthread -lc -ldl -L/opt/kde3/lib
LIBS = -lpthread -ldl
LDFLAGS = -fno-exception -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2 \
-Wl,-rpath -Wl,/usr/lib -Wl,-soname -Wl,libkwallets_rw.so.1
-Wl,-soname -Wl,libkwallets_rw.so.1
if cpu_64
EXTRA_LDFLAGS = -L/usr/lib64 -lpthread -lc -ldl -L/opt/kde3/lib64 -lkwalletclient \
-lqt-mt -L/usr/X11R6/lib64 -L/usr/lib/qt3/lib64 -lqt-mt
else
EXTRA_LDFLAGS = -L/usr/lib -lpthread -lc -ldl -L/opt/kde3/lib -lkwalletclient \
-lqt-mt -L/usr/X11R6/lib -L/usr/lib/qt3/lib -lqt-mt
endif
EXTRA_LDFLAGS = -L/opt/kde3/$(LIB) -lkwalletclient \
-lqt-mt -L/usr/X11R6/$(LIB) -L/usr/lib/qt3/$(LIB) -lqt-mt
if cpu_64
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJS = $(addprefix $(OBJDIR)/, $(CXXFILES:%.cpp=%.o))