CCAR: modify swig generation rule to add .py in dependencies so that

make dist and make distcheck work even if some files (generated .py)
are missing.

diff --git a/src/Batch_SWIG/Makefile.am b/src/Batch_SWIG/Makefile.am
index 645567f97299ffefcf27164305a013aae8d0f5f6..3f4539a2b5d2bff1da3cb03dd815c7900b36ab26 100644 (file)
--- a/src/Batch_SWIG/Makefile.am
+++ b/src/Batch_SWIG/Makefile.am
@@ -49,14 +49,14 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 # The library will be installed in the common place.
 #
 
-BUILT_SOURCES = swig_wrap.cpp
+BUILT_SOURCES = swig_wrap.cpp libBatch_Swig.py
 
 SWIG_FLAGS    = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/../Batch
-SWIG_SOURCES  = libBatch_Swig.i libBatch_Swig_exception.i libBatch_Swig_typemap.i
+SWIGSOURCES  = libBatch_Swig.i libBatch_Swig_exception.i libBatch_Swig_typemap.i
 
 salomepython_PYTHON           = libBatch_Swig.py
 salomepyexec_LTLIBRARIES      = _libBatch_Swig.la
-_libBatch_Swig_la_SOURCES  = $(BUILT_SOURCES) $(SWIG_SOURCES)
+_libBatch_Swig_la_SOURCES  = swig_wrap.cpp
 _libBatch_Swig_la_CPPFLAGS = @PYTHON_INCLUDES@ -I$(srcdir) -I$(srcdir)/../Batch
 _libBatch_Swig_la_LDFLAGS  = -module
 _libBatch_Swig_la_LIBADD   = ../Batch/libSalomeBatch.la @PYTHON_LIBS@
@@ -66,11 +66,12 @@ _libBatch_Swig_la_CPPFLAGS += @OPENPBS_INCLUDES@
 _libBatch_Swig_la_LIBADD   += @OPENPBS_LIBDIR@ @OPENPBS_LIBS@
 endif
 
-swig_wrap.cpp : $(SWIG_SOURCES)
-       $(SWIG) $(SWIG_FLAGS) -o $@ $<
+swig_wrap.cpp libBatch_Swig.py : $(SWIGSOURCES)
+       $(SWIG) $(SWIG_FLAGS) -o swig_wrap.cpp $<
 
 CLEANFILES = swig_wrap.cpp
 
+EXTRA_DIST = $(SWIGSOURCES)
 
 #
 # ===============================================================

diff --git a/src/Communication_SWIG/Makefile.am b/src/Communication_SWIG/Makefile.am
index 8c66bb02ec6a5f0969ce86fb5133867ef244b211..48ef7c4015b8dcfd4b36237fcf928e1e2236ba1a 100644 (file)
--- a/src/Communication_SWIG/Makefile.am
+++ b/src/Communication_SWIG/Makefile.am
@@ -49,15 +49,15 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 # The library will be installed in the common place.
 #
 
-BUILT_SOURCES = swig_wrap.cpp
+BUILT_SOURCES = swig_wrap.cpp libSALOME_Comm.py
 
 SWIG_FLAGS    = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/../Communication
-SWIG_SOURCES  = libSALOME_Comm.i
+SWIGSOURCES  = libSALOME_Comm.i
 
 
 salomepython_PYTHON = libSALOME_Comm.py
 salomepyexec_LTLIBRARIES = _libSALOME_Comm.la
-_libSALOME_Comm_la_SOURCES  = $(BUILT_SOURCES) $(SWIG_SOURCES)
+_libSALOME_Comm_la_SOURCES  = swig_wrap.cpp
 _libSALOME_Comm_la_CPPFLAGS =\
        @PYTHON_INCLUDES@ \
        -I$(srcdir) -I$(srcdir)/../Communication \
@@ -81,11 +81,12 @@ _libSALOME_Comm_la_LIBADD+=@MPI_LIBS@
 endif
 
 
-swig_wrap.cpp : $(SWIG_SOURCES)
-       $(SWIG) $(SWIG_FLAGS) -o $@ $<
+swig_wrap.cpp libSALOME_Comm.py : $(SWIGSOURCES)
+       $(SWIG) $(SWIG_FLAGS) -o swig_wrap.cpp $<
 
 CLEANFILES = swig_wrap.cpp
 
+EXTRA_DIST = $(SWIGSOURCES)
 
 #
 # ===============================================================

diff --git a/src/LifeCycleCORBA_SWIG/Makefile.am b/src/LifeCycleCORBA_SWIG/Makefile.am
index 7c694fc072469167aaebb84f45a82e5ceea54874..b0cd8a4995651a53290e6621cf09bd47a460258e 100644 (file)
--- a/src/LifeCycleCORBA_SWIG/Makefile.am
+++ b/src/LifeCycleCORBA_SWIG/Makefile.am
@@ -49,14 +49,14 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 # The library will be installed in the same place.
 #
 
-BUILT_SOURCES = swig_wrap.cpp
+BUILT_SOURCES = swig_wrap.cpp libSALOME_LifeCycleCORBA.py
 
 SWIG_FLAGS    = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/../LifeCycleCORBA -I$(srcdir)/../Utils
-SWIG_SOURCES  = libSALOME_LifeCycleCORBA.i
+SWIGSOURCES  = libSALOME_LifeCycleCORBA.i
 
 salomepython_PYTHON = libSALOME_LifeCycleCORBA.py
 salomepyexec_LTLIBRARIES = _libSALOME_LifeCycleCORBA.la
-_libSALOME_LifeCycleCORBA_la_SOURCES  = $(BUILT_SOURCES) $(SWIG_SOURCES)
+_libSALOME_LifeCycleCORBA_la_SOURCES  = swig_wrap.cpp
 _libSALOME_LifeCycleCORBA_la_CPPFLAGS =\
        @PYTHON_INCLUDES@ \
        -I$(srcdir) \
@@ -74,11 +74,12 @@ _libSALOME_LifeCycleCORBA_la_LIBADD   = \
        ../LifeCycleCORBA/libSalomeLifeCycleCORBA.la \
        @PYTHON_LIBS@
 
-swig_wrap.cpp : $(SWIG_SOURCES)
-       $(SWIG) $(SWIG_FLAGS) -o $@ $<
+swig_wrap.cpp libSALOME_LifeCycleCORBA.py : $(SWIGSOURCES)
+       $(SWIG) $(SWIG_FLAGS) -o swig_wrap.cpp $<
 
 CLEANFILES = swig_wrap.cpp
 
+EXTRA_DIST = $(SWIGSOURCES)
 
 #
 # ===============================================================

diff --git a/src/NOTIFICATION_SWIG/Makefile.am b/src/NOTIFICATION_SWIG/Makefile.am
index 6f2c9835c2a91e5063466a15b59ae160665665ce..ee4ffadf8c0ace2585ec9027dca5e7ff80c9c32e 100644 (file)
--- a/src/NOTIFICATION_SWIG/Makefile.am
+++ b/src/NOTIFICATION_SWIG/Makefile.am
@@ -34,14 +34,14 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 # (cf. http://www.geocities.com/foetsch/python/swig_linux.htm)
 # see also LifeCycleCORBA_SWIG 
 #
-BUILT_SOURCES = swig_wrap.cpp
+BUILT_SOURCES = swig_wrap.cpp libNOTIFICATION.py
 
 SWIG_FLAGS    = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/../Notification
-SWIG_SOURCES  = NOTIFICATION.i
+SWIGSOURCES  = NOTIFICATION.i
 
 salomepython_PYTHON = libNOTIFICATION.py
 salomepyexec_LTLIBRARIES = _libNOTIFICATION.la
-_libNOTIFICATION_la_SOURCES  = $(BUILT_SOURCES) $(SWIG_SOURCES) \
+_libNOTIFICATION_la_SOURCES  = swig_wrap.cpp \
        NOTIFICATION_Swig.cxx NOTIFICATION_Swig.hxx SALOME_NOTIFICATION_SWIG.hxx
 _libNOTIFICATION_la_CPPFLAGS =\
        @PYTHON_INCLUDES@ -DHAVE_CONFIG_H \
@@ -55,7 +55,9 @@ _libNOTIFICATION_la_CPPFLAGS =\
 _libNOTIFICATION_la_LDFLAGS  = -module
 _libNOTIFICATION_la_LIBADD   = ../Notification/libSalomeNotification.la
 
-swig_wrap.cpp : $(SWIG_SOURCES)
-       $(SWIG) $(SWIG_FLAGS) -o $@ $<
+swig_wrap.cpp libNOTIFICATION.py : $(SWIGSOURCES)
+       $(SWIG) $(SWIG_FLAGS) -o swig_wrap.cpp $<
 
 CLEANFILES = swig_wrap.cpp
+
+EXTRA_DIST = $(SWIGSOURCES)