Changeset 2171

Timestamp:

2001-03-13T18:02:15+13:00 (23 years ago)

Author:

jrm21

Message:

various - changed make to $(MAKE), tidied up conditionals (eg for USE_FASTCGI).

File:

• trunk/gsdl/src/recpt/Makefile.in (modified) (10 diffs)

trunk/gsdl/src/recpt/Makefile.in

@@ -32 +32 @@
 endif
 
+USE_CORBA = @USE_CORBA@
+ifeq ($(USE_CORBA), 1)
+CORBA_CFLAGS=-DUSE_CORBA
+else
+CORBA_CFLAGS=
+endif
+
+
+
 AR = ar
 CC = @CC@
@@ -37 +46 @@
 #CCFLAGS = @CFLAGS@ -Wall -Wunused -pedantic -W -Woverloaded-virtual
 
-CCFLAGS = $(Z_CFLAGS) @CFLAGS@
+CCFLAGS = $(Z_CFLAGS) $(CORBA_CFLAGS) @CFLAGS@
 
 # YAZ kit for z39.50
@@ -50 +59 @@
 else 
 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DUSE_FASTCGI @DEFS@
-
 INCLUDES = -I../../lib -I. -I../colservr -I../../packages/mg \
        -I../../packages/mg/lib -I../../packages/mg/src/text \
@@ -69 +77 @@
 MINCLUDES = -I. -I../../lib -I../colservr $(MICO_INC)
 
-USE_CORBA = @USE_CORBA@
-
 RANLIB = @RANLIB@
 LDFLAGS = @LDFLAGS@
@@ -76 +82 @@
 
 GSDLOS = @gsdlos@
-
 
 COMPILE = $(CC) -c $(CCFLAGS) $(DEFS) $(INCLUDES)
@@ -214 +219 @@
 # called by librarymain.cpp.
 $(YAZDIR)/client/yaz_zclient.o: $(YAZDIR)/lib/libyaz.a
-    cd $(YAZDIR)/client &&  make yaz_zclient.o
+    cd $(YAZDIR)/client &&  $(MAKE) yaz_zclient.o
 
 # this should be done by the top level makefile...
 $(YAZDIR)/lib/libyaz.a:
-    cd $(YAZDIR) && make all
+    cd $(YAZDIR) && $(MAKE) all
 
 # put a separate rule here, as it speeds up compilation of other objects
@@ -252 +257 @@
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-
-
-ifneq ($(USE_FASTCGI), 1)
+ifeq ($(USE_FASTCGI), 1)
+    FASTCGI_OBJS = ../../packages/fcgi/libfcgi/libfcgi.a
+else
+    FASTCGI_OBJS =
+endif
+
 RECPT_OBJS = $(COMMONOBJECTS) $(RECPTOBJECTS) \
     ../../lib/gsdllib.a  \
     ../../packages/mg/src/text/libtextin.a \
     ../../packages/mg/lib/libmg.a \
+    $(FASTCGI_OBJS) \
     ../mgpp/text/libtextin.a \
     ../mgpp/lib/libmg.a 
-else
-RECPT_OBJS = $(COMMONOBJECTS) $(RECPTOBJECTS) \
-    ../../lib/gsdllib.a  \
-    ../../packages/mg/src/text/libtextin.a \
-    ../../packages/mg/lib/libmg.a \
-    ../../packages/fcgi/libfcgi/libfcgi.a \
-    ../mgpp/text/libtextin.a \
-    ../mgpp/lib/libmg.a 
-endif
 
 recpt: $(RECPT_OBJS)
@@ -282 +282 @@
 
 
-ifneq ($(USE_FASTCGI), 1)
 LIBRARY_OBJS = $(COMMONOBJECTS) $(LIBRARYOBJECTS) $(COLSERVROBJECTS) \
     ../../lib/gsdllib.a  \
     ../../packages/mg/src/text/libtextin.a \
     ../../packages/mg/lib/libmg.a \
-    $(Z_LIBYAZ_A) \
+    $(FASTCGI_OBJS) $(Z_LIBYAZ_A) \
     ../mgpp/text/libtextin.a \
-    ../mgpp/lib/libmg.a 
-else
-LIBRARY_OBJS = $(COMMONOBJECTS) $(LIBRARYOBJECTS) $(COLSERVROBJECTS) \
-    ../../lib/gsdllib.a  \
-    ../../packages/mg/src/text/libtextin.a \
-    ../../packages/mg/lib/libmg.a \
-    ../../packages/fcgi/libfcgi/libfcgi.a \
-    ../mgpp/text/libtextin.a \
-    ../mgpp/lib/libmg.a \
-    $(Z_LIBYAZ_A)
-endif
+    ../mgpp/lib/libmg.a
 
 library: $(LIBRARY_OBJS)
@@ -309 +298 @@
                    ../../lib/corbatext_t.o ../../lib/corbaconv_text_t.o \
            ../../lib/corbaiface.o ../../lib/corbaiface_skel.o
-ifneq ($(USE_FASTCGI), 1)
+
 RLIBRARY_OBJS = $(COMMONOBJECTS) $(RECPTLIB_OBJECTS) $(COLSERVROBJECTS) \
     ../../lib/gsdllib.a  \
     ../../packages/mg/src/text/libtextin.a \
     ../../packages/mg/lib/libmg.a \
+    $(FASTCGI_OBJS) $(Z_LIBOBJS) $(Z_LIBYAZ_A) \
     ../mgpp/text/libtextin.a \
     ../mgpp/lib/libmg.a 
-else
-RLIBRARY_OBJS = $(COMMONOBJECTS) $(RECPTLIB_OBJECTS) $(COLSERVROBJECTS) \
-    ../../lib/gsdllib.a  \
-    ../../packages/mg/src/text/libtextin.a \
-    ../../packages/mg/lib/libmg.a \
-    ../../packages/fcgi/libfcgi/libfcgi.a \
-    ../mgpp/text/libtextin.a \
-    ../mgpp/lib/libmg.a 
-endif
+
 RECPTLIB_OBJS = $(RLIBRARY_OBJS) ../colservr/corbaServer.o
 
 corbaserver: $(RECPTLIB_OBJS)
-    echo -e building corbaserver
+    @echo -e building corbaserver
     $(MLINK) $(RECPTLIB_OBJS) $(MLIBS)
-    strip --strip-all --discard-all corbaserver
-
+# non GNU strips might not like these options - check autoconf?
+#   strip --strip-all --discard-all corbaserver
+    strip corbaserver
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
 CORBARECPT_OBJECTS = nullproto.o corbaproto.o corbaclient.o
-ifneq ($(USE_FASTCGI), 1)
+
 CORBARECPT_OBJS = $(COMMONOBJECTS) $(CORBARECPT_OBJECTS) $(COLSERVROBJECTS) \
     ../../lib/corbaiface.o \
@@ -344 +327 @@
     ../../packages/mg/src/text/libtextin.a \
     ../../packages/mg/lib/libmg.a \
+    $(FASTCGI_OBJS) \
     ../mgpp/text/libtextin.a \
     ../mgpp/lib/libmg.a 
-else
-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  \
-    ../../packages/mg/src/text/libtextin.a \
-    ../../packages/mg/lib/libmg.a \
-    ../../packages/fcgi/libfcgi/libfcgi.a \
-    ../mgpp/text/libtextin.a \
-    ../mgpp/lib/libmg.a 
-endif
+
 
 corbarecptldd: $(CORBARECPT_OBJS)
-    echo -e building corbarecptldd:
+    @echo -e building corbarecptldd:
     $(MLINK)  $(CORBARECPT_OBJS)  $(MLIBS)