Ignore:
Timestamp:
2008-05-14T10:45:42+12:00 (16 years ago)
Author:
mdewsnip
Message:

Lots of improvements to the colservr Makefile, particularly tidying up the MGPP stuff, which is now very much core functionality.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/src/colservr/Makefile.in

    r15425 r15426  
    66# University of Waikato, New Zealand.
    77#
    8 # Copyright (C) 1999  The New Zealand Digital Library Project
     8# Copyright (C) 1999-2008  The New Zealand Digital Library Project
    99#
    1010#
    … …  
    2525###########################################################################
    2626
    27 
    2827AR = ar
    2928CC = @CC@
    … …  
    3130CFLAGS = @CFLAGS@
    3231CXXFLAGS = @CXXFLAGS@
    33 MCFLAGS = @CFLAGS@ -Wall -Wunused
    3432DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER @DEFS@
     33LDFLAGS = @LDFLAGS@
     34LIBS = @LIBS@
     35RANLIB = @RANLIB@
    3536
    36 INDEXERS_DIR=../../indexers
     37GSDLOS = @gsdlos@
     38
    3739USE_FASTCGI = @USE_FASTCGI@
    38 USE_MGPP = @USE_MGPP@
    3940ifneq ($(USE_FASTCGI), 1)
    4041DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM @DEFS@
    41 
    4242CGI_INCLUDES =
    4343else
    4444DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DUSE_FASTCGI @DEFS@
    45 
    4645CGI_INCLUDES = -I../../packages/fcgi/include
    4746endif
    4847
    49 ifneq ($(USE_MGPP), 1)
    50 MG_INCLUDES = -I$(INDEXERS_DIR)/mg  -I$(INDEXERS_DIR)/mg/lib \
    51         -I$(INDEXERS_DIR)/mg/src/text
    52 MG_HEADERS = mgq.h mgsearch.h mgqueryfilter.h
     48INDEXERS_DIR = ../../indexers
    5349
    54 MG_SOURCES = mgq.c mgsearch.cpp mgqueryfilter.cpp
     50MG_INCLUDES = -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text
     51MG_HEADERS = mgq.h mgsearch.h mgqueryfilter.h
     52MG_SOURCES = mgq.c mgsearch.cpp mgqueryfilter.cpp
     53MG_OBJECTS = mgq.o mgsearch.o mgqueryfilter.o
    5554
    56 MG_OBJECTS = mgq.o mgsearch.o mgqueryfilter.o
     55MGPP_INCLUDES = -I$(INDEXERS_DIR)/mgpp/lib -I$(INDEXERS_DIR)/mgpp/text
     56MGPP_HEADERS = mgppsearch.h mgppqueryfilter.h
     57MGPP_SOURCES = mgppsearch.cpp mgppqueryfilter.cpp
    5758MGPP_OBJECTS = mgppsearch.o mgppqueryfilter.o
    5859
    59 else
    60 MG_INCLUDES = -I$(INDEXERS_DIR)/mgpp/text -I$(INDEXERS_DIR)/mgpp/lib
     60LUCENE_INCLUDES = -I../../packages/expat/include
     61LUCENE_HEADERS = lucenesearch.h lucenequeryfilter.h lucenegdbmsource.h \
     62             expat_resultset.h expat_document.h
     63LUCENE_SOURCES = lucenesearch.cpp lucenequeryfilter.cpp lucenegdbmsource.cpp \
     64             expat_resultset.cpp expat_document.cpp
     65LUCENE_OBJECTS = lucenesearch.o lucenequeryfilter.o lucenegdbmsource.o \
     66             expat_resultset.o expat_document.o
    6167
    62 MG_HEADERS = mgppsearch.h mgppqueryfilter.h
     68# Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist!
     69INCLUDES = -I. -I../.. -I../../lib $(CGI_INCLUDES) \
     70        $(MG_INCLUDES) $(MGPP_INCLUDES) $(LUCENE_INCLUDES) @GDBM_INCLUDE@
    6371
    64 MG_SOURCES = mgppsearch.cpp mgppqueryfilter.cpp
    6572
    66 MG_OBJECTS = mgppsearch.o mgppqueryfilter.o
     73COMPILE = $(CC) -c $(CFLAGS) $(DEFS) $(INCLUDES)
     74LINK = $(CXX) $(LDFLAGS) -o $@
    6775
    68 endif
     76CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
     77CXXLINK = $(CXX) $(LDFLAGS) -o $@
    6978
    70 LC_INCLUDES = -I../../packages/expat/include
    71 LC_HEADERS  = lucenesearch.h   lucenequeryfilter.h   lucenegdbmsource.h \
    72           expat_resultset.h expat_document.h
    7379
    74 LC_SOURCES  = lucenesearch.cpp lucenequeryfilter.cpp lucenegdbmsource.cpp \
    75           expat_resultset.cpp expat_document.cpp
     80# ===========================================================================================
     81#   CORBA SUPPORT
    7682
    77 LC_OBJECTS  = lucenesearch.o   lucenequeryfilter.o   lucenegdbmsource.o \
    78           expat_resultset.o expat_document.o
     83USE_CORBA = @USE_CORBA@
    7984
    80 INCLUDES = -I. -I../.. -I../../lib -I../recpt \
    81         $(CGI_INCLUDES) $(MG_INCLUDES) $(LC_INCLUDES) @GDBM_INCLUDE@
     85MCFLAGS = @CFLAGS@ -Wall -Wunused
     86
    8287MICO_DIR = @MICO_DIR@
    8388ifeq ($(MICO_DIR), default)
    … …  
    95100MINCLUDES = -I. -I../../lib -I../recpt  -I$(INDEXERS_DIR)/mgpp/text $(MICO_INC)
    96101
    97 USE_CORBA = @USE_CORBA@
    98 
    99 RANLIB = @RANLIB@
    100 LDFLAGS = @LDFLAGS@
    101 LIBS = @LIBS@
    102 
    103 GSDLOS = @gsdlos@
    104 
    105 
    106 COMPILE = $(CC) -c $(CFLAGS) $(DEFS) $(INCLUDES)
    107 LINK = $(CXX) $(LDFLAGS) -o $@
    108 
    109 CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
    110 CXXLINK = $(CXX) $(LDFLAGS) -o $@
    111 
    112102MCOMPILE = $(MICO_PATH)mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
    113103MLINK = $(MICO_PATH)mico-ld $(LDFLAGS) -lmico2.2.7 -o $@
     104
     105.SUFFIXES: .mpp .o
     106.mpp.o:
     107    $(MCOMPILE) $<
     108
     109ifneq ($(USE_CORBA), 0)
     110CORBAHEADERS = corbaServer.h
     111CORBASOURCES = corbaServer.mpp
     112CORBAOBJECTS = corbaServer.o ../../lib/corbaiface_skel.o
     113else
     114CORBAHEADERS =
     115CORBASOURCES =
     116CORBAOBJECTS =
     117endif
     118
     119# ===========================================================================================
     120
    114121
    115122.SUFFIXES:
    … …  
    122129    $(CXXCOMPILE) $<
    123130
    124 .SUFFIXES: .mpp .o
    125 .mpp.o:
    126     $(MCOMPILE) $<
    127131
    128 ifneq ($(USE_CORBA), 0)
    129 CORBAHEADERS = \
    130   corbaServer.h
    131 CORBASOURCES = \
    132   corbaServer.mpp
    133 CORBAOBJECTS = \
    134   corbaServer.o ../../lib/corbaiface_skel.o
    135 else
    136 CORBAHEADERS =
    137 CORBASOURCES =
    138 CORBAOBJECTS =
    139 endif
    140 
    141 
    142 # following objects need both mg and mgpp stuff - jrm21
    143 MG_MGPP_OBJECTS=collectset.o
    144 
    145 HEADERS = comtypes.h search.h querycache.h queryinfo.h collectserver.h collectset.h \
    146           colservrconfig.h maptools.h filter.h source.h browsefilter.h \
    147           queryfilter.h mggdbmsource.h gdbmsource.h \
    148       phrasesearch.h phrasequeryfilter.h \
    149       $(MG_HEADERS) $(LC_HEADERS) $(CORBAHEADERS)
     132HEADERS = comtypes.h search.h querycache.h queryinfo.h collectserver.h \
     133          colservrconfig.h maptools.h filter.h source.h \
     134          browsefilter.h queryfilter.h mggdbmsource.h gdbmsource.h \
     135      phrasesearch.h phrasequeryfilter.h collectset.h \
     136      $(MG_HEADERS) $(MGPP_HEADERS) $(LUCENE_HEADERS) $(CORBAHEADERS)
    150137
    151138SOURCES = comtypes.cpp search.cpp querycache.cpp queryinfo.cpp collectserver.cpp \
    … …  
    153140          browsefilter.cpp queryfilter.cpp mggdbmsource.cpp gdbmsource.cpp \
    154141      phrasesearch.cpp phrasequeryfilter.cpp collectset.cpp \
    155       $(MG_SOURCES) $(LC_SOURCES) $(CORBASOURCES)
     142      $(MG_SOURCES) $(MGPP_SOURCES) $(LUCENE_SOURCES) $(CORBASOURCES)
    156143
    157144OBJECTS = comtypes.o search.o querycache.o queryinfo.o collectserver.o \
    158           colservrconfig.o maptools.o filter.o source.o browsefilter.o \
    159           queryfilter.o mggdbmsource.o gdbmsource.o \
    160       phrasesearch.o phrasequeryfilter.o \
    161       $(MG_MGPP_OBJECTS) $(MG_OBJECTS) $(LC_OBJECTS) $(CORBAOBJECTS)
     145          colservrconfig.o maptools.o filter.o source.o \
     146          browsefilter.o queryfilter.o mggdbmsource.o gdbmsource.o \
     147      phrasesearch.o phrasequeryfilter.o collectset.o \
     148      $(MG_OBJECTS) $(MGPP_OBJECTS) $(LUCENE_OBJECTS) $(CORBAOBJECTS)
     149
    162150
    163151all : $(OBJECTS)
    164     $(MAKE) USE_MGPP=1 $(MGPP_OBJECTS)
    165152
    166153distclean:
    167     rm -f $(OBJECTS) Makefile mgppsearch.o mgppqueryfilter.o
     154    rm -f $(OBJECTS) Makefile
    168155clean:
    169     rm -f $(OBJECTS) mgppsearch.o mgppqueryfilter.o
     156    rm -f $(OBJECTS)
    170157
    171158install:
    172159
    173 # needs IndexData.h from mgpp...
    174 $(MG_MGPP_OBJECTS): %.o : %.cpp
    175     $(CXXCOMPILE) -I$(INDEXERS_DIR)/mgpp/text -I$(INDEXERS_DIR)/mgpp/lib -o $@ $<
    176 
    177160depend:
    178161    makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES)
Note: See TracChangeset for help on using the changeset viewer.