Modified:
MYODBCDbg/MYODBCDbgLib/Makefile.am
MYODBCDbg/Makefile.am
Makefile.am
myodbc3/Makefile.am
myodbc3S/Makefile.am
myodbc3c/Makefile.am
myodbc3i/Makefile.am
myodbc3m/Makefile.am
myodbc3u/Makefile.am
scripts/Makefile.am
test/Makefile.am
Log:
Corrected "make dist" to match new directory structure
Modified: MYODBCDbg/MYODBCDbgLib/Makefile.am
===================================================================
--- MYODBCDbg/MYODBCDbgLib/Makefile.am 2006-07-27 10:13:51 UTC (rev 59)
+++ MYODBCDbg/MYODBCDbgLib/Makefile.am 2006-08-06 13:30:24 UTC (rev 60)
@@ -7,9 +7,9 @@
MYODBCDbgDiagFieldString.c \
MYODBCDbgEnvAttrString.c \
MYODBCDbgFunctionsString.c \
+ MYODBCDbgGetFileDefault.c \
MYODBCDbgHandleTypeString.c \
MYODBCDbgInfoTypeString.c \
- MYODBCDbgInit.c \
MYODBCDbgPosTypeString.c \
MYODBCDbgReturnString.c \
MYODBCDbgStmtAttrString.c \
@@ -18,5 +18,5 @@
MYODBCDbgTransactionTypeString.c
EXTRA_DIST = \
+ MYODBCDbgLib.vpj \
MYODBCDbgLib.pro
-
Modified: MYODBCDbg/Makefile.am
===================================================================
--- MYODBCDbg/Makefile.am 2006-07-27 10:13:51 UTC (rev 59)
+++ MYODBCDbg/Makefile.am 2006-08-06 13:30:24 UTC (rev 60)
@@ -1,2 +1,6 @@
SUBDIRS = MYODBCDbgLib
+EXTRA_DIST = \
+ MYODBCDbg.vpj \
+ MYODBCDbg.pro
+
Modified: Makefile.am
===================================================================
--- Makefile.am 2006-07-27 10:13:51 UTC (rev 59)
+++ Makefile.am 2006-08-06 13:30:24 UTC (rev 60)
@@ -46,6 +46,18 @@
@myodbc_test_dir@ \
scripts
+DIST_SUBDIRS = \
+ MYODBCDbg \
+ myodbc3u \
+ myodbc3 \
+ myodbc3S \
+ myodbc3c \
+ myodbc3i \
+ myodbc3m \
+ samples \
+ test \
+ scripts
+
#
# Create the binary distribution
#
@@ -83,23 +95,50 @@
snapshot:
$(MAKE) dist distdir=mysql-connector-odbc-@myodbc_version@-`date +"%Y%m%d"`
+# Note that directories will be copied recursively
EXTRA_DIST = \
ChangeLog \
COPYING \
+ LICENSE.gpl \
+ LICENSE.exceptions \
EXCEPTIONS \
README \
+ README.debug \
INSTALL \
+ INSTALL.win \
BUILD.unix \
BUILD.osx \
- acconfig.h \
+ BUILD.win \
root.pro \
- MYODBCDbg/MYODBCDbg.pro \
+ common.pri \
config.pri \
defines.pri \
mysql.pri \
odbc.pri \
resource.h \
VersionInfo.h \
- dltest/dltest.c \
- dltest/dltest.pro
+ mysql.bmp \
+ Build.sh \
+ Build.bat \
+ CreateMakefiles.sh \
+ CreateBinaryMsi.bat \
+ CreateBinaryZip.bat \
+ CreateMakefiles.bat \
+ CreateSourceZip.bat \
+ CreateVisualStudioProjects.bat \
+ connector-odbc3.vpj \
+ connector-odbc3.vpw \
+ RemoveMakefiles.sh \
+ Install.bat \
+ PostBuildTest.bat \
+ Uninstall.bat \
+ Upgrade.bat \
+ dltest \
+ doc \
+ MYODBCBrw \
+ MYODBCCls \
+ MYQTODBCCls
+# Remove Subversion ".svn" subdirectories from source distribution
+dist-hook:
+ rm -rf `find $(distdir) -type d -name .svn -print`
Modified: myodbc3/Makefile.am
===================================================================
--- myodbc3/Makefile.am 2006-07-27 10:13:51 UTC (rev 59)
+++ myodbc3/Makefile.am 2006-08-06 13:30:24 UTC (rev 60)
@@ -74,10 +74,7 @@
EXTRA_DIST = error.h \
myutil.h \
- myodbc3.pro
-
-
-
-
-
-
+ myodbc3.vpj \
+ myodbc3.pro \
+ myodbc3.def \
+ myodbc3.rc
Modified: myodbc3S/Makefile.am
===================================================================
--- myodbc3S/Makefile.am 2006-07-27 10:13:51 UTC (rev 59)
+++ myodbc3S/Makefile.am 2006-08-06 13:30:24 UTC (rev 60)
@@ -24,8 +24,10 @@
AUTOMAKE_OPTIONS=foreign
if QT
-
lib_LTLIBRARIES = libmyodbc3S.la
+else
+lib_LTLIBRARIES =
+endif
###################################################################
# #
@@ -54,7 +56,9 @@
MYODBCSetupDriverConnect.c \
MYODBCSetupDriverConnectPrompt.cpp \
MYODBCSetupHandleInstallerError.c \
- MYODBCSetupLineEdit.cpp \
+ MYODBCSetupLineEdit.cpp
+
+nodist_libmyodbc3S_la_SOURCES = \
mMYODBCSetupAssistText.cpp \
mMYODBCSetupCheckBox.cpp \
mMYODBCSetupComboBox.cpp \
@@ -118,8 +122,8 @@
INCLUDES = -I@top_srcdir@/include $(QT_CXXFLAGS) -DSYSTEM_FILE_PATH=\"@sysconfdir@\"
-DDEFLIB_PATH=\"@libdir@\" $(LTDLINCL)
libmyodbc3S_la_LDFLAGS = \
- -export-dynamic \
- -export-symbols @srcdir@/myodbc3S.export \
+ -export-dynamic \
+ -export-symbols @srcdir@/myodbc3S.export \
-release @myodbc_version@ \
-module
@@ -130,8 +134,6 @@
# LDFLAGS=@EXTRA_LDFLAGS@
-endif
-
###################################################################
# #
# More files to include in source distro. #
@@ -158,6 +160,7 @@
SideImage.xpm \
TopImage.xpm \
MySQL-16.xpm \
- myodbc3S.pro
-
-
+ myodbc3S.vpj \
+ myodbc3S.pro \
+ myodbc3S.rc \
+ MYODBCSetupWriteConnectStr.c
Modified: myodbc3c/Makefile.am
===================================================================
--- myodbc3c/Makefile.am 2006-07-27 10:13:51 UTC (rev 59)
+++ myodbc3c/Makefile.am 2006-08-06 13:30:24 UTC (rev 60)
@@ -26,5 +26,6 @@
EXTRA_DIST = \
main.cpp \
myodbc3c.icns \
- myodbc3c.pro
+ myodbc3c.pro \
+ myodbc3c.vpj
Modified: myodbc3i/Makefile.am
===================================================================
--- myodbc3i/Makefile.am 2006-07-27 10:13:51 UTC (rev 59)
+++ myodbc3i/Makefile.am 2006-08-06 13:30:24 UTC (rev 60)
@@ -34,5 +34,5 @@
###################################################################
EXTRA_DIST = \
+ myodbc3i.vpj \
myodbc3i.pro
-
Modified: myodbc3m/Makefile.am
===================================================================
--- myodbc3m/Makefile.am 2006-07-27 10:13:51 UTC (rev 59)
+++ myodbc3m/Makefile.am 2006-08-06 13:30:24 UTC (rev 60)
@@ -25,5 +25,5 @@
EXTRA_DIST = \
myodbc3m.h \
+ myodbc3m.vpj \
myodbc3m.pro
-
Modified: myodbc3u/Makefile.am
===================================================================
--- myodbc3u/Makefile.am 2006-07-27 10:13:51 UTC (rev 59)
+++ myodbc3u/Makefile.am 2006-08-06 13:30:24 UTC (rev 60)
@@ -24,5 +24,5 @@
MYODBCUtilWriteDriver.c
EXTRA_DIST = \
+ myodbc3u.vpj \
myodbc3u.pro
-
Modified: scripts/Makefile.am
===================================================================
--- scripts/Makefile.am 2006-07-27 10:13:51 UTC (rev 59)
+++ scripts/Makefile.am 2006-08-06 13:30:24 UTC (rev 60)
@@ -57,7 +57,8 @@
EXTRA_DIST = make_binary_distribution.sh \
myodbc3.spec.sh \
- makerpm.sh
+ makerpm.sh \
+ scripts.vpj
# Don't update the files from bitkeeper
%::SCCS/s.%
Modified: test/Makefile.am
===================================================================
--- test/Makefile.am 2006-07-27 10:13:51 UTC (rev 59)
+++ test/Makefile.am 2006-08-06 13:30:24 UTC (rev 60)
@@ -26,7 +26,7 @@
my_catalog \
my_error \
my_use_result \
-db_test \
+dbtest \
mytest \
mytest2 \
mytest3 \
@@ -36,9 +36,35 @@
# COMPILATION SPECIFICATION
#
-INCLUDES= -I. -I../include
-AM_LDFLAGS= @myodbc_test_linklib@
+INCLUDES= -I$(top_srcdir)/test/include
+AM_LDFLAGS= @myodbc_test_linklib@
+my_connect_SOURCES= connect/my_connect.c
+my_basics_SOURCES= basics/my_basics.c
+my_param_SOURCES= param/my_param.c
+my_result_SOURCES= result/my_result.c
+my_tran_SOURCES= tran/my_tran.c
+my_cursor_SOURCES= cursor/my_cursor.c
+my_position_SOURCES= position/my_position.c
+my_relative_SOURCES= relative/my_relative.c
+my_scroll_SOURCES= scroll/my_scroll.c
+my_col_length_SOURCES= col_length/my_col_length.c
+my_blob_SOURCES= blob/my_blob.c
+my_bulk_SOURCES= bulk/my_bulk.c
+my_dyn_cursor_SOURCES= dyn_cursor/my_dyn_cursor.c
+my_unixodbc_SOURCES= unixodbc/my_unixodbc.c
+my_keys_SOURCES= keys/my_keys.c
+my_tran_ext_SOURCES= tran_ext/my_tran_ext.c
+my_catalog_SOURCES= catalog/my_catalog.c
+my_error_SOURCES= error/my_error.c
+my_use_result_SOURCES= use_result/my_use_result.c
+dbtest_SOURCES= db_test/db_test.c
+mytest_SOURCES= test/mytest.c
+mytest2_SOURCES= test2/mytest2.c
+mytest3_SOURCES= test3/mytest3.c
+mytest32_SOURCES= test32/mytest32.c
+
+
#
# BUILDALL SPECIFICATION, BUILD AND RUN ALL SAMPLES
#
@@ -80,12 +106,12 @@
./mytest3 -1 $(MYDSN) $(MYUID) $(MYPWD)
./mytest -1 $(MYDSN) $(MYUID) $(MYPWD)
./mytest -1 $(MYDSN) $(MYUID) $(MYPWD)
-
+
#
# CLEAN SPECIFICATION
#
-clean:
+clean-local:
rm -f my*dump
rm -f core
rm -f *~
@@ -95,5 +121,38 @@
rm -f *.bbg
rm -f gmon.*
-EXTRA_DIST=mytest3.h mytest.h my_utility.h WIN-Makefile Makefile.ini
+EXTRA_DIST= \
+ README \
+ include/mytest3.h \
+ Makefile.ini \
+ test.vpj \
+ test.pro \
+ basics/basics.pro \
+ blob/blob.pro \
+ bulk/bulk.pro \
+ catalog/catalog.pro \
+ col_length/col_length.pro \
+ connect/connect.pro \
+ curext/curext.pro \
+ cursor/cursor.pro \
+ dyn_cursor/dyn_cursor.pro \
+ error/error.pro \
+ keys/keys.pro \
+ param/param.pro \
+ position/position.pro \
+ relative/relative.pro \
+ result/result.pro \
+ scroll/scroll.pro \
+ test32/test32.pro \
+ timestamp/timestamp.pro \
+ tran/tran.pro \
+ tran_ext/tran_ext.pro \
+ unixodbc/unixodbc.pro \
+ use_result/use_result.pro \
+ curext/my_curext.c \
+ imyodbc/myodbc.c \
+ thread/my_thread.c \
+ thread_coredump/thread-coredump.c \
+ thread_test/thread_test.c \
+ timestamp/my_ts.c
| Thread |
|---|
| • Connector/ODBC 3.51 commit: r60 - / MYODBCDbg MYODBCDbg/MYODBCDbgLib myodbc3 myodbc3S myodbc3c myodbc3i myodbc3m myodbc3u scripts test | kboortz | 6 Aug |
