Mercurial > forge

comparison main/database/src/Makefile.in @ 12718:1af86934c14e octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make compatible with Octaves new exception-based error handling. Retain compatibility with Octaves old error handling based on error_state. * src/error_helpers.[h,cc]: Added. * src/Makefile.in: Integrate error-helpers.[h,cc]. * src/config.h.in: Added. * configure.ac, src/config.h.in: Test presence of 'error_state' and presence of 'verror (octave_execution_exception&, const char *, va_list)'. * src/__pq_connect__.cc, src/command.cc, src/command.h, src/converters.cc, src/converters_arr_comp.cc, src/pq_connection.cc, src/pq_conninfo.cc, src/pq_exec.cc, src/pq_lo.cc, src/pq_update_types.cc: If necessary, include error-helpers.h, replace error() with c_verror(), set and check a different error indicator than error_state, use CHECK_ERROR or SET_ERR, explicitely check for errors instead of relying on Octave checking error_state when returning to the prompt.
author i7tiol
date Sat, 27 Feb 2016 11:11:04 +0000
parents 67adec29dee0
children 65172e6662d6
comparison
equal deleted inserted replaced
12717:87989220360f 12718:1af86934c14e
6 EXTRALIBS = -lws2_32 6 EXTRALIBS = -lws2_32
7 endif 7 endif
8 8
9 ifndef CXXFLAGS 9 ifndef CXXFLAGS
10 CXXFLAGS_NSA := "-g -O2 -fno-strict-aliasing" 10 CXXFLAGS_NSA := "-g -O2 -fno-strict-aliasing"
11 CXXFLAGS := "-g -O2"
11 else 12 else
12 CXXFLAGS_NSA := "$(CXXFLAGS) -fno-strict-aliasing" 13 CXXFLAGS_NSA := "$(CXXFLAGS) -fno-strict-aliasing"
13 endif 14 endif
14 15
15 OBJECTS := __pq_connect__.o pq_close.o pq_exec.o converters.o \ 16 OBJECTS := __pq_connect__.o pq_close.o pq_exec.o converters.o \
16 converters_arr_comp.o pq_connection.o command.o \ 17 converters_arr_comp.o pq_connection.o command.o \
17 pq_update_types.o pq_lo.o pq_conninfo.o __pq_internal_exit__.o 18 pq_update_types.o pq_lo.o pq_conninfo.o __pq_internal_exit__.o \
19 error-helpers.o
18 20
19 pq_interface.oct: $(OBJECTS) 21 pq_interface.oct: $(OBJECTS)
20 @MKOCTFILE@ -o pq_interface.oct -L`@PG_CONFIG@ --libdir` -lpq $(OBJECTS) $(EXTRALIBS) 22 @MKOCTFILE@ -o pq_interface.oct -L`@PG_CONFIG@ --libdir` -lpq $(OBJECTS) $(EXTRALIBS)
21 23
22 converters.o: converters.cc converters.h wrap_endian.h 24 converters.o: converters.cc converters.h wrap_endian.h config.h error-helpers.h
23 CXX=$(CXX) CXXFLAGS=$(CXXFLAGS_NSA) @MKOCTFILE@ -I`@PG_CONFIG@ --includedir` -c converters.cc 25 CXX=$(CXX) CXXFLAGS=$(CXXFLAGS_NSA) @MKOCTFILE@ -I`@PG_CONFIG@ --includedir` -c converters.cc
24 26
25 converters_arr_comp.o: converters_arr_comp.cc converters.h wrap_endian.h \ 27 converters_arr_comp.o: converters_arr_comp.cc converters.h wrap_endian.h \
26 pq_connection.h command.h 28 pq_connection.h command.h config.h error-helpers.h
27 CXX=$(CXX) CXXFLAGS=$(CXXFLAGS_NSA) @MKOCTFILE@ -I`@PG_CONFIG@ --includedir` -c converters_arr_comp.cc 29 CXX=$(CXX) CXXFLAGS=$(CXXFLAGS_NSA) @MKOCTFILE@ -I`@PG_CONFIG@ --includedir` -c converters_arr_comp.cc
28 30
29 # be on the safe side with respect to include files 31 # be on the safe side with respect to include files
30 %.o: %.cc converters.h pq_connection.h command.h 32 %.o: %.cc converters.h pq_connection.h command.h config.h error-helpers.h
31 CXX=$(CXX) @MKOCTFILE@ -I`@PG_CONFIG@ --includedir` -c $< 33 CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) @MKOCTFILE@ -I`@PG_CONFIG@ --includedir` -c $<
32 34
33 .PHONY: clean 35 .PHONY: clean
34 clean: ; rm -f *.o *.oct 36 clean: ; rm -f *.o *.oct