|
Orion Poplawski |
eb537a0 |
diff -up gdl-0.9.1/configure.in.antlr-auto gdl-0.9.1/configure.in
|
|
Orion Poplawski |
eb537a0 |
--- gdl-0.9.1/configure.in.antlr-auto 2011-10-25 16:29:31.908423227 -0600
|
|
Orion Poplawski |
eb537a0 |
+++ gdl-0.9.1/configure.in 2011-10-25 16:29:32.705394481 -0600
|
|
Orion Poplawski |
eb537a0 |
@@ -1108,7 +1108,7 @@ dnl AC_CHECK_FUNCS(strdup strtod strtol
|
|
Orion Poplawski |
eb537a0 |
dnl perform program name transformation
|
|
Orion Poplawski |
eb537a0 |
dnl AC_ARG_PROGRAM
|
|
Orion Poplawski |
eb537a0 |
|
|
Orion Poplawski |
eb537a0 |
-AC_CONFIG_FILES(Makefile src/Makefile src/antlr/Makefile src/pro/Makefile src/pro/dicom/Makefile testsuite/Makefile doc/Makefile)
|
|
Orion Poplawski |
eb537a0 |
+AC_CONFIG_FILES(Makefile src/Makefile src/pro/Makefile src/pro/dicom/Makefile testsuite/Makefile doc/Makefile)
|
|
Orion Poplawski |
eb537a0 |
AC_OUTPUT
|
|
Orion Poplawski |
eb537a0 |
|
|
Orion Poplawski |
eb537a0 |
dnl == summary table =======================================
|
|
Orion Poplawski |
eb537a0 |
diff -up gdl-0.9.1/src/Makefile.am.antlr-auto gdl-0.9.1/src/Makefile.am
|
|
Orion Poplawski |
eb537a0 |
--- gdl-0.9.1/src/Makefile.am.antlr-auto 2011-10-25 16:29:32.521401116 -0600
|
|
Orion Poplawski |
eb537a0 |
+++ gdl-0.9.1/src/Makefile.am 2011-10-25 16:29:59.176439745 -0600
|
|
Orion Poplawski |
eb537a0 |
@@ -1,6 +1,6 @@
|
|
Orion Poplawski |
eb537a0 |
# set the include path found by configure
|
|
Orion Poplawski |
eb537a0 |
INCLUDES = $(EXT_INCLUDES) $(all_includes)
|
|
Orion Poplawski |
eb537a0 |
-SUBDIRS = antlr pro
|
|
Orion Poplawski |
eb537a0 |
+SUBDIRS = pro
|
|
Orion Poplawski |
eb537a0 |
|
|
Orion Poplawski |
eb537a0 |
cpp_hpp_files = allix.hpp allix.cpp prognode.hpp prognodeexpr.hpp \
|
|
Orion Poplawski |
eb537a0 |
accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
|
|
Orion Poplawski |
eb537a0 |
@@ -61,7 +61,7 @@ gdl_SOURCES = $(cpp_hpp_files) gdl.cpp l
|
|
Orion Poplawski |
eb537a0 |
gdl_CXXFLAGS = $(AM_CXXFLAGS)
|
|
Orion Poplawski |
eb537a0 |
# the library search path.
|
|
Orion Poplawski |
eb537a0 |
gdl_LDFLAGS = $(all_libraries)
|
|
Orion Poplawski |
eb537a0 |
-gdl_LDADD = $(top_builddir)/src/antlr/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
|
|
Orion Poplawski |
eb537a0 |
+gdl_LDADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
|
|
Orion Poplawski |
eb537a0 |
endif
|
|
Orion Poplawski |
eb537a0 |
|
|
Orion Poplawski |
eb537a0 |
# build as library (for python module)
|
|
Orion Poplawski |
eb537a0 |
@@ -77,6 +77,6 @@ else
|
|
Orion Poplawski |
eb537a0 |
libgdl_la_LDFLAGS = $(all_libraries) -Wl,-z,muldefs
|
|
Orion Poplawski |
eb537a0 |
endif
|
|
Orion Poplawski |
eb537a0 |
|
|
Orion Poplawski |
eb537a0 |
-libgdl_la_LIBADD = $(top_builddir)/src/antlr/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
|
|
Orion Poplawski |
eb537a0 |
+libgdl_la_LIBADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
|
|
Orion Poplawski |
eb537a0 |
endif
|
|
Orion Poplawski |
eb537a0 |
|