Changeset 15549

Show
Ignore:
Timestamp:
16.05.2008 16:07:03 (12 years ago)
Author:
mdewsnip
Message:

Fixed previous change.

Files:
1 modified

Legend:

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

    r15548 r15549  
    1 USE_CORBA = @USE_CORBA@ 
    2 ifneq ($(USE_CORBA), 0) 
     1########################################################################### 
     2# 
     3# Makefile -- src/corba 
     4# A component of the Greenstone digital library software 
     5# from the New Zealand Digital Library Project at the 
     6# University of Waikato, New Zealand. 
     7# 
     8# Copyright (C) 1999-2008  The New Zealand Digital Library Project 
     9# 
     10# 
     11# This program is free software; you can redistribute it and/or modify 
     12# it under the terms of the GNU General Public License as published by 
     13# the Free Software Foundation; either version 2 of the License, or 
     14# (at your option) any later version. 
     15# 
     16# This program is distributed in the hope that it will be useful, 
     17# but WITHOUT ANY WARRANTY; without even the implied warranty of 
     18# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     19# GNU General Public License for more details. 
     20# 
     21# You should have received a copy of the GNU General Public License 
     22# along with this program; if not, write to the Free Software 
     23# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
     24# 
     25########################################################################### 
     26 
     27GSDL_DIR = ../.. 
     28INDEXERS_DIR = $(GSDL_DIR)/indexers 
     29PACKAGES_DIR = $(GSDL_DIR)/packages 
     30COLSERVR_DIR = $(GSDL_DIR)/src/colservr 
     31PROTOCOL_DIR = $(GSDL_DIR)/src/protocol 
    332 
    433 
     34USE_CORBA = @USE_CORBA@ 
     35ifeq ($(USE_CORBA), 1) 
    536 
    637# FROM LIB 
     
    2253MCFLAGS = -Wall -Wunused 
    2354 
    24 ifneq ($(USE_CORBA), 0) 
    2555MCOMPILE = $(MICO_PATH)mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c 
    26 else 
    27 MCOMPILE = $(COMPILE) 
    28 endif 
    2956 
    3057 
     
    4067CORBAOBJECTS = \ 
    4168  corbaiface.o      corbatext_t.o    corbaconv_text_t.o   corbaiface_skel.o  
    42 else 
    43 CORBAHEADERS =  
    44 CORBASOURCE =  
    45 CORBAOBJECTS =  
    46 endif 
     69 
    4770 
    4871corbaiface_skel.h: corbaiface.idl 
     
    81104    $(MCOMPILE) $< 
    82105 
    83 ifneq ($(USE_CORBA), 0) 
    84106CORBAHEADERS = corbaServer.h 
    85107CORBASOURCES = corbaServer.mpp 
    86108CORBAOBJECTS = corbaServer.o ../../lib/corbaiface_skel.o 
    87 else 
    88 CORBAHEADERS =  
    89 CORBASOURCES =  
    90 CORBAOBJECTS =  
    91 endif 
    92109 
    93110# =========================================================================================== 
     
    96113# FROM RECPT 
    97114 
    98 USE_CORBA = @USE_CORBA@ 
    99 ifeq ($(USE_CORBA), 1) 
    100115CORBA_CFLAGS=-DUSE_CORBA 
    101 else 
    102 CORBA_CFLAGS= 
    103 endif 
    104116 
    105117 
    106 ifeq ($(USE_CORBA), 1) 
    107118EXEC = corbaserver corbarecptldd 
    108 endif 
    109119 
    110120 
     
    167177    $(MLINK)  $(CORBARECPT_OBJS)  $(MLIBS)  
    168178 
     179else 
     180all: 
     181install: 
     182clean: 
     183distclean: 
     184depend: 
    169185endif