Changeset 2173 for trunk/gsdl/src/recpt/Makefile.in

Timestamp:

2001-03-14T04:15:23+13:00 (23 years ago)

Author:

cs025

Message:

Improvements to configure scripts in their support of various MICO
environment considerations, particularly when MICO is on the system
paths.

Fixed CORBA version of ping to correspond with parameters etc. of the
native form.

Finally, improved PING action to be more than a simple call to
the HASCOLLECTION action in the null protocol.

File:

• trunk/gsdl/src/recpt/Makefile.in (modified) (2 diffs)

trunk/gsdl/src/recpt/Makefile.in

@@ -65 +65 @@
 endif
 MICO_DIR = @MICO_DIR@
+MICO_VER = @MICO_VER@
 ifeq ($(MICO_DIR), yes)
 MICO_INC =
 MICO_LIB =
+MICO_PATH =
 else
 ifeq ($(MICO_DIR), default)
 MICO_DIR = ../../packages/mico/include
+MICO_PATH = ../../bin/linux/
 endif
 MICO_INC = -I$(MICO_DIR)
 MICO_LIB = -L$(MICO_DIR)
+MICO_PATH =
 endif
 MINCLUDES = -I. -I../../lib -I../colservr $(MICO_INC)
@@ -89 +93 @@
 CPPLINK = $(CPP) $(LDFLAGS) -o $@
 
-MCOMPILE = ../../bin/linux/mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
-MLINK = ../../bin/linux/mico-ld -static $(LDFLAGS) $(MICO_LIB) -o  $@
-MLIBS = $(LIBS) -L../../lib/ -lmico2.3.5 -lmicoaux2.3.5          
+MCOMPILE = $(MICO_PATH)mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
+MLINK = $(MICO_PATH)mico-ld -static $(LDFLAGS) $(MICO_LIB) -o  $@
+MLIBS = $(LIBS) -L../../lib/ -lmico$(MICO_VER) -lmicoaux$(MICO_VER)
 
 .SUFFIXES: