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

Partial changes to the make system to deal with the new CASA directory/rpm

Browse Source 
structure.
This commit is contained in:
Juan Carlos Luciani
2006-06-19 20:14:49 +00:00
parent 723bf2b277
commit ec24ad0e1c
10 changed files with 78 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am
View File

@@ -31,9 +31,11 @@ SUBDIRS =
DIST_SUBDIRS =
CASAROOT = ../../../../../..
ROOT = ../../../../../..
CASALIBDIR = $(CASAROOT)/$(LIB)
CASAINCLUDE = ../../../../../../CASA/include
LIBDIR = $(ROOT)/$(LIB)
# handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH)
@@ -50,7 +52,7 @@ CFILES = $(srcdir)/identokenprovider.c \
$(srcdir)/platform.c
CSFILES_CSC :=
INCLUDES = -I. -I.. -I../../.. -I$(CASAROOT)/include -I../../../../../include
INCLUDES = -I. -I.. -I../../.. -I$(CASAINCLUDE) -I../../../../../include
RESOURCES =
DEFINES = -Wno-format-extra-args -fno-strict-aliasing
CFLAGS += $(INCLUDES) $(DEFINES)
@@ -81,12 +83,12 @@ $(OBJDIR)/%.o: %.cpp
$(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT): $(OBJDIR) $(OBJS)
@echo [======== Linking $@ ========]
$(LINK) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
cp -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(CASALIBDIR)/$(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT)
cp -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(LIBDIR)/$(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT)
$(OBJDIR):
[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)
[ -d $(CASALIBDIR) ] || mkdir -p $(CASALIBDIR)
[ -d $(CASALIBDIR)/$(TARGET_CFG) ] || mkdir -p $(CASALIBDIR)/$(TARGET_CFG)
[ -d $(LIBDIR) ] || mkdir -p $(LIBDIR)
[ -d $(LIBDIR)/$(TARGET_CFG) ] || mkdir -p $(LIBDIR)/$(TARGET_CFG)
install-exec-local: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT)

13
CASA-auth-token/server/AuthTokenValidate/linux/Makefile.am
View File

@@ -31,9 +31,10 @@ SUBDIRS =
DIST_SUBDIRS =
CASAROOT = ../../../../
ROOT = ../../../
CASAINCLUDE = ../../../../CASA/include
CASALIBDIR = $(CASAROOT)/$(LIB)
LIBDIR = $(ROOT)/$(LIB)
# handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH)
@@ -53,7 +54,7 @@ CFILES = $(srcdir)/config.c \
$(srcdir)/platform.c
CSFILES_CSC :=
INCLUDES = -I. -I.. -I$(CASAROOT)/include -I../../../include
INCLUDES = -I. -I.. -I$(CASAINCLUDE) -I../../../include
RESOURCES =
DEFINES = -Wno-format-extra-args -fno-strict-aliasing
CFLAGS += $(INCLUDES) $(DEFINES)
@@ -84,12 +85,12 @@ $(OBJDIR)/%.o: %.cpp
$(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT): $(OBJDIR) $(OBJS)
@echo [======== Linking $@ ========]
$(LINK) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
cp -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(CASALIBDIR)/$(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT)
cp -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(LIBDIR)/$(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT)
$(OBJDIR):
[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)
[ -d $(CASALIBDIR) ] || mkdir -p $(CASALIBDIR)
[ -d $(CASALIBDIR)/$(TARGET_CFG) ] || mkdir -p $(CASALIBDIR)/$(TARGET_CFG)
[ -d $(LIBDIR) ] || mkdir -p $(LIBDIR)
[ -d $(LIBDIR)/$(TARGET_CFG) ] || mkdir -p $(LIBDIR)/$(TARGET_CFG)
install-exec-local: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT)