Changeset 28760 for main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in

Timestamp:

2013-12-13T13:22:44+13:00 (10 years ago)

Author:

ak19

Message:

Adding in the first working version of the formatconverter program which uses formattools to convert GS2 statements to GS3. Not all the GS2 terms have GS3 equivalents yet and the current ones still need to be run by Dr Bainbridge, but nested IFs and ORs seem to work alright in general. Kathy made the important changes to Makefile.in to get the new formatconverter.cpp to compile. formatconverter.cpp uses the new GS2-to-GS3 specific functions added to formattools.cpp

File:

• main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in (modified) (3 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in

@@ -206 +206 @@
     extlinkaction.cpp \
     formattools.cpp \
+    formatconverter.cpp \
     gtiaction.cpp \
     highlighttext.cpp \
@@ -284 +285 @@
     wizardaction.o 
 
+CONVERTER_OBJECTS = \
+    cgiargs.o \
+    cgiutils.o \
+    formattools.o \
+    formatconverter.o \
+    summarise.o
+
 LIBRARY = gsdlrecpt.a
 
@@ -301 +309 @@
 
 # Default target: make both gsdlrecpt.a and the library executable
-all: $(LIBRARY) $(EXECUTABLE) $(APACHE_MODULE)
+all: $(LIBRARY) $(EXECUTABLE) $(APACHE_MODULE) formatconverter
+
+formatconverter: $(CONVERTER_OBJECTS)
+    $(CXXLINK) $(CONVERTER_OBJECTS) $(COMMON_DIR)/src/lib/gsdllib.a $(PROTOCOL_DIR)/gsdlprotocol.a $(COLSERVR_DIR)/gsdlcolservr.a
 
 gsdlrecpt.a: $(OBJECTS)