diff --git a/config/oshmem_config_files.m4 b/config/oshmem_config_files.m4 index 74d80cd163..23c0a70cbc 100644 --- a/config/oshmem_config_files.m4 +++ b/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 diff --git a/oshmem/shmem/java/c/Makefile.am b/oshmem/shmem/java/c/Makefile.am index fb179013d7..ca3e0ba712 100644 --- a/oshmem/shmem/java/c/Makefile.am +++ b/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 diff --git a/oshmem/shmem/java/java/Makefile.am b/oshmem/shmem/java/java/Makefile.am index bc1c124eab..14221bbbf1 100644 --- a/oshmem/shmem/java/java/Makefile.am +++ b/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