make distcheck fixes

diff --git a/man/Makefile.am b/man/Makefile.am
index 0d03de954bdb76fee70611daa2f8e8a16d37df36..d571ae57c08a85f826f29db7160db9c48e74ecae 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -3,6 +3,6 @@
 # Don't edit - this file is generated automatically from Makefile.am
 #
 
-SUBDIRS = man1 
+SUBDIRS = man1 man7
 
-CLEANFILES = *~ \\\#*
\ No newline at end of file
+CLEANFILES = *~ \\\#*

diff --git a/src/Makefile.am b/src/Makefile.am
index 4c5e11576deaa34e5c2af7940c35d092390fd403..5c72a760df768c042358ac26b9283f315238ab34 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@
 SUBDIRS = gmxlib mdlib kernel tools ngmx contrib
 # don't do anything for the local directory
 
-EXTRA_DIST = config.win
+#EXTRA_DIST = config.win
 
 mdrun:         
        (cd $(top_builddir)/src/gmxlib && $(MAKE))

diff --git a/src/kernel/Makefile.am b/src/kernel/Makefile.am
index 399b92ee4c44a6e3f6eb7e939c3365a90c079342..8e4f534c4cf513b5c7fd8caeb89c4556f4462bb5 100644 (file)
--- a/src/kernel/Makefile.am
+++ b/src/kernel/Makefile.am
@@ -15,7 +15,7 @@ if USE_OPENMM
 #AM_CPPFLAGS += -I$(top_srcdir)/libraries/openmm/include
 #LDADD += $(top_srcdir)/libraries/openmm/lib/linux64/libOpenMM.*
 lib_LTLIBRARIES += libopenmminterface.la
-libopenmminterface_la_SOURCES = md_openmm.cpp
+libopenmminterface_la_SOURCES = md_openmm.c
 #mdrun_LINK = $(CXXLINK)
 endif
 

diff --git a/src/mdlib/Makefile.am b/src/mdlib/Makefile.am
index c797ec19adf7354b1b13c4563d23125cd1fef1b9..366e8c85bf4cc74e11b850e9b060bb1ede8b056c 100644 (file)
--- a/src/mdlib/Makefile.am
+++ b/src/mdlib/Makefile.am
@@ -59,21 +59,3 @@ gmx_qhop_db_test_LDADD = ../mdlib/libmd@LIBSUFFIX@.la ../gmxlib/libgmx@LIBSUFFIX
 
 # clean all libtool libraries, since the target names might have changed
 CLEANFILES     = *.la *~ \\\#*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-