diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-04-14 20:27:45 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-04-14 20:27:45 +0300 |
| commit | eb7a410c147507ffdf0e84d163a014acb82b19a2 (patch) | |
| tree | 2274bf05e320123c234afbe38dc97932b943c0ea /lib/Makefile.am | |
| parent | 64544985029d58bada3486a3eba7f11ce690c526 (diff) | |
| parent | ddd6b68524ba1f957e2f8ddd76eb23e641429b58 (diff) | |
| download | emacs-eb7a410c147507ffdf0e84d163a014acb82b19a2.tar.gz | |
Merge from trunk, resolve conflicts.
Diffstat (limited to 'lib/Makefile.am')
| -rw-r--r-- | lib/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 2893dd42d9d..2ba63f3152a 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -4,7 +4,7 @@ MOSTLYCLEANDIRS = MOSTLYCLEANFILES = noinst_LIBRARIES = -AM_CFLAGS = $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS) +AM_CFLAGS = $(PROFILING_CFLAGS) $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS) DEFAULT_INCLUDES = -I. -I$(top_srcdir)/lib -I../src -I$(top_srcdir)/src if BUILDING_FOR_WINDOWSNT |