Changeset 2173 for trunk/gsdl/lib/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/lib/Makefile.in (modified) (5 diffs)

trunk/gsdl/lib/Makefile.in

@@ -36 +36 @@
 MICO_DIR = @MICO_DIR@
 ifeq ($(MICO_DIR), default)
-MICO_INC = -I../packages/mico/include
+MICO_INC = -I../packages/mico/mico/include
+MICO_PATH = ../bin/linux/
 else
 ifeq ($(MICO_DIR), yes)
@@ -43 +44 @@
 MICO_INC = -I$(MICO_DIR)
 endif
+MICO_PATH =
 endif
-MINCLUDES = -I/usr/include/g++-2/ -I/usr/lib/gcc-lib/i386-slackware-linux/egcs-2.91.66/include/ -I/usr/include -I.  -I../packages/mico/mico/include -I../packages/mg/lib $(MICO_INC) -I..
+MINCLUDES = -I/usr/include/g++-2/ -I/usr/lib/gcc-lib/i386-slackware-linux/egcs-2.91.66/include/ -I/usr/include -I.  -I../packages/mg/lib $(MICO_INC) -I..
 RANLIB = @RANLIB@
 USE_CORBA = @USE_CORBA@
@@ -52 +54 @@
 
 ifneq ($(USE_CORBA), 0)
-MCOMPILE = mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
+MCOMPILE = $(MICO_PATH)mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
 else
 MCOMPILE = $(COMPILE)
@@ -75 +77 @@
   corbaconv_text_t.h corbatext_t.h
 CORBASOURCES = \
-  corbaiface.mpp    corbatext_t.mpp  corbaconv_text_t.mpp
+  corbaiface.mpp    corbatext_t.mpp  corbaconv_text_t.mpp corbaiface_skel.mpp
 CORBAOBJECTS = \
   corbaiface.o      corbatext_t.o    corbaconv_text_t.o  corbaiface_skel.o 
@@ -114 +116 @@
 
 clean:
-    rm -f $(OBJECTS) gsdllib.a
+    rm -f $(OBJECTS) gsdllib.a corbaiface_skel.mpp corbaiface.h corbaiface.mpp
 
 distclean: clean