Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
d41b660b
Commit
d41b660b
authored
Nov 28, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into mysql.com:/home/kent/bk/mysql-5.0-build
parents
c8b23c37
89a71063
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
8 deletions
+11
-8
Docs/Makefile.am
Docs/Makefile.am
+6
-6
sql/Makefile.am
sql/Makefile.am
+5
-2
No files found.
Docs/Makefile.am
View file @
d41b660b
...
@@ -26,7 +26,7 @@ all-local: $(TXT_FILES)
...
@@ -26,7 +26,7 @@ all-local: $(TXT_FILES)
# make sure that "make install" installs the info page, too
# make sure that "make install" installs the info page, too
# automake only seems to take care of this automatically,
# automake only seems to take care of this automatically,
# if we're building the info page from texi directly.
# if we're building the info page from texi directly.
install-data-hook
:
mysql.info
install-data-hook
:
$(srcdir)/
mysql.info
$(mkinstalldirs)
$(DESTDIR)$(infodir)
$(mkinstalldirs)
$(DESTDIR)$(infodir)
$(INSTALL_DATA)
$(srcdir)
/mysql.info
$(DESTDIR)$(infodir)
$(INSTALL_DATA)
$(srcdir)
/mysql.info
$(DESTDIR)$(infodir)
...
@@ -44,22 +44,22 @@ CLEAN_FILES: $(TXT_FILES)
...
@@ -44,22 +44,22 @@ CLEAN_FILES: $(TXT_FILES)
GT
=
$(srcdir)
/Support/generate-text-files.pl
GT
=
$(srcdir)
/Support/generate-text-files.pl
../INSTALL-SOURCE
:
mysql.info $(GT)
../INSTALL-SOURCE
:
$(srcdir)/
mysql.info $(GT)
perl
-w
$(GT)
$(srcdir)
/mysql.info
"installing-source"
"windows-source-build"
>
$@
perl
-w
$(GT)
$(srcdir)
/mysql.info
"installing-source"
"windows-source-build"
>
$@
../INSTALL-WIN-SOURCE
:
mysql.info $(GT)
../INSTALL-WIN-SOURCE
:
$(srcdir)/
mysql.info $(GT)
perl
-w
$(GT)
$(srcdir)
/mysql.info
"windows-source-build"
"post-installation"
>
$@
perl
-w
$(GT)
$(srcdir)
/mysql.info
"windows-source-build"
"post-installation"
>
$@
# We put the description for the binary installation here so that
# We put the description for the binary installation here so that
# people who download source wont have to see it. It is moved up to
# people who download source wont have to see it. It is moved up to
# the toplevel by the script that makes the binary tar files.
# the toplevel by the script that makes the binary tar files.
INSTALL-BINARY
:
mysql.info $(GT)
INSTALL-BINARY
:
$(srcdir)/
mysql.info $(GT)
perl
-w
$(GT)
$(srcdir)
/mysql.info
"installing-binary"
"installing-source"
>
$@
perl
-w
$(GT)
$(srcdir)
/mysql.info
"installing-binary"
"installing-source"
>
$@
../EXCEPTIONS-CLIENT
:
mysql.info $(GT)
../EXCEPTIONS-CLIENT
:
$(srcdir)/
mysql.info $(GT)
perl
-w
$(GT)
$(srcdir)
/mysql.info
"mysql-floss-license-exception"
"function-index"
>
$@
perl
-w
$(GT)
$(srcdir)
/mysql.info
"mysql-floss-license-exception"
"function-index"
>
$@
../support-files/MacOSX/ReadMe.txt
:
mysql.info $(GT)
../support-files/MacOSX/ReadMe.txt
:
$(srcdir)/
mysql.info $(GT)
perl
-w
$(GT)
$(srcdir)
/mysql.info
"mac-os-x-installation"
"netware-installation"
>
$@
perl
-w
$(GT)
$(srcdir)
/mysql.info
"mac-os-x-installation"
"netware-installation"
>
$@
# Don't update the files from bitkeeper
# Don't update the files from bitkeeper
...
...
sql/Makefile.am
View file @
d41b660b
...
@@ -148,12 +148,15 @@ mysql_tzinfo_to_sql.o: $(mysql_tzinfo_to_sql_SOURCES)
...
@@ -148,12 +148,15 @@ mysql_tzinfo_to_sql.o: $(mysql_tzinfo_to_sql_SOURCES)
sql_yacc.cc
:
sql_yacc.yy
sql_yacc.cc
:
sql_yacc.yy
sql_yacc.h
:
sql_yacc.yy
sql_yacc.h
:
sql_yacc.yy
# Be careful here, note that we use VPATH and might or might not have
# a pregenerated "sql_yacc.cc" in $(srcdir) or one we just built in
# $(builddir). And it has to work if $(srcdir) == $(builddir).
sql_yacc.o
:
sql_yacc.cc sql_yacc.h $(HEADERS)
sql_yacc.o
:
sql_yacc.cc sql_yacc.h $(HEADERS)
@
SED@
-e
's/__attribute__ ((__unused__))//'
sql_yacc.cc
>
sql_yacc.cc-new
@
SED@
-e
's/__attribute__ ((__unused__))//'
$<
>
sql_yacc.cc-new
@
MV@ sql_yacc.cc-new sql_yacc.cc
@
MV@ sql_yacc.cc-new sql_yacc.cc
@
echo
"Note: The following compile may take a long time."
@
echo
"Note: The following compile may take a long time."
@
echo
"If it fails, re-run configure with --with-low-memory"
@
echo
"If it fails, re-run configure with --with-low-memory"
$(CXXCOMPILE)
$(LM_CFLAGS)
-c
$<
$(CXXCOMPILE)
$(LM_CFLAGS)
-c
sql_yacc.cc
# This generates lex_hash.h
# This generates lex_hash.h
# NOTE Built sources should depend on their sources not the tool
# NOTE Built sources should depend on their sources not the tool
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment