Reverted iodbc removal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
925f154dac
commit
85b0fd7098
23
Makefile.in
23
Makefile.in
@ -51,12 +51,13 @@ VP7 = @top_srcdir@/src/jpeg
|
||||
VP8 = @top_srcdir@/src/tiff
|
||||
VP9 = @top_srcdir@/src/zlib
|
||||
VPA = @top_srcdir@/src/regex
|
||||
VP10 = @top_srcdir@/src/msw/ole
|
||||
VP10 = @top_srcdir@/src/iodbc
|
||||
VP11 = @top_srcdir@/src/msw/ole
|
||||
|
||||
# the comment at the end of the next line is needed because otherwise autoconf
|
||||
# would remove this line completely - it contains a built-in hack to remove
|
||||
# any VPATH assignment not containing ':'
|
||||
VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VPA)@PATH_IFS@$(VP10) # ':' for autoconf
|
||||
VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VPA)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf
|
||||
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
@ -112,7 +113,7 @@ MSWDIR = $(WXDIR)/src/msw
|
||||
PMDIR = $(WXDIR)/src/os2
|
||||
MACDIR = $(WXDIR)/src/mac
|
||||
COCOADIR = $(WXDIR)/src/cocoa
|
||||
# ODBCDIR = $(WXDIR)/src/iodbc
|
||||
ODBCDIR = $(WXDIR)/src/iodbc
|
||||
FTDIR = $(WXDIR)/src/freetype
|
||||
INCDIR = $(WXDIR)/include
|
||||
SAMPDIR = $(WXDIR)/samples
|
||||
@ -654,14 +655,14 @@ ALL_GUI_DIST: ALL_DIST
|
||||
cp $(TIFFDIR)/*.h $(DISTDIR)/src/tiff
|
||||
cp $(TIFFDIR)/*.c $(DISTDIR)/src/tiff
|
||||
cp $(TIFFDIR)/README $(DISTDIR)/src/tiff
|
||||
#mkdir $(DISTDIR)/src/iodbc
|
||||
#cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
|
||||
#cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc
|
||||
#cp $(ODBCDIR)/*.ci $(DISTDIR)/src/iodbc
|
||||
#cp $(ODBCDIR)/*.exp $(DISTDIR)/src/iodbc
|
||||
#cp $(ODBCDIR)/README $(DISTDIR)/src/iodbc
|
||||
#cp $(ODBCDIR)/NEWS $(DISTDIR)/src/iodbc
|
||||
#cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc
|
||||
mkdir $(DISTDIR)/src/iodbc
|
||||
cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
|
||||
cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc
|
||||
cp $(ODBCDIR)/*.ci $(DISTDIR)/src/iodbc
|
||||
cp $(ODBCDIR)/*.exp $(DISTDIR)/src/iodbc
|
||||
cp $(ODBCDIR)/README $(DISTDIR)/src/iodbc
|
||||
cp $(ODBCDIR)/NEWS $(DISTDIR)/src/iodbc
|
||||
cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc
|
||||
|
||||
BASE_DIST: ALL_DIST
|
||||
# make --disable-gui the default
|
||||
|
Loading…
Reference in New Issue
Block a user