From 2921b3dd0ace7a3136ca98f851590d53f4b22581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Luis=20Cerc=C3=B3s=20pita?= Date: Sun, 8 Jan 2012 17:43:03 +0100 Subject: [PATCH] Revocated several projects generation for each module (autotools) --- src/Mod/Ship/Icons/Makefile.am | 30 -------------- src/Mod/Ship/Makefile.am | 48 +++++++++++++++++++++-- src/Mod/Ship/shipCreateShip/Makefile.am | 11 ------ src/Mod/Ship/shipOutlineDraw/Makefile.am | 12 ------ src/Mod/Ship/shipUtils/Makefile.am | 11 ------ src/Mod/Surfaces/Icons/Makefile.am | 22 ----------- src/Mod/Surfaces/Makefile.am | 46 ++++++++++++++++++++-- src/Mod/Surfaces/surfBorder/Makefile.am | 8 ---- src/Mod/Surfaces/surfConvert/Makefile.am | 11 ------ src/Mod/Surfaces/surfISOCurve/Makefile.am | 12 ------ src/Mod/Surfaces/surfSlice/Makefile.am | 12 ------ src/Mod/Surfaces/surfUtils/Makefile.am | 12 ------ 12 files changed, 88 insertions(+), 147 deletions(-) delete mode 100644 src/Mod/Ship/Icons/Makefile.am delete mode 100644 src/Mod/Ship/shipCreateShip/Makefile.am delete mode 100644 src/Mod/Ship/shipOutlineDraw/Makefile.am delete mode 100644 src/Mod/Ship/shipUtils/Makefile.am delete mode 100644 src/Mod/Surfaces/Icons/Makefile.am delete mode 100644 src/Mod/Surfaces/surfBorder/Makefile.am delete mode 100644 src/Mod/Surfaces/surfConvert/Makefile.am delete mode 100644 src/Mod/Surfaces/surfISOCurve/Makefile.am delete mode 100644 src/Mod/Surfaces/surfSlice/Makefile.am delete mode 100644 src/Mod/Surfaces/surfUtils/Makefile.am diff --git a/src/Mod/Ship/Icons/Makefile.am b/src/Mod/Ship/Icons/Makefile.am deleted file mode 100644 index 285943436..000000000 --- a/src/Mod/Ship/Icons/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# Change data dir from default $(datadir) to actual directory -datadir = $(prefix)/Mod/Ship/Icons -data_DATA = \ - AreaCurveIco.png \ - AreaCurveIco.xcf \ - AreaCurveIco.xpm \ - DataIco.png \ - DataIco.xcf \ - DataIco.xpm \ - DiscretizeIco.png \ - DiscretizeIco.xcf \ - DiscretizeIco.xpm \ - HydrostaticsIco.png \ - HydrostaticsIco.xcf \ - HydrostaticsIco.xpm \ - Ico.png \ - Ico.xcf \ - Ico.xpm \ - OutlineDrawIco.png \ - OutlineDrawIco.xcf \ - OutlineDrawIco.xpm \ - ReparametrizeIco.png \ - ReparametrizeIco.xcf \ - ReparametrizeIco.xpm \ - Ship.xcf \ - Ship.xpm - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt diff --git a/src/Mod/Ship/Makefile.am b/src/Mod/Ship/Makefile.am index 0b042d854..333680262 100644 --- a/src/Mod/Ship/Makefile.am +++ b/src/Mod/Ship/Makefile.am @@ -1,12 +1,54 @@ -SUBDIRS=Icons shipCreateShip shipOutlineDraw shipUtils - # Change data dir from default ($(prefix)/share) to actual dir datadir = $(prefix)/Mod/Ship -data_DATA = InitGui.py ShipGui.py Instance.py +data_DATA = \ + InitGui.py \ + ShipGui.py \ + Instance.py + +nobase_data_DATA = \ + Icons/AreaCurveIco.png \ + Icons/AreaCurveIco.xcf \ + Icons/AreaCurveIco.xpm \ + Icons/DataIco.png \ + Icons/DataIco.xcf \ + Icons/DataIco.xpm \ + Icons/DiscretizeIco.png \ + Icons/DiscretizeIco.xcf \ + Icons/DiscretizeIco.xpm \ + Icons/HydrostaticsIco.png \ + Icons/HydrostaticsIco.xcf \ + Icons/HydrostaticsIco.xpm \ + Icons/Ico.png \ + Icons/Ico.xcf \ + Icons/Ico.xpm \ + Icons/OutlineDrawIco.png \ + Icons/OutlineDrawIco.xcf \ + Icons/OutlineDrawIco.xpm \ + Icons/ReparametrizeIco.png \ + Icons/ReparametrizeIco.xcf \ + Icons/ReparametrizeIco.xpm \ + Icons/Ship.xcf \ + Icons/Ship.xpm \ + shipCreateShip/__init__.py \ + shipCreateShip/Preview.py \ + shipCreateShip/TaskPanel.py \ + shipCreateShip/TaskPanel.ui \ + shipOutlineDraw/__init__.py \ + shipOutlineDraw/Plot.py \ + shipOutlineDraw/Preview.py \ + shipOutlineDraw/TaskPanel.py \ + shipOutlineDraw/TaskPanel.ui \ + shipUtils/__init__.py \ + shipUtils/Math.py \ + shipUtils/Paths.py \ + shipUtils/Translator.py + +CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = \ $(data_DATA) \ + $(nobase_data_DATA) \ CMakeLists.txt \ README \ ship.dox diff --git a/src/Mod/Ship/shipCreateShip/Makefile.am b/src/Mod/Ship/shipCreateShip/Makefile.am deleted file mode 100644 index 7f9b7a022..000000000 --- a/src/Mod/Ship/shipCreateShip/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -# Change data dir from default $(datadir) to actual directory -datadir = $(prefix)/Mod/Ship/shipCreateShip -data_DATA = \ - __init__.py \ - Preview.py \ - TaskPanel.py \ - TaskPanel.ui - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt diff --git a/src/Mod/Ship/shipOutlineDraw/Makefile.am b/src/Mod/Ship/shipOutlineDraw/Makefile.am deleted file mode 100644 index f7d5168df..000000000 --- a/src/Mod/Ship/shipOutlineDraw/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -# Change data dir from default $(datadir) to actual directory -datadir = $(prefix)/Mod/Ship/shipOutlineDraw -data_DATA = \ - __init__.py \ - Plot.py \ - Preview.py \ - TaskPanel.py \ - TaskPanel.ui - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt diff --git a/src/Mod/Ship/shipUtils/Makefile.am b/src/Mod/Ship/shipUtils/Makefile.am deleted file mode 100644 index 50d893c8a..000000000 --- a/src/Mod/Ship/shipUtils/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -# Change data dir from default $(datadir) to actual directory -datadir = $(prefix)/Mod/Ship/shipUtils -data_DATA = \ - __init__.py \ - Math.py \ - Paths.py \ - Translator.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt diff --git a/src/Mod/Surfaces/Icons/Makefile.am b/src/Mod/Surfaces/Icons/Makefile.am deleted file mode 100644 index d4400fedf..000000000 --- a/src/Mod/Surfaces/Icons/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -# Change data dir from default $(datadir) to actual directory -datadir = $(prefix)/Mod/Surfaces/Icons -data_DATA = \ - BorderIco.png \ - BorderIco.xcf \ - BorderIco.xpm \ - ConvertIco.png \ - ConvertIco.xcf \ - ConvertTo4SidesIco.xpm \ - Ico.png \ - Ico.xcf \ - Ico.xpm \ - IsoCurveIco.png \ - IsoCurveIco.xcf \ - IsoCurveIco.xpm \ - SliceIco.png \ - SliceIco.xcf \ - SliceIco.xpm - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt diff --git a/src/Mod/Surfaces/Makefile.am b/src/Mod/Surfaces/Makefile.am index 03c16fc0d..6557f97c0 100644 --- a/src/Mod/Surfaces/Makefile.am +++ b/src/Mod/Surfaces/Makefile.am @@ -1,12 +1,52 @@ -SUBDIRS=Icons surfBorder surfConvert surfISOCurve surfSlice surfUtils - # Change data dir from default ($(prefix)/share) to actual dir datadir = $(prefix)/Mod/Surfaces -data_DATA = InitGui.py SurfGui.py +data_DATA = InitGui.py \ + SurfGui.py + +nobase_data_DATA = \ + Icons/BorderIco.png \ + Icons/BorderIco.xcf \ + Icons/BorderIco.xpm \ + Icons/ConvertIco.png \ + Icons/ConvertIco.xcf \ + Icons/ConvertTo4SidesIco.xpm \ + Icons/Ico.png \ + Icons/Ico.xcf \ + Icons/Ico.xpm \ + Icons/IsoCurveIco.png \ + Icons/IsoCurveIco.xcf \ + Icons/IsoCurveIco.xpm \ + Icons/SliceIco.png \ + Icons/SliceIco.xcf \ + Icons/SliceIco.xpm \ + surfBorder/__init__.py \ + surfConvert/__init__.py \ + surfConvert/Preview.py \ + surfConvert/TaskPanel.py \ + surfConvert/TaskPanel.ui \ + surfISOCurve/__init__.py \ + surfISOCurve/PointTracker.py \ + surfISOCurve/Preview.py \ + surfISOCurve/TaskPanel.py \ + surfISOCurve/TaskPanel.ui \ + surfSlice/__init__.py \ + surfSlice/PointTracker.py \ + surfSlice/Preview.py \ + surfSlice/TaskPanel.py \ + surfSlice/TaskPanel.ui \ + surfUtils/Geometry.py \ + surfUtils/__init__.py \ + surfUtils/Math.py \ + surfUtils/Paths.py \ + surfUtils/Translator.py + +CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = \ $(data_DATA) \ + $(nobase_data_DATA) \ CMakeLists.txt \ README \ surfaces.dox + diff --git a/src/Mod/Surfaces/surfBorder/Makefile.am b/src/Mod/Surfaces/surfBorder/Makefile.am deleted file mode 100644 index 8962f936d..000000000 --- a/src/Mod/Surfaces/surfBorder/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -# Change data dir from default $(datadir) to actual directory -datadir = $(prefix)/Mod/Surfaces/surfBorder -data_DATA = \ - __init__.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt diff --git a/src/Mod/Surfaces/surfConvert/Makefile.am b/src/Mod/Surfaces/surfConvert/Makefile.am deleted file mode 100644 index 0f840248d..000000000 --- a/src/Mod/Surfaces/surfConvert/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -# Change data dir from default $(datadir) to actual directory -datadir = $(prefix)/Mod/Surfaces/surfConvert -data_DATA = \ - __init__.py \ - Preview.py \ - TaskPanel.py \ - TaskPanel.ui - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt diff --git a/src/Mod/Surfaces/surfISOCurve/Makefile.am b/src/Mod/Surfaces/surfISOCurve/Makefile.am deleted file mode 100644 index e6f9abe91..000000000 --- a/src/Mod/Surfaces/surfISOCurve/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -# Change data dir from default $(datadir) to actual directory -datadir = $(prefix)/Mod/Surfaces/surfISOCurve -data_DATA = \ - __init__.py \ - PointTracker.py \ - Preview.py \ - TaskPanel.py \ - TaskPanel.ui - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt diff --git a/src/Mod/Surfaces/surfSlice/Makefile.am b/src/Mod/Surfaces/surfSlice/Makefile.am deleted file mode 100644 index 13f6a4468..000000000 --- a/src/Mod/Surfaces/surfSlice/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -# Change data dir from default $(datadir) to actual directory -datadir = $(prefix)/Mod/Surfaces/surfSlice -data_DATA = \ - __init__.py \ - PointTracker.py \ - Preview.py \ - TaskPanel.py \ - TaskPanel.ui - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt diff --git a/src/Mod/Surfaces/surfUtils/Makefile.am b/src/Mod/Surfaces/surfUtils/Makefile.am deleted file mode 100644 index 283b8c100..000000000 --- a/src/Mod/Surfaces/surfUtils/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -# Change data dir from default $(datadir) to actual directory -datadir = $(prefix)/Mod/Surfaces/surfUtils -data_DATA = \ - Geometry.py \ - __init__.py \ - Math.py \ - Paths.py \ - Translator.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt