Changeset 15460


Ignore:
Timestamp:
2008-05-15T11:28:48+12:00 (16 years ago)
Author:
mdewsnip
Message:

Big tidy up of Makefile.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r15459 r15460  
    3030
    3131CC = @CC@
    32 CXX = @CXX@
     32CPP = @CXX@
    3333CFLAGS = @CFLAGS@
    34 CXXFLAGS = @CXXFLAGS@
    35 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER @DEFS@
    36 
    37 INDEXERS_DIR = ../../indexers
    38 
    39 MG_INCLUDES = -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text
    40 MG_HEADERS = mgq.h mgsearch.h mgqueryfilter.h
    41 MG_SOURCES = mgq.c mgsearch.cpp mgqueryfilter.cpp
    42 MG_OBJECTS = mgq.o mgsearch.o mgqueryfilter.o
    43 
    44 MGPP_INCLUDES = -I$(INDEXERS_DIR)/mgpp/lib -I$(INDEXERS_DIR)/mgpp/text
    45 MGPP_HEADERS = mgppsearch.h mgppqueryfilter.h
    46 MGPP_SOURCES = mgppsearch.cpp mgppqueryfilter.cpp
    47 MGPP_OBJECTS = mgppsearch.o mgppqueryfilter.o
    48 
    49 LUCENE_INCLUDES = -I../../packages/expat/include
    50 LUCENE_HEADERS = lucenesearch.h lucenequeryfilter.h lucenegdbmsource.h \
    51              expat_resultset.h expat_document.h
    52 LUCENE_SOURCES = lucenesearch.cpp lucenequeryfilter.cpp lucenegdbmsource.cpp \
    53              expat_resultset.cpp expat_document.cpp
    54 LUCENE_OBJECTS = lucenesearch.o lucenequeryfilter.o lucenegdbmsource.o \
    55              expat_resultset.o expat_document.o
    56 
     34CPPFLAGS = @CXXFLAGS@
     35DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER
    5736# Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist!
    58 INCLUDES = -I. -I../.. -I../../lib \
    59         $(MG_INCLUDES) $(MGPP_INCLUDES) $(LUCENE_INCLUDES) @GDBM_INCLUDE@
     37INCLUDES = -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/lib \
     38    -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text \
     39    -I$(INDEXERS_DIR)/mgpp/lib -I$(INDEXERS_DIR)/mgpp/text \
     40    -I../../packages/expat/include
    6041
    6142
    6243COMPILE = $(CC) -c $(CFLAGS) $(DEFS) $(INCLUDES)
    63 CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
     44CPPCOMPILE = $(CPP) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
    6445
    6546
    … …  
    7152.SUFFIXES: .cpp .o
    7253.cpp.o:
    73     $(CXXCOMPILE) $<
     54    $(CPPCOMPILE) $<
    7455
    7556
    76 HEADERS = comtypes.h search.h querycache.h queryinfo.h collectserver.h \
    77           colservrconfig.h maptools.h filter.h source.h \
    78           browsefilter.h queryfilter.h mggdbmsource.h gdbmsource.h \
    79       phrasesearch.h phrasequeryfilter.h collectset.h \
    80       $(MG_HEADERS) $(MGPP_HEADERS) $(LUCENE_HEADERS) $(CORBAHEADERS)
     57SOURCES = \
     58        browsefilter.cpp \
     59    collectserver.cpp \
     60    collectset.cpp \
     61        colservrconfig.cpp \
     62    comtypes.cpp \
     63    expat_document.cpp \
     64    expat_resultset.cpp \
     65    filter.cpp \
     66    gdbmsource.cpp \
     67    lucenegdbmsource.cpp \
     68    lucenequeryfilter.cpp \
     69    lucenesearch.cpp \
     70    maptools.cpp \
     71    mggdbmsource.cpp \
     72    mgq.c \
     73    mgqueryfilter.cpp \
     74    mgsearch.cpp \
     75    mgppqueryfilter.cpp \
     76    mgppsearch.cpp \
     77    phrasequeryfilter.cpp \
     78    phrasesearch.cpp \
     79    querycache.cpp \
     80    queryfilter.cpp \
     81    queryinfo.cpp \
     82    search.cpp \
     83    source.cpp
    8184
    82 SOURCES = comtypes.cpp search.cpp querycache.cpp queryinfo.cpp collectserver.cpp \
    83           colservrconfig.cpp maptools.cpp filter.cpp source.cpp \
    84           browsefilter.cpp queryfilter.cpp mggdbmsource.cpp gdbmsource.cpp \
    85       phrasesearch.cpp phrasequeryfilter.cpp collectset.cpp \
    86       $(MG_SOURCES) $(MGPP_SOURCES) $(LUCENE_SOURCES) $(CORBASOURCES)
    87 
    88 OBJECTS = comtypes.o search.o querycache.o queryinfo.o collectserver.o \
    89           colservrconfig.o maptools.o filter.o source.o \
    90           browsefilter.o queryfilter.o mggdbmsource.o gdbmsource.o \
    91       phrasesearch.o phrasequeryfilter.o collectset.o \
    92       $(MG_OBJECTS) $(MGPP_OBJECTS) $(LUCENE_OBJECTS) $(CORBAOBJECTS)
     85OBJECTS = \
     86        browsefilter.o \
     87    collectserver.o \
     88    collectset.o \
     89        colservrconfig.o \
     90    comtypes.o \
     91    expat_document.o \
     92    expat_resultset.o \
     93    filter.o \
     94    gdbmsource.o \
     95    lucenegdbmsource.o \
     96    lucenequeryfilter.o \
     97    lucenesearch.o \
     98    maptools.o \
     99    mggdbmsource.o \
     100    mgq.o \
     101    mgqueryfilter.o \
     102    mgsearch.o \
     103    mgppqueryfilter.o \
     104    mgppsearch.o \
     105    phrasequeryfilter.o \
     106    phrasesearch.o \
     107    querycache.o \
     108    queryfilter.o \
     109    queryinfo.o \
     110    search.o \
     111    source.o
    93112
    94113
    95114all: $(OBJECTS)
    96115
     116install:
     117
    97118distclean:
    98119    rm -f $(OBJECTS) Makefile
     120
    99121clean:
    100122    rm -f $(OBJECTS)
    101123
    102 install:
    103 
    104124depend:
    105     makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES)
     125    makedepend -Y -- $(DEFS) $(INCLUDES) $(CPPFLAGS) -- $(SOURCES)
Note: See TracChangeset for help on using the changeset viewer.