[sapwood] some cleanup

[Sven Herzberg <herzi src gnome org>]

commit 5a568f8caaeeef2a1740641cbc43f5e67c592fd1
Author: Sven Herzberg <herzi gnome-de org>
Date:   Mon Jun 7 15:35:51 2010 +0200

    some cleanup
    
    * configure.in: make sure we can use per-target CPPFLAGS
    * protocol/Makefile.am: compress the file a bit by reducing unnecessary
      whitespaces
    * server/Makefile.am: remove unused preprocessor definitions

 configure.in         |    1 +
 protocol/Makefile.am |   20 ++++++--------------
 server/Makefile.am   |    1 -
 3 files changed, 7 insertions(+), 15 deletions(-)
---
diff --git a/configure.in b/configure.in
index 409a3d3..185680c 100644
--- a/configure.in
+++ b/configure.in
@@ -10,6 +10,7 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
 AC_PROG_CC
 AM_PROG_CC_STDC
+AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
diff --git a/protocol/Makefile.am b/protocol/Makefile.am
index ca5cdce..8c18631 100644
--- a/protocol/Makefile.am
+++ b/protocol/Makefile.am
@@ -1,16 +1,8 @@
 include $(top_srcdir)/Makefile.decl
 
-# FIXME: use a path header for the server
-INCLUDES = \
-    $(GTK_CFLAGS) \
-    -DSAPWOOD_SERVER=\"$(daemondir)/sapwood-server\"
-
-noinst_LTLIBRARIES = \
-    libprotocol.la
-
-libprotocol_la_LIBADD = \
-    $(GTK_LIBS)
-
-libprotocol_la_SOURCES = \
-    sapwood-proto.c    \
-    sapwood-proto.h
+noinst_LTLIBRARIES=libprotocol.la
+libprotocol_la_CPPFLAGS=$(GTK_CFLAGS)
+libprotocol_la_LIBADD=$(GTK_LIBS)
+libprotocol_la_SOURCES=\
+	sapwood-proto.c \
+	sapwood-proto.h
diff --git a/server/Makefile.am b/server/Makefile.am
index a5fb1bd..6c2c353 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.decl
 INCLUDES = \
     $(GDK_CFLAGS) \
     -I$(top_srcdir)/protocol \
-    -DSAPWOOD_SERVER=\"$(daemondir)/sapwood-server\" \
     -DG_LOG_DOMAIN=\"sapwood-server\" \
     $(NULL)