Navigation

← Previous Changeset
Next Changeset →

Changeset 15426

Timestamp:

2008-05-14 10:45:42 (2 months ago)

Author:

mdewsnip

Message:

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

Files:

gsdl/trunk/src/colservr/Makefile.in (modified) (6 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

gsdl/trunk/src/colservr/Makefile.in

r15425	r15426
6	6	# University of Waikato, New Zealand.
7	7	#
8		# Copyright (C) 1999 The New Zealand Digital Library Project
	8	# Copyright (C) 1999-2008 The New Zealand Digital Library Project
9	9	#
10	10	#
…	…
25	25	###########################################################################
26	26
27
28	27	AR = ar
29	28	CC = @CC@
…	…
31	30	CFLAGS = @CFLAGS@
32	31	CXXFLAGS = @CXXFLAGS@
33		~~MCFLAGS = @CFLAGS@ -Wall -Wunused~~
34	32	DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER @DEFS@
	33	LDFLAGS = @LDFLAGS@
	34	LIBS = @LIBS@
	35	RANLIB = @RANLIB@
35	36
36		INDEXERS_DIR=../../indexers
	37	GSDLOS = @gsdlos@
	38
37	39	USE_FASTCGI = @USE_FASTCGI@
38		~~USE_MGPP = @USE_MGPP@~~
39	40	ifneq ($(USE_FASTCGI), 1)
40	41	DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM @DEFS@
41
42	42	CGI_INCLUDES =
43	43	else
44	44	DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DUSE_FASTCGI @DEFS@
45
46	45	CGI_INCLUDES = -I../../packages/fcgi/include
47	46	endif
48	47
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
	48	INDEXERS_DIR = ../../indexers
53	49
54		MG_SOURCES = mgq.c mgsearch.cpp mgqueryfilter.cpp
	50	MG_INCLUDES = -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text
	51	MG_HEADERS = mgq.h mgsearch.h mgqueryfilter.h
	52	MG_SOURCES = mgq.c mgsearch.cpp mgqueryfilter.cpp
	53	MG_OBJECTS = mgq.o mgsearch.o mgqueryfilter.o
55	54
56		MG_OBJECTS = mgq.o mgsearch.o mgqueryfilter.o
	55	MGPP_INCLUDES = -I$(INDEXERS_DIR)/mgpp/lib -I$(INDEXERS_DIR)/mgpp/text
	56	MGPP_HEADERS = mgppsearch.h mgppqueryfilter.h
	57	MGPP_SOURCES = mgppsearch.cpp mgppqueryfilter.cpp
57	58	MGPP_OBJECTS = mgppsearch.o mgppqueryfilter.o
58	59
59		else
60		MG_INCLUDES = -I$(INDEXERS_DIR)/mgpp/text -I$(INDEXERS_DIR)/mgpp/lib
	60	LUCENE_INCLUDES = -I../../packages/expat/include
	61	LUCENE_HEADERS = lucenesearch.h lucenequeryfilter.h lucenegdbmsource.h \
	62	expat_resultset.h expat_document.h
	63	LUCENE_SOURCES = lucenesearch.cpp lucenequeryfilter.cpp lucenegdbmsource.cpp \
	64	expat_resultset.cpp expat_document.cpp
	65	LUCENE_OBJECTS = lucenesearch.o lucenequeryfilter.o lucenegdbmsource.o \
	66	expat_resultset.o expat_document.o
61	67
62		MG_HEADERS = mgppsearch.h mgppqueryfilter.h
	68	# Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist!
	69	INCLUDES = -I. -I../.. -I../../lib $(CGI_INCLUDES) \
	70	$(MG_INCLUDES) $(MGPP_INCLUDES) $(LUCENE_INCLUDES) @GDBM_INCLUDE@
63	71
64		~~MG_SOURCES = mgppsearch.cpp mgppqueryfilter.cpp~~
65	72
66		MG_OBJECTS = mgppsearch.o mgppqueryfilter.o
	73	COMPILE = $(CC) -c $(CFLAGS) $(DEFS) $(INCLUDES)
	74	LINK = $(CXX) $(LDFLAGS) -o $@
67	75
68		endif
	76	CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
	77	CXXLINK = $(CXX) $(LDFLAGS) -o $@
69	78
70		~~LC_INCLUDES = -I../../packages/expat/include~~
71		~~LC_HEADERS = lucenesearch.h lucenequeryfilter.h lucenegdbmsource.h \~~
72		~~expat_resultset.h expat_document.h~~
73	79
74		LC_SOURCES = lucenesearch.cpp lucenequeryfilter.cpp lucenegdbmsource.cpp \
75		expat_resultset.cpp expat_document.cpp
	80	# ===========================================================================================
	81	# CORBA SUPPORT
76	82
77		LC_OBJECTS = lucenesearch.o lucenequeryfilter.o lucenegdbmsource.o \
78		expat_resultset.o expat_document.o
	83	USE_CORBA = @USE_CORBA@
79	84
80		INCLUDES = -I. -I../.. -I../../lib -I../recpt \
81		$(CGI_INCLUDES) $(MG_INCLUDES) $(LC_INCLUDES) @GDBM_INCLUDE@
	85	MCFLAGS = @CFLAGS@ -Wall -Wunused
	86
82	87	MICO_DIR = @MICO_DIR@
83	88	ifeq ($(MICO_DIR), default)
…	…
95	100	MINCLUDES = -I. -I../../lib -I../recpt -I$(INDEXERS_DIR)/mgpp/text $(MICO_INC)
96	101
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
112	102	MCOMPILE = $(MICO_PATH)mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
113	103	MLINK = $(MICO_PATH)mico-ld $(LDFLAGS) -lmico2.2.7 -o $@
	104
	105	.SUFFIXES: .mpp .o
	106	.mpp.o:
	107	$(MCOMPILE) $<
	108
	109	ifneq ($(USE_CORBA), 0)
	110	CORBAHEADERS = corbaServer.h
	111	CORBASOURCES = corbaServer.mpp
	112	CORBAOBJECTS = corbaServer.o ../../lib/corbaiface_skel.o
	113	else
	114	CORBAHEADERS =
	115	CORBASOURCES =
	116	CORBAOBJECTS =
	117	endif
	118
	119	# ===========================================================================================
	120
114	121
115	122	.SUFFIXES:
…	…
122	129	$(CXXCOMPILE) $<
123	130
124		~~.SUFFIXES: .mpp .o~~
125		~~.mpp.o:~~
126		~~$(MCOMPILE) $<~~
127	131
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)
	132	HEADERS = 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)
150	137
151	138	SOURCES = comtypes.cpp search.cpp querycache.cpp queryinfo.cpp collectserver.cpp \
…	…
153	140	browsefilter.cpp queryfilter.cpp mggdbmsource.cpp gdbmsource.cpp \
154	141	phrasesearch.cpp phrasequeryfilter.cpp collectset.cpp \
155		$(MG_SOURCES) $(LC_SOURCES) $(CORBASOURCES)
	142	$(MG_SOURCES) $(MGPP_SOURCES) $(LUCENE_SOURCES) $(CORBASOURCES)
156	143
157	144	OBJECTS = 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
162	150
163	151	all : $(OBJECTS)
164		~~$(MAKE) USE_MGPP=1 $(MGPP_OBJECTS)~~
165	152
166	153	distclean:
167		rm -f $(OBJECTS) Makefile ~~mgppsearch.o mgppqueryfilter.o~~
	154	rm -f $(OBJECTS) Makefile
168	155	clean:
169		rm -f $(OBJECTS) ~~mgppsearch.o mgppqueryfilter.o~~
	156	rm -f $(OBJECTS)
170	157
171	158	install:
172	159
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
177	160	depend:
178	161	makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES)

Navigation

Changeset 15426

Legend:

gsdl/trunk/src/colservr/Makefile.in

Download in other formats: