Changeset 15463

Show
Ignore:
Timestamp:
15.05.2008 11:35:57 (12 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:
1 modified
8 copied

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/src/corba/Makefile.in

    r15459 r15463  
     1# FROM LIB 
     2 
     3MICO_DIR = @MICO_DIR@ 
     4ifeq ($(MICO_DIR), default) 
     5MICO_INC = -I../packages/mico/mico/include 
     6MICO_PATH = ../bin/linux/ 
     7else 
     8ifeq ($(MICO_DIR), yes) 
     9MICO_INC = 
     10else 
     11MICO_INC = -I$(MICO_DIR) 
     12endif 
     13MICO_PATH = 
     14endif 
     15MINCLUDES = -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.. 
     16 
     17MCFLAGS = -Wall -Wunused 
     18 
     19ifneq ($(USE_CORBA), 0) 
     20MCOMPILE = $(MICO_PATH)mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c 
     21else 
     22MCOMPILE = $(COMPILE) 
     23endif 
     24 
     25 
     26.SUFFIXES: .mpp .o 
     27.mpp.o: 
     28    $(MCOMPILE) $< 
     29 
     30 
     31ifneq ($(USE_CORBA), 0) 
     32CORBAHEADERS = \ 
     33  corbaconv_text_t.h corbatext_t.h 
     34CORBASOURCES = \ 
     35  corbaiface.mpp    corbatext_t.mpp  corbaconv_text_t.mpp corbaiface_skel.mpp 
     36CORBAOBJECTS = \ 
     37  corbaiface.o      corbatext_t.o    corbaconv_text_t.o   corbaiface_skel.o  
     38else 
     39CORBAHEADERS =  
     40CORBASOURCE =  
     41CORBAOBJECTS =  
     42endif 
     43 
     44corbaiface_skel.h: corbaiface.idl 
     45    LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=$(MICO_PATH):$(PATH) idl --boa --no-poa --c++-skel --c++-suffix=mpp $? 
     46corbaiface_skel.mpp: corbaiface.idl 
     47    LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=$(MICO_PATH):$(PATH) idl --boa --no-poa --c++-skel --c++-suffix=mpp $? 
     48corbaiface.mpp: corbaiface.idl 
     49    LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=$(MICO_PATH):$(PATH) idl --boa --no-poa --c++-skel --c++-suffix=mpp $? 
     50 
     51 
     52# FROM COLSERVR 
    153# =========================================================================================== 
    254#   CORBA SUPPORT