diff --git a/exposed/Makefile.am b/exposed/Makefile.am
index 92183557..036dca9f 100644
--- a/exposed/Makefile.am
+++ b/exposed/Makefile.am
@@ -2,28 +2,14 @@
 
 AUTOMAKE_OPTIONS = subdir-objects
 
-AM_CPPFLAGS = -DLIBRARY -I$(top_srcdir)/src -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
-AM_LDFLAGS = -L.
+AM_LDFLAGS = -L../src
 
 noinst_PROGRAMS  = CDemo
-noinst_LIBRARIES = libslvs.a
 
 CDemo_SOURCES = CDemo.c
 
-# Set explicit CPPFLAGS to force renaming of the object files.
-# Otherwise, the object files for the GUI application will be overwritten.
-libslvs_a_CPPFLAGS = $(AM_CPPFLAGS)
-
-libslvs_a_SOURCES = \
-	lib.cpp \
-	../src/util.cpp \
-	../src/entity.cpp \
-	../src/expr.cpp \
-	../src/constraint.cpp \
-	../src/constrainteq.cpp \
-	../src/system.cpp
-
 CDemo_LDADD =
 
 if HAVE_FLTK
diff --git a/src/Makefile.am b/src/Makefile.am
index add54399..60db1e46 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,18 @@
 
 AUTOMAKE_OPTIONS = subdir-objects
 
+noinst_LIBRARIES = libslvs.a
+
+libslvs_a_SOURCES = \
+	../exposed/lib.cpp \
+	util.cpp \
+	entity.cpp \
+	expr.cpp \
+	constraint.cpp \
+	constrainteq.cpp \
+	system.cpp
+libslvs_a_CPPFLAGS = -DLIBRARY -I$(top_srcdir)/include
+
 AM_CPPFLAGS = $(FLTK_CXXFLAGS) $(LIBSPNAV_CPPFLAGS)
 
 if WIN32