Changeset 15578 for gsdl/trunk/src/corba/Makefile.in

Timestamp:

2008-05-19T15:43:00+12:00 (16 years ago)

Author:

mdewsnip

Message:

Hopefully the last set of fixes for the CORBA compilation.

Location:

gsdl/trunk/src/corba

Files:

• . (modified) (1 prop)
• Makefile.in (modified) (6 diffs)

gsdl/trunk/src/corba/Makefile.in

@@ -30 +30 @@
 COLSERVR_DIR = $(GSDL_DIR)/src/colservr
 PROTOCOL_DIR = $(GSDL_DIR)/src/protocol
+RECPT_DIR = $(GSDL_DIR)/src/recpt
 
 
@@ -38 +39 @@
 ACCENTFOLD_LIBS = 
 endif
-
-USE_CORBA = @USE_CORBA@
-ifeq ($(USE_CORBA), 1)
 
 MICO_DIR = @MICO_DIR@
@@ -56 +54 @@
 endif
 
-
+USE_CORBA = @USE_CORBA@
+ifeq ($(USE_CORBA), 1)
 AR = ar
 CC = @CC@
 CFLAGS = @CFLAGS@
 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER
-# Do NOT add the "recpt" directory here: the CORBA code should be independent of the receptionist!
-INCLUDES = -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(INDEXERS_DIR)/mgpp/text $(MICO_INCLUDES)
+INCLUDES = -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text \
+    $(MICO_INCLUDES)
 INSTALL = @INSTALL@
 LDFLAGS = @LDFLAGS@
@@ -84 +83 @@
     corbaiface_skel.mpp \
     corbaproto.mpp \
-    corbaServer.mpp \
     corbatext_t.mpp
 
@@ -92 +90 @@
     corbaiface_skel.o \
     corbaproto.o \
-    corbaServer.o \
     corbatext_t.o
 
+CORBASERVER_OBJECTS = \
+    corbaServer.o
+
+CORBARECPT_OBJECTS = \
+    corbaclient.o
+
 GSDL_LIBS = \
+    $(RECPT_DIR)/gsdlrecpt.a \
     $(PROTOCOL_DIR)/gsdlprotocol.a \
     $(COLSERVR_DIR)/gsdlcolservr.a \
@@ -104 +108 @@
     $(GSDL_DIR)/lib/gsdllib.a
 
-EXECUTABLE_OBJECTS = \
+CORBASERVER_EXECUTABLE_OBJECTS = \
     $(OBJECTS) \
+    $(CORBASERVER_OBJECTS) \
     $(GSDL_LIBS)
 
-EXECUTABLE = corbaserver
+CORBARECPT_EXECUTABLE_OBJECTS = \
+    $(OBJECTS) \
+    $(CORBARECPT_OBJECTS) \
+    $(GSDL_LIBS)
 
-corbaserver: $(EXECUTABLE_OBJECTS)
-    $(LINK) $(EXECUTABLE_OBJECTS) $(LIBS)
-
-all: $(EXECUTABLE)
+EXECUTABLES = corbaserver corbarecptldd
 
 
+# Default target: make both corbaserver and corbarecptldd
+all: $(EXECUTABLES)
 
 
-# CORBARECPT_OBJECTS = corbaproto.o corbaclient.o
+corbaserver: $(CORBASERVER_EXECUTABLE_OBJECTS)
+    $(LINK) $(CORBASERVER_EXECUTABLE_OBJECTS) $(LIBS)
 
-# CORBARECPT_OBJS = $(COMMONOBJECTS) $(CORBARECPT_OBJECTS) $(COLSERVROBJECTS) \
-#     ../../lib/corbaiface.o \
-#     ../../lib/corbaiface_skel.o \
-#     ../../lib/corbaconv_text_t.o \
-#     ../../lib/corbatext_t.o \
-#     ../../lib/gsdllib.a  \
-#     $(INDEXERS_DIR)/mg/src/text/libmgtext.a \
-#     $(INDEXERS_DIR)/mg/lib/libmglib.a \
-#     $(FASTCGI_OBJS) \
-#     $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
-#     $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a 
+corbarecptldd: $(CORBARECPT_EXECUTABLE_OBJECTS)
+    $(LINK) $(CORBARECPT_EXECUTABLE_OBJECTS) $(LIBS)
 
 
-# corbarecptldd: $(CORBARECPT_OBJS)
-#   @echo -e building corbarecptldd:
-#   $(LINK)  $(CORBARECPT_OBJS)  $(MLIBS) 
+install:
+
+clean:
+    rm -f $(OBJECTS) $(CORBASERVER_OBJECTS) $(CORBARECPT_OBJECTS) $(EXECUTABLES)
+
+distclean:
+    rm -f $(OBJECTS) $(CORBASERVER_OBJECTS) $(CORBARECPT_OBJECTS) $(EXECUTABLES) Makefile
+
+depend:
+    makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES)
 
 else