Changeset 24958 for main/trunk/greenstone2/runtime-src/src
- Timestamp:
- 2012-01-20T16:22:35+13:00 (12 years ago)
- Location:
- main/trunk/greenstone2/runtime-src/src/recpt
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in
r24901 r24958 117 117 endif 118 118 119 USE_RSS = @USE_RSS@ 120 ifeq ($(USE_RSS), 1) 121 RSS_DEFINES = -DUSE_RSS 122 RSS_SOURCES = rssaction.cpp 123 RSS_OBJECTS = rssaction.o 124 else 125 RSS_DEFINES = 126 RSS_SOURCES = 127 RSS_OBJECTS = 128 endif 129 119 130 120 131 USE_Z3950 = @USE_Z3950@ … … 155 166 CXX = @CXX@ 156 167 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ 157 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $( GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(Z3950_DEFS)168 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $(RSS_DEFINES) $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(Z3950_DEFS) 158 169 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib \ 159 170 -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \ … … 211 222 querytools.cpp \ 212 223 receptionist.cpp \ 224 $(RSS_SOURCES) \ 213 225 statusaction.cpp \ 214 226 summarise.cpp \ … … 258 270 querytools.o \ 259 271 receptionist.o \ 272 $(RSS_OBJECTS) \ 260 273 statusaction.o \ 261 274 summarise.o \ -
main/trunk/greenstone2/runtime-src/src/recpt/cgiwrapper.cpp
r23389 r24958 72 72 #endif 73 73 74 #if defined(USE_RSS) 75 #include "rssaction.h" 76 #endif 77 74 78 #include "tipaction.h" 75 79 #include "statusaction.h" … … 531 535 #endif 532 536 537 #if defined(USE_RSS) 538 rssaction *arssaction = new rssaction(); 539 recpt.add_action (arssaction); 540 #endif 541 533 542 queryaction *aqueryaction = new queryaction(); 534 543 aqueryaction->set_receptionist (&recpt); -
main/trunk/greenstone2/runtime-src/src/recpt/win32.mak
r24902 r24958 45 45 DLLDEBUG = 0 46 46 ENABLE_ACCENTFOLD = 1 47 USE_RSS = 1 47 48 USE_GDBM = 1 48 49 USE_JDBM = 1 … … 79 80 !ELSE 80 81 ACCENTFOLD_LIBS = 82 !ENDIF 83 84 !IF $(USE_RSS) 85 RSS_DEFINES = -DUSE_RSS 86 RSS_SOURCES = rssaction.cpp 87 RSS_OBJECTS = rssaction.obj 88 !ELSE 89 RSS_DEFINES = 90 RSS_SOURCES = 91 RSS_OBJECTS = 81 92 !ENDIF 82 93 … … 187 198 CC = cl 188 199 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 189 -DGSDL_NOCACHE$(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \200 -DGSDL_NOCACHE $(RSS_DEFINES) $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \ 190 201 $(Z3950_DEFS) $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 191 202 INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \ … … 205 216 !ENDIF 206 217 218 CXXFLAGS = $(CXXFLAGS) -DDOCHANDLE 207 219 208 220 COMPILE = $(CC) -nologo -c $(CXXFLAGS) $(DEFS) $(INCLUDES) … … 263 275 querytools.cpp \ 264 276 receptionist.cpp \ 277 $(RSS_SOURCES) \ 265 278 statusaction.cpp \ 266 279 $(SQL_SOURCES) \ … … 311 324 querytools.obj \ 312 325 receptionist.obj \ 326 $(RSS_OBJECTS) \ 313 327 statusaction.obj \ 314 328 $(SQL_OBJECTS) \
Note:
See TracChangeset
for help on using the changeset viewer.