Fix building and installing package.

[genetic.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2d61fca186ae3fadf33051256dd14460cd726688..899ed063cf382ad903b04e7d9182c9b4b9e3395d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,6 @@
 AUTOMAKE_OPTIONS = gnu subdir-objects
 ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
-
-EXTRA_DIST = \
-    config.rpath
+AM_CXXFLAGS=-std=c++11
 
 MAINTAINERCLEANFILES = \
     aclocal.m4 \
@@ -23,22 +21,24 @@ CLEANFILES = \
     %~ \
     doxyfile.stamp
 
-bin_PROGRAMS = bin/genetic
+SUBDIRS = include . tests
+
+# bin_PROGRAMS = bin/genetic
+noinst_PROGRAMS = bin_genetic
+
 dist_noinst_SCRIPTS = autogen.sh
 
-bin_genetic_SOURCES = \
+nodist_bin_genetic_SOURCES = \
     src/main.cpp
 
+
 bin_genetic_CPPFLAGS = \
     $(bin_genetic_CFLAGS) \
+    -I$(top_srcdir)/include \
     -Wall -pedantic -Wextra \
-    @GEDCOM_CFLAGS@ \
-    -I$(top_srcdir)/src \
     -Wl,--export-dynamic
 
 bin_genetic_LDADD = \
     $(bin_genetic_LIBS)
 
 bin_genetic_LDFLAGS = $(LTLIBINTL)
-
-.PHONY: