Changeset 15459

Show
Ignore:
Timestamp:
15.05.2008 11:11:33 (11 years ago)
Author:
mdewsnip
Message:

Started to move all the CORBA stuff out into a new "src/corba" directory, because it is uglying up the core source directories and Makefiles.

Location:
gsdl/trunk/src
Files:
2 added
1 modified
1 moved

Legend:

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

    r15448 r15459  
    2424# 
    2525########################################################################### 
     26 
     27GSDL_DIR = ../.. 
     28INDEXERS_DIR = $(GSDL_DIR)/indexers 
     29COLSERVR_DIR = $(GSDL_DIR)/src/colservr 
    2630 
    2731CC = @CC@ 
     
    5862COMPILE = $(CC) -c $(CFLAGS) $(DEFS) $(INCLUDES) 
    5963CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES) 
    60  
    61  
    62 # =========================================================================================== 
    63 #   CORBA SUPPORT 
    64  
    65 USE_CORBA = @USE_CORBA@ 
    66  
    67 MCFLAGS = @CFLAGS@ -Wall -Wunused 
    68  
    69 MICO_DIR = @MICO_DIR@ 
    70 ifeq ($(MICO_DIR), default) 
    71 MICO_INC = -I../../packages/mico/include 
    72 MICO_PATH = ../../bin/linux/ 
    73 else 
    74 ifeq ($(MICO_DIR), yes) 
    75 MICO_INC = 
    76 MICO_PATH = 
    77 else 
    78 MICO_INC = -I$(MICO_DIR) 
    79 MICO_PATH = 
    80 endif 
    81 endif 
    82 MINCLUDES = -I. -I../../lib -I../recpt  -I$(INDEXERS_DIR)/mgpp/text $(MICO_INC) 
    83  
    84 MCOMPILE = $(MICO_PATH)mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c 
    85  
    86 .SUFFIXES: .mpp .o 
    87 .mpp.o: 
    88     $(MCOMPILE) $< 
    89  
    90 ifneq ($(USE_CORBA), 0) 
    91 CORBAHEADERS = corbaServer.h 
    92 CORBASOURCES = corbaServer.mpp 
    93 CORBAOBJECTS = corbaServer.o ../../lib/corbaiface_skel.o 
    94 else 
    95 CORBAHEADERS =  
    96 CORBASOURCES =  
    97 CORBAOBJECTS =  
    98 endif 
    99  
    100 # =========================================================================================== 
    10164 
    10265