diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-28 00:07:27 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-28 00:07:27 -0400 |
commit | aee084841b875167d9afd4984208fb9a95f89896 (patch) | |
tree | b02cbee0fc22f3da12ac692c3b40175dff8d39d0 /Makefile.am | |
parent | 458554a48c62b7885a9347bb7103922f3b1f69e3 (diff) | |
parent | 942c1849c01195eacf45f2183981718311f6b470 (diff) |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# src/libshared/Makefile
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index eca7e59435..bb232871d2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1041,6 +1041,8 @@ libbasic_la_LIBADD = \ -lm #@src/libshared/Makefile ------------------------------------------------------- +at.subdirs += src +#@src/libshared/src/Makefile noinst_LTLIBRARIES += \ libshared.la |