Minor build system fixes.
This commit is contained in:
parent
efecb0bfa6
commit
fc979623a9
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -35,6 +35,7 @@ googletest/m4/ltoptions.m4
|
||||||
googletest/m4/ltsugar.m4
|
googletest/m4/ltsugar.m4
|
||||||
googletest/m4/ltversion.m4
|
googletest/m4/ltversion.m4
|
||||||
googletest/m4/lt~obsolete.m4
|
googletest/m4/lt~obsolete.m4
|
||||||
|
googlemock/m4
|
||||||
|
|
||||||
# Ignore generated directories.
|
# Ignore generated directories.
|
||||||
googlemock/fused-src/
|
googlemock/fused-src/
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
## Process this file with automake to produce Makefile.in
|
## Process this file with automake to produce Makefile.in
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
|
||||||
|
|
||||||
AUTOMAKE_OPTIONS = foreign
|
AUTOMAKE_OPTIONS = foreign
|
||||||
|
|
||||||
# Build . before src so that our all-local and clean-local hooks kicks in at
|
# Build . before src so that our all-local and clean-local hooks kicks in at
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
# Automake file
|
# Automake file
|
||||||
|
|
||||||
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
# Nonstandard package files for distribution.
|
# Nonstandard package files for distribution.
|
||||||
EXTRA_DIST = LICENSE
|
EXTRA_DIST = LICENSE
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,7 @@ AC_INIT([Google C++ Mocking Framework],
|
||||||
# Provide various options to initialize the Autoconf and configure processes.
|
# Provide various options to initialize the Autoconf and configure processes.
|
||||||
AC_PREREQ([2.59])
|
AC_PREREQ([2.59])
|
||||||
AC_CONFIG_SRCDIR([./LICENSE])
|
AC_CONFIG_SRCDIR([./LICENSE])
|
||||||
|
AC_CONFIG_MACRO_DIRS([m4])
|
||||||
AC_CONFIG_AUX_DIR([build-aux])
|
AC_CONFIG_AUX_DIR([build-aux])
|
||||||
AC_CONFIG_HEADERS([build-aux/config.h])
|
AC_CONFIG_HEADERS([build-aux/config.h])
|
||||||
AC_CONFIG_FILES([Makefile])
|
AC_CONFIG_FILES([Makefile])
|
||||||
|
|
|
@ -12,7 +12,7 @@ AC_INIT([Google C++ Testing Framework],
|
||||||
# Provide various options to initialize the Autoconf and configure processes.
|
# Provide various options to initialize the Autoconf and configure processes.
|
||||||
AC_PREREQ([2.59])
|
AC_PREREQ([2.59])
|
||||||
AC_CONFIG_SRCDIR([./LICENSE])
|
AC_CONFIG_SRCDIR([./LICENSE])
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
AC_CONFIG_MACRO_DIRS([m4])
|
||||||
AC_CONFIG_AUX_DIR([build-aux])
|
AC_CONFIG_AUX_DIR([build-aux])
|
||||||
AC_CONFIG_HEADERS([build-aux/config.h])
|
AC_CONFIG_HEADERS([build-aux/config.h])
|
||||||
AC_CONFIG_FILES([Makefile])
|
AC_CONFIG_FILES([Makefile])
|
||||||
|
|
Loading…
Reference in New Issue
Block a user