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

Timestamp:

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

Author:

mdewsnip

Message:

More improvements to the Makefile for compiling the CORBA stuff.

File:

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

gsdl/trunk/src/corba/Makefile.in

@@ -32 +32 @@
 
 
+ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@
+ifeq ($(ENABLE_ACCENTFOLD), 1)
+ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a 
+else
+ACCENTFOLD_LIBS = 
+endif
+
 USE_CORBA = @USE_CORBA@
 ifeq ($(USE_CORBA), 1)
 
 MICO_DIR = @MICO_DIR@
+MICO_VER = @MICO_VER@
 ifeq ($(MICO_DIR), default)
 MICO_INCLUDES = -I$(PACKAGES_DIR)/mico/mico/include
@@ -58 +66 @@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) \
-    $(PACKAGES_DIR)/yaz/lib/libyaz.a $(PACKAGES_DIR)/d2m/libd2m.a -lxml2
+        -L$(PACKAGES_DIR)/mico/lib -lmico$(MICO_VER)
 RANLIB = @RANLIB@
 
 
 COMPILE = $(MICO_PATH)mico-c++ -x c++ $(CFLAGS) $(DEFS) $(INCLUDES) -c
+LINK = $(MICO_PATH)mico-ld $(LDFLAGS) -o $@
 
 
@@ -74 +83 @@
     corbaiface.mpp \
     corbaiface_skel.mpp \
+    corbaproto.mpp \
     corbaServer.mpp \
     corbatext_t.mpp
@@ -81 +91 @@
     corbaiface.o \
     corbaiface_skel.o \
+    corbaproto.o \
     corbaServer.o \
     corbatext_t.o
 
-EXECUTABLE = corbaserver corbarecptldd
+GSDL_LIBS = \
+    $(PROTOCOL_DIR)/gsdlprotocol.a \
+    $(COLSERVR_DIR)/gsdlcolservr.a \
+    $(INDEXERS_DIR)/mg/src/text/libmgtext.a \
+    $(INDEXERS_DIR)/mg/lib/libmglib.a \
+    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
+    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a \
+    $(GSDL_DIR)/lib/gsdllib.a
+
+EXECUTABLE_OBJECTS = \
+    $(OBJECTS) \
+    $(GSDL_LIBS)
+
+EXECUTABLE = corbaserver
+
+corbaserver: $(EXECUTABLE_OBJECTS)
+    $(LINK) $(EXECUTABLE_OBJECTS) $(LIBS)
 
 all: $(EXECUTABLE)
 
-MSTATIC = @STATIC@
-MLINK = $(MICO_PATH)mico-ld $(MSTATIC)  $(LDFLAGS) $(MICO_LIB) -o  $@
-MLIBS = $(LIBS) -L../../lib/ -lmico$(MICO_VER) -lmicoaux$(MICO_VER)
-
-# .SUFFIXES: .mpp .o
-# .mpp.o:
-#   $(MCOMPILE) $< -o $@
 
 
-corbaserver: $(OBJECTS)
-    @echo -e building corbaserver
-    $(MLINK) $(OBJECTS) $(MLIBS)
-# stripping symbols was a cunning plan, but caused difficulties when 
-#  it came to debugging ...
-# non GNU strips might not like these options - check autoconf?
-#   strip --strip-all --discard-all corbaserver
-#   strip corbaserver
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-CORBARECPT_OBJECTS = corbaproto.o corbaclient.o
+# CORBARECPT_OBJECTS = corbaproto.o corbaclient.o
 
-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 
+# 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_OBJS)
-    @echo -e building corbarecptldd:
-    $(MLINK)  $(CORBARECPT_OBJS)  $(MLIBS) 
+# corbarecptldd: $(CORBARECPT_OBJS)
+#   @echo -e building corbarecptldd:
+#   $(LINK)  $(CORBARECPT_OBJS)  $(MLIBS) 
 
 else