Blame gdl-0.9rc2-20090504-antlr-auto.patch
|
 |
de15039 |
--- gdl-0.9rc2-20090504/configure.in.antlr-auto 2009-04-30 16:07:55.000000000 -0600
|
|
|
de15039 |
+++ gdl-0.9rc2-20090504/configure.in 2009-05-04 16:17:25.000000000 -0600
|
|
|
de15039 |
@@ -842,7 +842,7 @@
|
|
|
de15039 |
dnl perform program name transformation
|
|
|
de15039 |
dnl AC_ARG_PROGRAM
|
|
|
de15039 |
|
|
|
de15039 |
-AC_CONFIG_FILES(Makefile src/Makefile src/antlr/Makefile)
|
|
|
de15039 |
+AC_CONFIG_FILES(Makefile src/Makefile)
|
|
|
de15039 |
|
|
|
de15039 |
AC_OUTPUT
|
|
|
de15039 |
|
|
|
de15039 |
--- gdl-0.9rc2-20090504/src/Makefile.am.antlr-auto 2009-03-03 16:32:14.000000000 -0700
|
|
|
de15039 |
+++ gdl-0.9rc2-20090504/src/Makefile.am 2009-05-04 16:17:18.000000000 -0600
|
|
|
de15039 |
@@ -1,6 +1,5 @@
|
|
|
de15039 |
# set the include path found by configure
|
|
|
de15039 |
INCLUDES = $(EXT_INCLUDES) $(all_includes)
|
|
|
de15039 |
-SUBDIRS = antlr
|
|
|
de15039 |
noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp
|
|
|
de15039 |
|
|
|
de15039 |
cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
|
|
|
de15039 |
@@ -53,7 +52,7 @@
|
|
|
de15039 |
gdl_CXXFLAGS = $(AM_CXXFLAGS)
|
|
|
de15039 |
# the library search path.
|
|
|
de15039 |
gdl_LDFLAGS = $(all_libraries)
|
|
|
de15039 |
-gdl_LDADD = $(top_builddir)/src/antlr/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
|
|
|
de15039 |
+gdl_LDADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
|
|
|
de15039 |
endif
|
|
|
de15039 |
|
|
|
de15039 |
# build as library (for python module)
|
|
|
de15039 |
@@ -69,6 +68,6 @@
|
|
|
de15039 |
libgdl_la_LDFLAGS = $(all_libraries) -Wl,-z,muldefs
|
|
|
de15039 |
endif
|
|
|
de15039 |
|
|
|
de15039 |
-libgdl_la_LIBADD = $(top_builddir)/src/antlr/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
|
|
|
de15039 |
+libgdl_la_LIBADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
|
|
|
de15039 |
endif
|
|
|
de15039 |
|