diff --git a/ChangeLog b/ChangeLog
index 6a68bc4e3..9c65c1e80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-05  Rachel Hestilow  <hestilow@ximian.com>
+
+	* glue/Makefile.am: Make this work cleanly, with all automake.
+
 2002-07-05  Rachel Hestilow  <hestilow@ximian.com>
 
 	* configure.in: Conditionally compile Gnome.
diff --git a/glue/Makefile.am b/glue/Makefile.am
index 228a0deae..d3d801ba6 100644
--- a/glue/Makefile.am
+++ b/glue/Makefile.am
@@ -1,18 +1,27 @@
 lib_LTLIBRARIES = libgtksharpglue.la
 
-INCLUDES = @BASE_DEPENDENCIES_CFLAGS@ -I$(top_srcdir)
-
-
-libgtksharpglue_la_SOURCES = 	\
+BASE_SOURCES = \
 	value.c			\
 	textiter.c		\
 	fileselection.c		\
 	error.c			\
 	event.c			\
 	slist.c			\
-@ENABLE_GNOME_TRUE@	program.c \
 	#
 
+if ENABLE_GNOME
+libgtksharpglue_la_SOURCES = 	\
+	$(BASE_SOURCES) \
+	program.c \
+	#
+else
+libgtksharpglue_la_SOURCES = 	\
+	$(BASE_SOURCES) 
+endif
+
+INCLUDES = @BASE_DEPENDENCIES_CFLAGS@ -I$(top_srcdir)
+
+
 libgtksharpglue.dll: $(libgtksharpglue_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def
 	./build-dll libgtksharpglue 0.1