Cleanup the mess from r31810 - no way that could compile or avoid breaking the trunk. The Makefile's had to be added to oshmem_config_files.m4, and the Makefile.am's had not been updated to the new srcdir/builddir conventions. Also add svn:ignores

This commit was SVN r31811.

The following SVN revision numbers were found above:
  r31810 --> open-mpi/ompi@83bdebbf81

config/oshmem_config_files.m4

@@ -20,6 +20,10 @@ AC_DEFUN([OSHMEM_CONFIG_FILES],[
     oshmem/shmem/fortran/Makefile
     oshmem/shmem/fortran/profile/Makefile
 
+    oshmem/shmem/java/Makefile
+    oshmem/shmem/java/java/Makefile
+    oshmem/shmem/java/c/Makefile
+
     oshmem/tools/oshmem_info/Makefile
     oshmem/tools/wrappers/Makefile
     oshmem/tools/wrappers/shmemcc-wrapper-data.txt

oshmem/shmem/java/c/Makefile.am

@@ -16,7 +16,7 @@ AM_CPPFLAGS = -I$(top_builddir)/oshmem/shmem/java/java $(OPAL_JDK_CPPFLAGS) -DOP
 
 headers = \
         shmemJava.h
-oshmemdir = $(ompiincludedir)/oshmem/shmem/java
+oshmemdir = $(oshmemincludedir)/oshmem/shmem/java
 oshmem_HEADERS = \
         $(headers)
 
@@ -26,7 +26,7 @@ liboshmem_java_la_SOURCES = \
 	shmem_Constant.c \
         shmem_ShMem.c
 
-liboshmem_java_la_LIBADD = $(top_builddir)/oshmem/liboshmem.la
+liboshmem_java_la_LIBADD = $(OSHMEM_TOP_BUILDDIR)/oshmem/liboshmem.la
 liboshmem_java_la_LDFLAGS = -version-info $(liboshmem_java_so_version)
 
 endif

oshmem/shmem/java/java/Makefile.am

@@ -82,7 +82,7 @@ ompi__v_MKDIR_0 = @echo "  MKDIR " $@;
 shmem/ShMem.class: $(JAVA_SRC_FILES)
 	$(OMPI_V_JAVAC) CLASSPATH=. ; \
 	export CLASSPATH ; \
-	$(JAVAC) -d . $(top_srcdir)/oshmem/shmem/java/java/*.java
+	$(JAVAC) -d . $(OSHMEM_TOP_SRCDIR)/oshmem/shmem/java/java/*.java
 
 # Similar to above, all the generated .h files are dependent upon the
 # token shmem/ShMem.class file.  Hence, all the classes will be generated
@@ -142,8 +142,8 @@ clean-local:
 
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
-ompihdir = $(ompiincludedir)/$(subdir)
-nobase_nodist_ompih_HEADERS = $(JAVA_H)
+oshmemdir = $(oshmemincludedir)/$(subdir)
+oshmem_HEADERS = $(headers)
 endif
 
 endif