Changeset 15549

Timestamp:

2008-05-16T16:07:03+12:00 (16 years ago)

Author:

mdewsnip

Message:

Fixed previous change.

File:

• gsdl/trunk/src/corba/Makefile.in (modified) (6 diffs)

gsdl/trunk/src/corba/Makefile.in

@@ -1 @@
-USE_CORBA = @USE_CORBA@
-ifneq ($(USE_CORBA), 0)
+###########################################################################
+#
+# Makefile -- src/corba
+# A component of the Greenstone digital library software
+# from the New Zealand Digital Library Project at the
+# University of Waikato, New Zealand.
+#
+# Copyright (C) 1999-2008  The New Zealand Digital Library Project
+#
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+###########################################################################
+
+GSDL_DIR = ../..
+INDEXERS_DIR = $(GSDL_DIR)/indexers
+PACKAGES_DIR = $(GSDL_DIR)/packages
+COLSERVR_DIR = $(GSDL_DIR)/src/colservr
+PROTOCOL_DIR = $(GSDL_DIR)/src/protocol
 
 
+USE_CORBA = @USE_CORBA@
+ifeq ($(USE_CORBA), 1)
 
 # FROM LIB
@@ -22 +53 @@
 MCFLAGS = -Wall -Wunused
 
-ifneq ($(USE_CORBA), 0)
 MCOMPILE = $(MICO_PATH)mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
-else
-MCOMPILE = $(COMPILE)
-endif
 
 
@@ -40 +67 @@
 CORBAOBJECTS = \
   corbaiface.o      corbatext_t.o    corbaconv_text_t.o   corbaiface_skel.o 
-else
-CORBAHEADERS = 
-CORBASOURCE = 
-CORBAOBJECTS = 
-endif
+
 
 corbaiface_skel.h: corbaiface.idl
@@ -81 +104 @@
     $(MCOMPILE) $<
 
-ifneq ($(USE_CORBA), 0)
 CORBAHEADERS = corbaServer.h
 CORBASOURCES = corbaServer.mpp
 CORBAOBJECTS = corbaServer.o ../../lib/corbaiface_skel.o
-else
-CORBAHEADERS = 
-CORBASOURCES = 
-CORBAOBJECTS = 
-endif
 
 # ===========================================================================================
@@ -96 +113 @@
 # FROM RECPT
 
-USE_CORBA = @USE_CORBA@
-ifeq ($(USE_CORBA), 1)
 CORBA_CFLAGS=-DUSE_CORBA
-else
-CORBA_CFLAGS=
-endif
 
 
-ifeq ($(USE_CORBA), 1)
 EXEC = corbaserver corbarecptldd
-endif
 
 
@@ -167 +177 @@
     $(MLINK)  $(CORBARECPT_OBJS)  $(MLIBS) 
 
+else
+all:
+install:
+clean:
+distclean:
+depend:
 endif