From e9f781331cbae29bb20d00c10213900805edbed2 Mon Sep 17 00:00:00 2001
From: knodlseder <>
Date: Sat, 30 Jul 2011 05:44:23 +0000
Subject: [PATCH] streamline makefile

---
 src/ctbin/Makefile.am    | 14 +++-----------
 src/ctlike/Makefile.am   | 14 +++-----------
 src/ctobssim/Makefile.am | 14 +++-----------
 src/ctselect/Makefile.am | 12 ++----------
 4 files changed, 11 insertions(+), 43 deletions(-)

diff --git a/src/ctbin/Makefile.am b/src/ctbin/Makefile.am
index 53acdfb..55a6bd3 100644
--- a/src/ctbin/Makefile.am
+++ b/src/ctbin/Makefile.am
@@ -1,28 +1,20 @@
 ## Process this file with automake to produce Makefile.in
 
-# we use srcdir/src for "private" includes
-# we use srcdir/include for the static global include files
-# we use builddir/src for the generated include files to get found
-
-# Include directories
-INCLUDES = -I$(top_srcdir)/include \
-           -I$(top_builddir)/src \
-           -I$(top_srcdir)/src
-
 # Program name
 bin_PROGRAMS = ctbin
 
 # Sources
 sources = ctbin.cpp
 
-# Libtool library (only needed for python bindings)
+# Libtool library
 noinst_LTLIBRARIES = libctbin.la
 libctbin_la_SOURCES = $(sources)
 
 # Program definition
-ctbin_SOURCES = main.cpp $(sources)
+ctbin_SOURCES = main.cpp
 ctbin_LDFLAGS = $(LIB_LINK_OPTION) @LDFLAGS@
 ctbin_CPPFLAGS = @CPPFLAGS@
+ctbin_LDADD = libctbin.la
 
 # Parameter files
 pfilesdir = $(prefix)/syspfiles
diff --git a/src/ctlike/Makefile.am b/src/ctlike/Makefile.am
index 6f528d5..efce697 100644
--- a/src/ctlike/Makefile.am
+++ b/src/ctlike/Makefile.am
@@ -1,28 +1,20 @@
 ## Process this file with automake to produce Makefile.in
 
-# we use srcdir/src for "private" includes
-# we use srcdir/include for the static global include files
-# we use builddir/src for the generated include files to get found
-
-# Include directories
-INCLUDES = -I$(top_srcdir)/include \
-           -I$(top_builddir)/src \
-           -I$(top_srcdir)/src
-
 # Program name
 bin_PROGRAMS = ctlike
 
 # Sources
 sources = ctlike.cpp
 
-# Libtool library (only needed for python bindings)
+# Libtool library
 noinst_LTLIBRARIES = libctlike.la
 libctlike_la_SOURCES = $(sources)
 
 # Program definition
-ctlike_SOURCES = main.cpp $(sources)
+ctlike_SOURCES = main.cpp
 ctlike_LDFLAGS = $(LIB_LINK_OPTION) @LDFLAGS@
 ctlike_CPPFLAGS = @CPPFLAGS@
+ctlike_LDADD = libctlike.la
 
 # Parameter files
 pfilesdir = $(prefix)/syspfiles
diff --git a/src/ctobssim/Makefile.am b/src/ctobssim/Makefile.am
index 1cbc8d9..4c9f8e9 100644
--- a/src/ctobssim/Makefile.am
+++ b/src/ctobssim/Makefile.am
@@ -1,28 +1,20 @@
 ## Process this file with automake to produce Makefile.in
 
-# we use srcdir/src for "private" includes
-# we use srcdir/include for the static global include files
-# we use builddir/src for the generated include files to get found
-
-# Include directories
-INCLUDES = -I$(top_srcdir)/include \
-           -I$(top_builddir)/src \
-           -I$(top_srcdir)/src
-
 # Program name
 bin_PROGRAMS = ctobssim
 
 # Sources
 sources = ctobssim.cpp
 
-# Libtool library (only needed for python bindings)
+# Libtool library
 noinst_LTLIBRARIES = libctobssim.la
 libctobssim_la_SOURCES = $(sources)
 
 # Program definition
-ctobssim_SOURCES = main.cpp $(sources)
+ctobssim_SOURCES = main.cpp
 ctobssim_LDFLAGS = $(LIB_LINK_OPTION) @LDFLAGS@
 ctobssim_CPPFLAGS = @CPPFLAGS@
+ctobssim_LDADD = libctobssim.la
 
 # Parameter files
 pfilesdir = $(prefix)/syspfiles
diff --git a/src/ctselect/Makefile.am b/src/ctselect/Makefile.am
index fc558df..c593851 100644
--- a/src/ctselect/Makefile.am
+++ b/src/ctselect/Makefile.am
@@ -1,14 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-# we use srcdir/src for "private" includes
-# we use srcdir/include for the static global include files
-# we use builddir/src for the generated include files to get found
-
-# Include directories
-INCLUDES = -I$(top_srcdir)/include \
-           -I$(top_builddir)/src \
-           -I$(top_srcdir)/src
-
 # Program name
 bin_PROGRAMS = ctselect
 
@@ -20,9 +11,10 @@ noinst_LTLIBRARIES = libctselect.la
 libctselect_la_SOURCES = $(sources)
 
 # Program definition
-ctselect_SOURCES = main.cpp $(sources)
+ctselect_SOURCES = main.cpp
 ctselect_LDFLAGS = $(LIB_LINK_OPTION) @LDFLAGS@
 ctselect_CPPFLAGS = @CPPFLAGS@
+ctselect_LDADD = libctselect.la
 
 # Parameter files
 pfilesdir = $(prefix)/syspfiles
--
libgit2 0.21.4