Attachment #192540 for bug #267671

View | Details | Raw Unified | Return to bug 267671
Collapse All | Expand All

Lines 22102-22108 Link Here

(-)gdl-0.9rc2-20090312/configure.antlr (-2 / +1 lines)
22102		22102
22103		22103
22104		22104
22105	ac_config_files="$ac_config_files Makefile src/Makefile src/antlr/Makefile"	22105	ac_config_files="$ac_config_files Makefile src/Makefile"
22106		22106
22107		22107
22108	cat >confcache <<\_ACEOF	22108	cat >confcache <<\_ACEOF
Lines 22707-22713 Link Here
22707	"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;	22707	"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
22708	"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;	22708	"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
22709	"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;	22709	"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
22710	"src/antlr/Makefile") CONFIG_FILES="$CONFIG_FILES src/antlr/Makefile" ;;
22711		22710
22712	*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5	22711	*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
22713	echo "$as_me: error: invalid argument: $ac_config_target" >&2;}	22712	echo "$as_me: error: invalid argument: $ac_config_target" >&2;}




libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
@BUILDASLIBRARY_TRUE@libgdl_la_DEPENDENCIES =  \
@BUILDASLIBRARY_TRUE@	-lantlr
am__libgdl_la_SOURCES_DIST = accessdesc.hpp arrayindex.hpp \
	assocdata.cpp assocdata.hpp basegdl.hpp basic_fun_cl.cpp \
	basic_fun_cl.hpp basic_fun.cpp basic_fun.hpp basic_fun_jmg.cpp \

@BUILDASLIBRARY_FALSE@	gdl-gdl.$(OBJEXT)
gdl_OBJECTS = $(am_gdl_OBJECTS)
@BUILDASLIBRARY_FALSE@gdl_DEPENDENCIES =  \
@BUILDASLIBRARY_FALSE@	-lantlr
gdl_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
	--mode=link $(CXXLD) $(gdl_CXXFLAGS) $(CXXFLAGS) \
	$(gdl_LDFLAGS) $(LDFLAGS) -o $@


# set the include path found by configure
INCLUDES = $(EXT_INCLUDES) $(all_includes)
SUBDIRS = antlr
noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp
cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
		basegdl.hpp basic_fun_cl.cpp basic_fun_cl.hpp basic_fun.cpp basic_fun.hpp \

@BUILDASLIBRARY_FALSE@gdl_CXXFLAGS = $(AM_CXXFLAGS)
# the library search path.
@BUILDASLIBRARY_FALSE@gdl_LDFLAGS = $(all_libraries)
@BUILDASLIBRARY_FALSE@gdl_LDADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11

# build as library (for python module)
@BUILDASLIBRARY_TRUE@lib_LTLIBRARIES = libgdl.la

# netCDF and HDF define some same symbols
# hence -z muldefs has to be passed to the linker
@BUILDASLIBRARY_TRUE@@DARWIN_TRUE@libgdl_la_LDFLAGS = $(all_libraries) -Wl,-m
@BUILDASLIBRARY_TRUE@libgdl_la_LIBADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
all: all-recursive

.SUFFIXES:

Return to bug 267671

Lines 55-61 Link Here

(-)gdl-0.9rc2-20090312/src/Makefile.in.antlr (-5 / +4 lines)
55	libLTLIBRARIES_INSTALL = $(INSTALL)	55	libLTLIBRARIES_INSTALL = $(INSTALL)
56	LTLIBRARIES = $(lib_LTLIBRARIES)	56	LTLIBRARIES = $(lib_LTLIBRARIES)
57	@BUILDASLIBRARY_TRUE@libgdl_la_DEPENDENCIES = \	57	@BUILDASLIBRARY_TRUE@libgdl_la_DEPENDENCIES = \
58	@BUILDASLIBRARY_TRUE@ $(top_builddir)/src/antlr/libantlr.la	58	@BUILDASLIBRARY_TRUE@ -lantlr
59	am__libgdl_la_SOURCES_DIST = accessdesc.hpp arrayindex.hpp \	59	am__libgdl_la_SOURCES_DIST = accessdesc.hpp arrayindex.hpp \
60	assocdata.cpp assocdata.hpp basegdl.hpp basic_fun_cl.cpp \	60	assocdata.cpp assocdata.hpp basegdl.hpp basic_fun_cl.cpp \
61	basic_fun_cl.hpp basic_fun.cpp basic_fun.hpp basic_fun_jmg.cpp \	61	basic_fun_cl.hpp basic_fun.cpp basic_fun.hpp basic_fun_jmg.cpp \
Lines 233-239 Link Here
233	@BUILDASLIBRARY_FALSE@ gdl-gdl.$(OBJEXT)	233	@BUILDASLIBRARY_FALSE@ gdl-gdl.$(OBJEXT)
234	gdl_OBJECTS = $(am_gdl_OBJECTS)	234	gdl_OBJECTS = $(am_gdl_OBJECTS)
235	@BUILDASLIBRARY_FALSE@gdl_DEPENDENCIES = \	235	@BUILDASLIBRARY_FALSE@gdl_DEPENDENCIES = \
236	@BUILDASLIBRARY_FALSE@ $(top_builddir)/src/antlr/libantlr.a	236	@BUILDASLIBRARY_FALSE@ -lantlr
237	gdl_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \	237	gdl_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
238	--mode=link $(CXXLD) $(gdl_CXXFLAGS) $(CXXFLAGS) \	238	--mode=link $(CXXLD) $(gdl_CXXFLAGS) $(CXXFLAGS) \
239	$(gdl_LDFLAGS) $(LDFLAGS) -o $@	239	$(gdl_LDFLAGS) $(LDFLAGS) -o $@
Lines 391-397 Link Here
391		391
392	# set the include path found by configure	392	# set the include path found by configure
393	INCLUDES = $(EXT_INCLUDES) $(all_includes)	393	INCLUDES = $(EXT_INCLUDES) $(all_includes)
394	SUBDIRS = antlr
395	noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp	394	noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp
396	cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \	395	cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
397	basegdl.hpp basic_fun_cl.cpp basic_fun_cl.hpp basic_fun.cpp basic_fun.hpp \	396	basegdl.hpp basic_fun_cl.cpp basic_fun_cl.hpp basic_fun.cpp basic_fun.hpp \
Lines 438-444 Link Here
438	@BUILDASLIBRARY_FALSE@gdl_CXXFLAGS = $(AM_CXXFLAGS)	437	@BUILDASLIBRARY_FALSE@gdl_CXXFLAGS = $(AM_CXXFLAGS)
439	# the library search path.	438	# the library search path.
440	@BUILDASLIBRARY_FALSE@gdl_LDFLAGS = $(all_libraries)	439	@BUILDASLIBRARY_FALSE@gdl_LDFLAGS = $(all_libraries)
441	@BUILDASLIBRARY_FALSE@gdl_LDADD = $(top_builddir)/src/antlr/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11	440	@BUILDASLIBRARY_FALSE@gdl_LDADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
442		441
443	# build as library (for python module)	442	# build as library (for python module)
444	@BUILDASLIBRARY_TRUE@lib_LTLIBRARIES = libgdl.la	443	@BUILDASLIBRARY_TRUE@lib_LTLIBRARIES = libgdl.la
Lines 448-454 Link Here
448	# netCDF and HDF define some same symbols	447	# netCDF and HDF define some same symbols
449	# hence -z muldefs has to be passed to the linker	448	# hence -z muldefs has to be passed to the linker
450	@BUILDASLIBRARY_TRUE@@DARWIN_TRUE@libgdl_la_LDFLAGS = $(all_libraries) -Wl,-m	449	@BUILDASLIBRARY_TRUE@@DARWIN_TRUE@libgdl_la_LDFLAGS = $(all_libraries) -Wl,-m
451	@BUILDASLIBRARY_TRUE@libgdl_la_LIBADD = $(top_builddir)/src/antlr/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11	450	@BUILDASLIBRARY_TRUE@libgdl_la_LIBADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
452	all: all-recursive	451	all: all-recursive
453		452
454	.SUFFIXES:	453	.SUFFIXES: