From 1826d4de5903f496bd424d3f93a7c8f307ce6759 Mon Sep 17 00:00:00 2001
From: Robin Haberkorn <robin.haberkorn@googlemail.com>
Date: Tue, 4 Dec 2012 21:21:37 +0100
Subject: additional minor changes: distribution building now possible

---
 src/Makefile.am | 10 ++++++----
 src/ring.cpp    |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 9836c9a..11d2830 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,14 +23,15 @@ sciteco_minimal_SOURCES = main.cpp sciteco.h \
 			  rbtree.cpp rbtree.h \
 			  symbols.cpp symbols.h \
 			  interface.h
+nodist_sciteco_minimal_SOURCES =
 
 if INTERFACE_GTK
 
 BUILT_SOURCES += gtk-info-popup.c \
 		 gtk-info-popup.h gtk-info-popup-private.h
 
-sciteco_minimal_SOURCES += interface-gtk.cpp interface-gtk.h \
-			   gtk-info-popup.c
+sciteco_minimal_SOURCES += interface-gtk.cpp interface-gtk.h
+nodist_sciteco_minimal_SOURCES += gtk-info-popup.c
 
 else
 
@@ -39,8 +40,9 @@ sciteco_minimal_SOURCES += interface-ncurses.cpp interface-ncurses.h
 endif
 
 bin_PROGRAMS = sciteco
-sciteco_SOURCES = $(sciteco_minimal_SOURCES) \
-		  symbols-scintilla.cpp symbols-scilexer.cpp
+sciteco_SOURCES = $(sciteco_minimal_SOURCES)
+nodist_sciteco_SOURCES = $(nodist_sciteco_minimal_SOURCES) \
+			 symbols-scintilla.cpp symbols-scilexer.cpp
 
 %.c %.h %-private.h : %.gob
 	@GOB2@ $<
diff --git a/src/ring.cpp b/src/ring.cpp
index 292f86c..1b0dbc4 100644
--- a/src/ring.cpp
+++ b/src/ring.cpp
@@ -20,7 +20,7 @@
 #include "expressions.h"
 #include "ring.h"
 
-#ifdef G_OS_WIN32
+#ifdef HAVE_WINDOWS_H
 /* here it shouldn't cause conflicts with other headers */
 #include <windows.h>
 
-- 
cgit v1.2.3