summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-07-28 00:07:27 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-07-28 00:07:27 -0400
commitaee084841b875167d9afd4984208fb9a95f89896 (patch)
treeb02cbee0fc22f3da12ac692c3b40175dff8d39d0 /Makefile.am
parent458554a48c62b7885a9347bb7103922f3b1f69e3 (diff)
parent942c1849c01195eacf45f2183981718311f6b470 (diff)
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts: # src/libshared/Makefile
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am2
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