Added missing assembly files in nonbonded/nb_kernel_x86_64_sse/Makefile.am; added...

diff --git a/Makefile.am b/Makefile.am
index 58e83c5195367032563db738e0869ff6bbd0db8a..1a98e0dd62da8b1a8d97e0d285f59a139e33e125 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,27 @@ SUBDIRS = include src admin scripts share man
 # Most files in the config subdir is included automatically when
 # we issue "make dist", but not depcomp
 
-EXTRA_DIST = config/depcomp                                   
+EXTRA_DIST = config/depcomp \
+                        CMakeLists.txt cmake \
+                        include/thread_mpi/atomic/CMakeLists.txt \
+                        include/thread_mpi/CMakeLists.txt \
+                        include/CMakeLists.txt \
+                        man/CMakeLists.txt \
+                        tests/CMakeLists.txt \
+                        share/CMakeLists.txt \
+                        src/kernel/gmx_gpu_utils \
+                        src/kernel/CMakeLists.txt \
+                        src/ngmx/CMakeLists.txt \
+                        src/mdlib/CMakeLists.txt \
+                        src/config.h.cmakein \
+                        src/gmxlib/version.c.cmakein \
+                        src/gmxlib/thread_mpi/CMakeLists.txt \
+                        src/gmxlib/CMakeLists.txt \
+                        src/CMakeLists.txt \
+                        src/tools/CMakeLists.txt \
+                        COPYING-GPU \
+                        INSTALL-GPU
+
 
 install-exec-hook:
        @echo ""

diff --git a/src/gmxlib/nonbonded/nb_kernel_x86_64_sse/Makefile.am b/src/gmxlib/nonbonded/nb_kernel_x86_64_sse/Makefile.am
index d9050468ed36581a2c1549d0c5edea630bd55c3f..8b31f47ff99aa59a8d74076aadf1c9a8ba33020d 100644 (file)
--- a/src/gmxlib/nonbonded/nb_kernel_x86_64_sse/Makefile.am
+++ b/src/gmxlib/nonbonded/nb_kernel_x86_64_sse/Makefile.am
@@ -51,14 +51,13 @@ libnb_kernel_x86_64_sse_la_SOURCES = \
        nb_kernel332_x86_64_sse.s       nb_kernel332_x86_64_sse.h       \
        nb_kernel333_x86_64_sse.s       nb_kernel333_x86_64_sse.h       \
        nb_kernel334_x86_64_sse.s       nb_kernel334_x86_64_sse.h       \
-       nb_kernel400_x86_64_sse.c       nb_kernel400_x86_64_sse.h       \
-       nb_kernel410_x86_64_sse.c       nb_kernel410_x86_64_sse.h       \
-       nb_kernel430_x86_64_sse.c       nb_kernel430_x86_64_sse.h       \
+       nb_kernel400_x86_64_sse.s       nb_kernel400_x86_64_sse.h       \
+       nb_kernel410_x86_64_sse.s       nb_kernel410_x86_64_sse.h       \
+       nb_kernel430_x86_64_sse.s       nb_kernel430_x86_64_sse.h       \
        nb_kernel_x86_64_sse_test_asm.s nb_kernel_x86_64_sse_test_asm.h \
-       nb_kernel_x86_64_sse.c          nb_kernel_x86_64_sse.h          \
-       nb_kernel_allvsall_sse2_single.c   \
-       nb_kernel_allvsall_sse2_single.h   \
-       nb_kernel_allvsallgb_sse2_single.c \
+       nb_kernel_x86_64_sse.s          nb_kernel_x86_64_sse.h          \
+       nb_kernel_allvsall_sse2_single.s   \ nb_kernel_allvsall_sse2_single.h   \
+       nb_kernel_allvsallgb_sse2_single.s \
        nb_kernel_allvsallgb_sse2_single.h
 
 
@@ -87,5 +86,6 @@ EXTRA_DIST = \
        nb_kernel313_x86_64_sse.intel_syntax.s  nb_kernel314_x86_64_sse.intel_syntax.s  \
        nb_kernel330_x86_64_sse.intel_syntax.s  nb_kernel331_x86_64_sse.intel_syntax.s  \
        nb_kernel332_x86_64_sse.intel_syntax.s  nb_kernel333_x86_64_sse.intel_syntax.s  \
-       nb_kernel334_x86_64_sse.intel_syntax.s  nb_kernel_x86_64_sse_test_asm.intel_syntax.s
-
+       nb_kernel334_x86_64_sse.intel_syntax.s  nb_kernel400_x86_64_sse.intel_syntax.s  \
+       nb_kernel410_x86_64_sse.intel_syntax.s  nb_kernel430_x86_64_sse.intel_syntax.s  \
+       nb_kernel_x86_64_sse_test_asm.intel_syntax.s