Changeset 15463

Timestamp:

2008-05-15T11:35:57+12:00 (16 years ago)

Author:

mdewsnip

Message:

Moved all the CORBA stuff from lib into src/corba, to prevent it from uglying up the core code.

Location:

gsdl/trunk/src/corba

Files:

• Makefile.in (modified) (1 diff)
• corbaconv_text_t.h (copied) (copied from gsdl/trunk/lib/corbaconv_text_t.h )
• corbaconv_text_t.mpp (copied) (copied from gsdl/trunk/lib/corbaconv_text_t.mpp )
• corbaiface.h (copied) (copied from gsdl/trunk/lib/corbaiface.h )
• corbaiface.idl (copied) (copied from gsdl/trunk/lib/corbaiface.idl )
• corbaiface.mpp (copied) (copied from gsdl/trunk/lib/corbaiface.mpp )
• corbaiface_skel.mpp (copied) (copied from gsdl/trunk/lib/corbaiface_skel.mpp )
• corbatext_t.h (copied) (copied from gsdl/trunk/lib/corbatext_t.h )
• corbatext_t.mpp (copied) (copied from gsdl/trunk/lib/corbatext_t.mpp )

gsdl/trunk/src/corba/Makefile.in

@@ +1 @@
+# FROM LIB
+
+MICO_DIR = @MICO_DIR@
+ifeq ($(MICO_DIR), default)
+MICO_INC = -I../packages/mico/mico/include
+MICO_PATH = ../bin/linux/
+else
+ifeq ($(MICO_DIR), yes)
+MICO_INC =
+else
+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../indexers/mg/lib $(MICO_INC) -I..
+
+MCFLAGS = -Wall -Wunused
+
+ifneq ($(USE_CORBA), 0)
+MCOMPILE = $(MICO_PATH)mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
+else
+MCOMPILE = $(COMPILE)
+endif
+
+
+.SUFFIXES: .mpp .o
+.mpp.o:
+    $(MCOMPILE) $<
+
+
+ifneq ($(USE_CORBA), 0)
+CORBAHEADERS = \
+  corbaconv_text_t.h corbatext_t.h
+CORBASOURCES = \
+  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 
+else
+CORBAHEADERS = 
+CORBASOURCE = 
+CORBAOBJECTS = 
+endif
+
+corbaiface_skel.h: corbaiface.idl
+    LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=$(MICO_PATH):$(PATH) idl --boa --no-poa --c++-skel --c++-suffix=mpp $?
+corbaiface_skel.mpp: corbaiface.idl
+    LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=$(MICO_PATH):$(PATH) idl --boa --no-poa --c++-skel --c++-suffix=mpp $?
+corbaiface.mpp: corbaiface.idl
+    LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=$(MICO_PATH):$(PATH) idl --boa --no-poa --c++-skel --c++-suffix=mpp $?
+
+
+# FROM COLSERVR
 # ===========================================================================================
 #   CORBA SUPPORT