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

16
c_micasad/Makefile.am
View File

@@ -41,13 +41,9 @@ startup/micasad* startup/casacfgpam startup/casaucfgpam
CASAROOT = ..
if cpu_64
CASALIBDIR = $(CASAROOT)/lib64
else
CASALIBDIR = $(CASAROOT)/lib
endif
CASALIBDIR = $(CASAROOT)/$(LIB)
if cpu_64
if LIB64
CASABINDIR = $(CASAROOT)/bin64
else
CASABINDIR = $(CASAROOT)/bin
@@ -132,16 +128,12 @@ CS_LIBS =Mono.Posix.dll \
nunit.extensions.dll \
nunit.util.dll \
nunit.mocks.dll \
$(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.Common.dll \
$(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.Common.dll \
$(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.DataEngines.GnomeKeyring.dll
CS_LIBPATH = $(CASALIBDIR)/$(TARGET_CFG) $(srcdir)/test/dependencies
if cpu_64
OBJDIR = ./$(TARGET_CFG)/lib64
else
OBJDIR = ./$(TARGET_CFG)/lib
endif
OBJDIR = ./$(TARGET_CFG)/$(LIB)
CUR_DIR := $(shell pwd)

12
c_micasad/lib/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)
@@ -68,11 +64,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))