Various fixes to the java building infrastructure (now working in VPATH builds)

[simgrid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index fd675c7..6adcaa2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,6 +55,7 @@ EXTRA_DIST= \
        include/surf/surf.h \
        include/surf/surfxml_parse_private.h \
        include/surf/random_mgr.h \
+       include/surf/surf_resource_lmm.h \
        \
        include/xbt/wine_dbghelp.h \
        include/xbt/xbt_os_time.h \
@@ -82,6 +83,7 @@ EXTRA_DIST= \
        \
        smpi/private.h \
        smpi/smpi_coll_private.h \
+      smpi/smpi_mpi_dt_private.h \
        smpi/README
 
 #LIBRARY_VERSION= 0:0:0
@@ -221,7 +223,8 @@ SMPI_SRC= \
   smpi/smpi_sender.c \
   smpi/smpi_receiver.c \
   smpi/smpi_util.c \
-  smpi/smpi_coll.c
+  smpi/smpi_coll.c \
+  smpi/smpi_mpi_dt.c
 
 MSG_SRC=  msg/msg_config.c \
   msg/task.c msg/host.c msg/m_process.c msg/gos.c \
@@ -354,7 +357,7 @@ if HAVE_JAVA
 libsimgrid_la_SOURCES += $(JMSG_C_SRC) # add the binding support to the library
 
 clean-local:
-       -rm -rf .classes
+       -rm -rf .classes simgrid.jar
 
 jardir = $(prefix)/jar
 jar_DATA =  simgrid.jar
@@ -366,7 +369,7 @@ simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/simgrid.dtd
        cp $(srcdir)/surf/simgrid.dtd .classes/surf
        $(JAR) cvf simgrid.jar -C .classes .
 else
-EXTRA_DIST+=$(JMSG_C_SRC) $(MSG_SRC)
+EXTRA_DIST+=$(JMSG_C_SRC) $(JMSG_JAVA_SRC) $(MSG_SRC)
 endif
 
 if GRAMINE_MODE