Modified:
branches/guffert/driver/Makefile.am
branches/guffert/installer/Makefile.am
branches/guffert/setup/Makefile.am
branches/guffert/util/Makefile.am
Log:
Added -I(top_srcdir) to includes, to let all find "MYODBC_*.h" without
using relative path inside source files.
Modified: branches/guffert/driver/Makefile.am
===================================================================
--- branches/guffert/driver/Makefile.am 2007-11-07 01:50:53 UTC (rev 836)
+++ branches/guffert/driver/Makefile.am 2007-11-07 10:23:54 UTC (rev 837)
@@ -28,7 +28,7 @@
lib_LTLIBRARIES=libmyodbc5.la $(TS_DRIVER)
-INCLUDES=-I../util
+INCLUDES=-I$(top_srcdir)/util -I$(top_srcdir)
###################################################################
# #
Modified: branches/guffert/installer/Makefile.am
===================================================================
--- branches/guffert/installer/Makefile.am 2007-11-07 01:50:53 UTC (rev 836)
+++ branches/guffert/installer/Makefile.am 2007-11-07 10:23:54 UTC (rev 837)
@@ -18,6 +18,8 @@
if MYODBCINST
+INCLUDES = -I$(top_srcdir)
+
bin_PROGRAMS = myodbc3i
myodbc3i_SOURCES = myodbc3i.c
myodbc3i_LDADD = ../util/libmyodbc3u.la @LTDL_LIB@
Modified: branches/guffert/setup/Makefile.am
===================================================================
--- branches/guffert/setup/Makefile.am 2007-11-07 01:50:53 UTC (rev 836)
+++ branches/guffert/setup/Makefile.am 2007-11-07 10:23:54 UTC (rev 837)
@@ -108,8 +108,7 @@
# #
###################################################################
-# INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\"
-DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
-INCLUDES = -I@top_srcdir@/include $(QT_CXXFLAGS) -DSYSTEM_FILE_PATH=\"@sysconfdir@\"
-DDEFLIB_PATH=\"@libdir@\" $(LTDLINCL)
+INCLUDES = -I$(top_srcdir) $(QT_CXXFLAGS) -DSYSTEM_FILE_PATH=\"$(sysconfdir)\"
-DDEFLIB_PATH=\"$(libdir)\" $(LTDLINCL)
libmyodbc3S_la_LDFLAGS = \
-export-dynamic \
@@ -117,14 +116,11 @@
-release @NUMERIC_VERSION@ \
-module
-# libmyodbc3S_la_LIBADD = @QT_LDFLAGS@ @LIB_QT@ ../util/libmyodbc3u.la
libmyodbc3S_la_LIBADD = $(QT_LDFLAGS) $(QT_LIBS) $(EXTRA_XLIBS) \
../util/libmyodbc3u.la
libmyodbc3S_la_DEPENDENCIES = ../util/libmyodbc3u.la
-# LDFLAGS=@EXTRA_LDFLAGS@
-
###################################################################
# #
# More files to include in source distro. #
Modified: branches/guffert/util/Makefile.am
===================================================================
--- branches/guffert/util/Makefile.am 2007-11-07 01:50:53 UTC (rev 836)
+++ branches/guffert/util/Makefile.am 2007-11-07 10:23:54 UTC (rev 837)
@@ -1,3 +1,5 @@
+INCLUDES = -I$(top_srcdir)
+
noinst_LTLIBRARIES = libmyodbc3u.la
# base source list
| Thread |
|---|
| • Connector/ODBC 3.51 commit: r837 - in branches/guffert: driver installer setup util | kboortz | 7 Nov |
