From 3c61d41dbfce0a868f1db34b8c81c4c0b3f54789 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 23 Nov 2014 10:55:36 +0100 Subject: [PATCH 01/12] + fix bug in mesh bounding box, fix clang warning --- src/App/PropertyStandard.cpp | 2 +- src/Mod/Mesh/App/Mesh.cpp | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/App/PropertyStandard.cpp b/src/App/PropertyStandard.cpp index b10418f699a0..92ee3090a13a 100644 --- a/src/App/PropertyStandard.cpp +++ b/src/App/PropertyStandard.cpp @@ -283,7 +283,7 @@ void PropertyEnumeration::setEnums(const char** plEnums) // check for NULL termination const char* p = *_EnumArray; unsigned int i=0; - while(*(p++) != NULL)i++; + while(*(p++) != 0)i++; // very unlikely to have enums with more then 5000 entries! assert(i<5000); } diff --git a/src/Mod/Mesh/App/Mesh.cpp b/src/Mod/Mesh/App/Mesh.cpp index f08de844f953..c7d623487640 100644 --- a/src/Mod/Mesh/App/Mesh.cpp +++ b/src/Mod/Mesh/App/Mesh.cpp @@ -148,11 +148,13 @@ Base::BoundBox3d MeshObject::getBoundBox(void)const { const_cast(_kernel).RecalcBoundBox(); Base::BoundBox3f Bnd = _kernel.GetBoundBox(); - + Base::BoundBox3d Bnd2; - for(int i =0 ;i<=7;i++) - Bnd2.Add(transformToOutside(Bnd.CalcPoint(i))); - + if (Bnd.IsValid()) { + for (int i =0 ;i<=7;i++) + Bnd2.Add(transformToOutside(Bnd.CalcPoint(i))); + } + return Bnd2; } From 58a84d274821b8ff3f5df20e87fb327d4d3d8ce9 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Sun, 23 Nov 2014 19:23:13 -0200 Subject: [PATCH 02/12] Arch: small fix in sectionplane - fixes #1836 --- src/Mod/Arch/ArchSectionPlane.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/Mod/Arch/ArchSectionPlane.py b/src/Mod/Arch/ArchSectionPlane.py index 099fe99be1a7..b59127d7197f 100644 --- a/src/Mod/Arch/ArchSectionPlane.py +++ b/src/Mod/Arch/ArchSectionPlane.py @@ -107,8 +107,12 @@ def __init__(self,obj): def execute(self,obj): import Part - l = obj.ViewObject.DisplayLength.Value - h = obj.ViewObject.DisplayHeight.Value + if hasattr(obj.ViewObject,"DisplayLength"): + l = obj.ViewObject.DisplayLength.Value + h = obj.ViewObject.DisplayHeight.Value + else: + l = 1 + h = 1 p = Part.makePlane(l,l,Vector(l/2,-l/2,0),Vector(0,0,-1)) # make sure the normal direction is pointing outwards, you never know what OCC will decide... if p.normalAt(0,0).getAngle(obj.Placement.Rotation.multVec(FreeCAD.Vector(0,0,1))) > 1: @@ -206,12 +210,19 @@ def onChanged(self,vobj,prop): if hasattr(vobj,"Transparency"): self.mat2.transparency.setValue(vobj.Transparency/100.0) elif prop in ["DisplayLength","DisplayHeight","ArrowSize"]: - ld = vobj.DisplayLength.Value/2 - hd = vobj.DisplayHeight.Value/2 + if hasattr(vobj,"DisplayLength"): + ld = vobj.DisplayLength.Value/2 + hd = vobj.DisplayHeight.Value/2 + else: + ld = 1 + hd = 1 verts = [] fverts = [] for v in [[-ld,-hd],[ld,-hd],[ld,hd],[-ld,hd]]: - l1 = vobj.ArrowSize.Value if vobj.ArrowSize.Value > 0 else 0.1 + if hasattr(vobj,"ArrowSize"): + l1 = vobj.ArrowSize.Value if vobj.ArrowSize.Value > 0 else 0.1 + else: + l1 = 0.1 l2 = l1/3 pl = FreeCAD.Placement(vobj.Object.Placement) p1 = pl.multVec(Vector(v[0],v[1],0)) From c8934c06a84b882a8d6c8af1d07badae941fa541 Mon Sep 17 00:00:00 2001 From: Sebastian Hoogen Date: Sun, 19 Oct 2014 14:18:52 +0200 Subject: [PATCH 03/12] enhancements in exportDRAWEXE.py simplify float formatting support for Part::Thickness in exportDRAWEXE.py support for Draft::Ellipse in exportDRAWEXE.py support for Annotations --- src/Mod/Sandbox/exportDRAWEXE.py | 98 +++++++++++++++++++++++++------- 1 file changed, 76 insertions(+), 22 deletions(-) diff --git a/src/Mod/Sandbox/exportDRAWEXE.py b/src/Mod/Sandbox/exportDRAWEXE.py index 5b6888f323dd..8ed95d0a56f0 100644 --- a/src/Mod/Sandbox/exportDRAWEXE.py +++ b/src/Mod/Sandbox/exportDRAWEXE.py @@ -32,21 +32,24 @@ # Part:: Wedge, Helix, Spiral, Elipsoid # Draft: Rectangle, BSpline, BezCurve -def f2s(n,angle=False): +def f2s(n,angle=False,axis=False): '''convert to numerical value to string try to remove no significant digits, by guessing a former rounding - if it fail use 18 decimal place in fixed point notation ''' if abs(n) < 1e-14: return '0' - elif len(('%0.13e' % n).split('e')[0].rstrip('0') ) < 6: - return ('%0.10f' % n).rstrip('0').rstrip('.') - elif not angle and len(('%0.15e' % n).split('e')[0].rstrip('0') ) < 15: - return ('%0.15f' % n).rstrip('0').rstrip('.') - elif angle and len(('%0.6e' % n).split('e')[0].rstrip('0') ) < 3: + if angle and len(('%0.6e' % n).split('e')[0].rstrip('0') ) < 3: return ('%0.5f' % n).rstrip('0').rstrip('.') + elif axis and len(('%0.13e' % n).split('e')[0].rstrip('0') ) < 6: + return ('%0.10f' % n).rstrip('0').rstrip('.') else: - return ('%0.18f' % n).rstrip('0').rstrip('.') - #return str(float(n)) + for i in range(20): + s = ('%%1.%df'% i) % n + if float(s) == n: + return s + for i in range(20): + s = ('%%0.%de'% i) % n + if float(s) == n: + return s def polygonstr(r,pcount): import math @@ -80,7 +83,8 @@ def placement2draw(placement,name='object'): dx,dy,dz=placement.Rotation.Axis an=math.degrees(placement.Rotation.Angle) drawcommand += "trotate %s 0 0 0 %s %s %s %s\n" % \ - (name,f2s(dx),f2s(dy),f2s(dz),f2s(an,angle=True)) + (name,f2s(dx,axis=True),f2s(dy,axis=True),f2s(dz,axis=True),\ + f2s(an,angle=True)) if placement.Base.Length > 1e-8: x,y,z=placement.Base drawcommand += "ttranslate %s %s %s %s\n" % \ @@ -137,6 +141,11 @@ def isDraftCircle(ob): import Draft return isinstance(ob.Proxy,Draft._Circle) +def isDraftEllipse(ob): + if isDraftFeature(ob): + import Draft + return isinstance(ob.Proxy,Draft._Ellipse) + def isDraftPolygon(ob): if isDraftFeature(ob): import Draft @@ -316,7 +325,8 @@ def process_object(self,ob,checksupported=False,toplevel=False): hasplacement = not ob.Placement.isNull() else: hasplacement = False - if ob.TypeId in ["Part::Cut","Part::Fuse","Part::Common","Part::Section"]: + if ob.TypeId in ["Part::Cut","Part::Fuse","Part::Common",\ + "Part::Section"]: if checksupported: return True # The object is supported d1.update({'part':ob.Base.Name,'tool':ob.Tool.Name,\ 'command':'b%s' % ob.TypeId[6:].lower()}) @@ -472,6 +482,22 @@ def process_object(self,ob,checksupported=False,toplevel=False): self.csg.write('blend %s %s %s\n' % (d1['name'],ob.Base.Name,\ ' '.join(('%s %s'%(f2s(e[1]),'%s_%d' % (ob.Base.Name,e[0])) \ for e in ob.Edges)))) + elif ob.TypeId == "Part::Thickness" and not ob.SelfIntersection and \ + ob.Mode == 'Skin': + if checksupported: return True # The object is supported + jointype = {'Arc':'a','Intersection':'i','Tangent':'t'} #Join + inter = {False: 'p', True: 'c'} #Intersection + baseobj, facelist = ob.Faces + self.process_object(baseobj) + faces = ' '.join([('%s_%s' %(baseobj.Name,f[4:])) \ + for f in facelist]) + value = f2s(ob.Value) + self.csg.write('explode %s F\n' % baseobj.Name ) + self.csg.write('offsetparameter 1e-7 %s %s\n' % \ + (inter[ob.Intersection],jointype[ob.Join])) + self.csg.write('offsetload %s %s %s\n'%(baseobj.Name,value,faces)) + self.csg.write('offsetperform %s\n' % d1['name'] ) + elif ob.TypeId == "Part::Sweep" and True: if checksupported: return True # The object is supported self.saveSweep(ob) @@ -552,9 +578,11 @@ def process_object(self,ob,checksupported=False,toplevel=False): d1['y']=f2s(ob.Y) d1['z']=f2s(ob.Z) self.csg.write('vertex %(name)s %(x)s %(y)s %(z)s\n' % d1) - - elif isDraftCircle(ob) or ob.TypeId == "Part::Circle": + elif isDraftCircle(ob) or ob.TypeId == "Part::Circle" or \ + isDraftEllipse(ob): if checksupported: return True # The object is supported + isdraftcircle=isDraftCircle(ob) + isdraftellipse=isDraftCircle(ob) "circle name x y [z [dx dy dz]] [ux uy [uz]] radius" curvename = '%s-curve' % d1['name'] if ob.TypeId == "Part::Circle": @@ -564,17 +592,26 @@ def process_object(self,ob,checksupported=False,toplevel=False): self.csg.write('circle %s 0 0 0 %s\n' % (curvename,radius)) self.csg.write('mkedge %s %s %s %s\n' % \ (d1['name'],curvename,pfirst,plast)) - else: - radius=f2s(ob.Radius.Value) - pfirst=f2s(ob.FirstAngle.getValueAs('rad').Value) - plast=f2s(ob.LastAngle.getValueAs('rad').Value) + else: #draft makeface = ob.MakeFace and \ (ob.Shape.isNull() or ob.Shape.ShapeType == 'Face') - #FreeCAD ignore a failed mkplane but it may - #brake the model in DRAWEXE - + #FreeCAD ignores a failed mkplane but it may + #break the model in DRAWEXE edgename = '%s-edge' % d1['name'] - self.csg.write('circle %s 0 0 0 %s\n' % (curvename,radius)) + + if isdraftcircle: + pfirst=f2s(ob.FirstAngle.getValueAs('rad').Value) + plast=f2s(ob.LastAngle.getValueAs('rad').Value) + radius=f2s(ob.Radius.Value) + self.csg.write('circle %s 0 0 0 %s\n' % (curvename,radius)) + else: #draft ellipse + import math + majr=f2s(float(ob.MajorRadius)) + minr=f2s(float(ob.MinorRadius)) + pfirst=0 + plast=2*math.pi + self.csg.write('ellipse %s 0 0 0 %s %s\n' % \ + (curvename,majr,minr)) self.csg.write('mkedge %s %s %s %s\n' % \ (edgename,curvename,pfirst,plast)) if makeface: @@ -583,7 +620,6 @@ def process_object(self,ob,checksupported=False,toplevel=False): self.csg.write('mkplane %s %s\n' % (d1['name'],wirename)) else: self.csg.write('wire %s %s\n' %(d1['name'],edgename)) - elif ob.TypeId == "Part::Line": if checksupported: return True # The object is supported self.csg.write('polyline %s %s %s %s %s %s %s\n' % \ @@ -651,6 +687,9 @@ def process_object(self,ob,checksupported=False,toplevel=False): formatobjtype(ob)) hasplacement = saveShape(self.csg,self.filename,ob.Shape,ob.Name,\ hasplacement,self.cleanshape) + elif ob.isDerivedFrom('App::Annotation') : + return False # ignored here + #anntotations needs to be drawn after erase/donly else: # not derived from Part::Feature if not toplevel: raise ValueError('Can not export child object') @@ -671,12 +710,27 @@ def process_object(self,ob,checksupported=False,toplevel=False): self.csg.write('#Object Label: %s\n' % ob.Label.encode('unicode-escape')) return ob.Name #The object is present and can be referenced + def export_annotations(self,objlst): + for ob in objlst: + if ob.isDerivedFrom('App::Annotation') : + if ob.Name != ob.Label: + self.csg.write('#Annotation Name %s Label %s"\n' % \ + (ob.Name,ob.Label.encode('unicode-escape'))) + else: + self.csg.write('#Annotation %s\n' % (ob.Name)) + v=ob.Position + self.csg.write('dtext %s %s %s "%s"\n' % \ + (f2s(v.x),f2s(v.y),f2s(v.z), '\\n'.join(\ + ob.LabelText).encode(\ + 'ascii', errors='xmlcharrefreplace'))) + def export_objects(self,objlst,toplevel=True): self.write_header() toplevelobjs = [self.process_object(ob, toplevel=toplevel)\ for ob in objlst] names = [name for name in toplevelobjs if name is not False] self.csg.write('donly %s\n'%(' '.join(names))) + self.export_annotations(objlst) #for ob in objlst: # self.process_object(ob,toplevel=toplevel) #self.write_displayonly(objlst) From 428b47d74a70d9f2fa746955d094ac5bf0422d0a Mon Sep 17 00:00:00 2001 From: Sebastian Hoogen Date: Sun, 2 Nov 2014 14:27:32 +0100 Subject: [PATCH 04/12] importOpenSCAD: support for projection(cut=true) --- src/Mod/OpenSCAD/importCSG.py | 34 +++++++++++++++++++++++++++++----- src/Mod/OpenSCAD/tokrules.py | 1 - 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/Mod/OpenSCAD/importCSG.py b/src/Mod/OpenSCAD/importCSG.py index feba25e44a7e..4c58efa15e5f 100644 --- a/src/Mod/OpenSCAD/importCSG.py +++ b/src/Mod/OpenSCAD/importCSG.py @@ -401,7 +401,6 @@ def p_not_supported(p): not_supported : glide LPAREN keywordargument_list RPAREN OBRACE block_list EBRACE | offset LPAREN keywordargument_list RPAREN OBRACE block_list EBRACE | resize LPAREN keywordargument_list RPAREN OBRACE block_list EBRACE - | cut LPAREN keywordargument_list RPAREN OBRACE block_list EBRACE | subdiv LPAREN keywordargument_list RPAREN OBRACE block_list EBRACE ''' if gui and not FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/OpenSCAD").\ @@ -1085,7 +1084,32 @@ def p_polyhedron_action(p) : def p_projection_action(p) : 'projection_action : projection LPAREN keywordargument_list RPAREN OBRACE block_list EBRACE' if printverbose: print 'Projection' - if gui: - from PySide import QtGui - QtGui.QMessageBox.critical(None, unicode(translate('OpenSCAD',"Projection Not yet Coded waiting for Peter Li")),unicode(translate('OpenSCAD'," Press OK"))) - + if p[3]['cut']=='true' : + planedim=1e9 # large but finite + #inifinite planes look bad in the GUI + planename='xy_plane_used_for_project_cut' + obj=doc.addObject('Part::MultiCommon','projection_cut') + plane = doc.getObject(planename) + if not plane: + plane=doc.addObject("Part::Plane",planename) + plane.Length=planedim*2 + plane.Width=planedim*2 + plane.Placement = FreeCAD.Placement(FreeCAD.Vector(\ + -planedim,-planedim,0),FreeCAD.Rotation()) + if gui: + plane.ViewObject.hide() + if (len(p[6]) > 1): + subobj = [fuse(p[6],"projection_cut_implicit_group")] + else: + subobj = p[6] + obj.Shapes = [plane]+subobj + if gui: + subobj[0].ViewObject.hide() + p[0] = [obj] + else: # cut == 'false' => true projection + if gui and not FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/OpenSCAD").\ + GetBool('usePlaceholderForUnsupported'): + from PySide import QtGui + QtGui.QMessageBox.critical(None, unicode(translate('OpenSCAD',"Unsupported Function"))+" : "+p[1],unicode(translate('OpenSCAD',"Press OK"))) + else: + p[0] = [placeholder(p[1],p[6],p[3])] diff --git a/src/Mod/OpenSCAD/tokrules.py b/src/Mod/OpenSCAD/tokrules.py index 849804459484..421ec4e6807a 100644 --- a/src/Mod/OpenSCAD/tokrules.py +++ b/src/Mod/OpenSCAD/tokrules.py @@ -57,7 +57,6 @@ 'projection', 'import', 'color', - 'cut', 'offset', 'resize', ) From c9ab183bf4266e3481cce62099e2e3352f818566 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 24 Nov 2014 14:30:50 +0100 Subject: [PATCH 05/12] + set DBL_MAX as maximum for units --- src/App/PropertyUnits.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/App/PropertyUnits.cpp b/src/App/PropertyUnits.cpp index 8f5220cb4d7b..f1d577f44bfe 100644 --- a/src/App/PropertyUnits.cpp +++ b/src/App/PropertyUnits.cpp @@ -26,6 +26,7 @@ #ifndef _PreComp_ # include # include +# include #endif /// Here the FreeCAD includes sorted by Base,App,Gui...... @@ -45,7 +46,7 @@ using namespace Base; using namespace std; -const PropertyQuantityConstraint::Constraints LengthStandard = {0.0,(double)INT_MAX,1.0}; +const PropertyQuantityConstraint::Constraints LengthStandard = {0.0,DBL_MAX,1.0}; const PropertyQuantityConstraint::Constraints AngleStandard = {-360,360,1.0}; //************************************************************************** From debca91e98f992410033c6ff881b5100ab2873a8 Mon Sep 17 00:00:00 2001 From: Sebastian Hoogen Date: Wed, 26 Nov 2014 10:26:30 +0100 Subject: [PATCH 06/12] remove support for automake --- Makefile.am | 39 -- data/Makefile.am | 11 - data/examples/Makefile.am | 15 - src/3rdParty/Makefile.am | 132 ---- src/3rdParty/Pivy/Makefile.am | 73 --- src/3rdParty/salomesmesh/Makefile.am | 389 ------------ src/App/Makefile.am | 141 ----- src/Base/Makefile.am | 306 ---------- src/Build/Makefile.am | 18 - src/Doc/Makefile.am | 12 - src/Gui/Icons/Makefile.am | 121 ---- src/Gui/Language/Makefile.am | 91 --- src/Gui/Makefile.am | 563 ------------------ src/Gui/TaskView/Makefile.am | 64 -- src/Gui/iisTaskPanel/Makefile.am | 67 --- src/Gui/propertyeditor/Makefile.am | 38 -- src/Main/Makefile.am | 72 --- src/Makefile.am | 8 - src/Mod/Arch/Makefile.am | 70 --- src/Mod/Assembly/App/Makefile.am | 66 -- src/Mod/Assembly/Gui/Makefile.am | 74 --- src/Mod/Assembly/Gui/Resources/Makefile.am | 75 --- src/Mod/Assembly/Makefile.am | 11 - src/Mod/Cam/App/Makefile.am | 112 ---- src/Mod/Cam/Gui/Makefile.am | 78 --- src/Mod/Cam/Makefile.am | 11 - src/Mod/Complete/App/Makefile.am | 46 -- src/Mod/Complete/Gui/Makefile.am | 71 --- src/Mod/Complete/Gui/Resources/Makefile.am | 74 --- src/Mod/Complete/Makefile.am | 11 - src/Mod/Draft/Makefile.am | 145 ----- src/Mod/Drawing/App/Makefile.am | 86 --- src/Mod/Drawing/Gui/Makefile.am | 97 --- src/Mod/Drawing/Gui/Resources/Makefile.am | 92 --- src/Mod/Drawing/Makefile.am | 11 - src/Mod/Drawing/Templates/Makefile.am | 9 - src/Mod/Fem/App/Makefile.am | 85 --- src/Mod/Fem/Gui/Makefile.am | 89 --- src/Mod/Fem/Gui/Resources/Makefile.am | 76 --- src/Mod/Fem/Makefile.am | 11 - src/Mod/Idf/Makefile.am | 49 -- src/Mod/Image/App/Makefile.am | 54 -- src/Mod/Image/Gui/Makefile.am | 137 ----- src/Mod/Image/Makefile.am | 10 - src/Mod/Import/App/Makefile.am | 41 -- src/Mod/Import/Gui/Makefile.am | 90 --- src/Mod/Import/Makefile.am | 11 - src/Mod/Inspection/App/Makefile.am | 72 --- src/Mod/Inspection/Gui/Makefile.am | 91 --- src/Mod/Inspection/Makefile.am | 10 - src/Mod/JtReader/App/Makefile.am | 52 -- src/Mod/JtReader/Makefile.am | 9 - src/Mod/Makefile.am | 52 -- src/Mod/Mesh/App/Makefile.am | 381 ------------ src/Mod/Mesh/Gui/Makefile.am | 179 ------ src/Mod/Mesh/Makefile.am | 11 - src/Mod/MeshPart/App/Makefile.am | 80 --- src/Mod/MeshPart/Gui/Makefile.am | 95 --- src/Mod/MeshPart/Gui/Resources/Makefile.am | 74 --- src/Mod/MeshPart/Makefile.am | 11 - src/Mod/OpenSCAD/Makefile.am | 31 - src/Mod/Part/App/Makefile.am | 305 ---------- src/Mod/Part/Gui/Makefile.am | 298 --------- src/Mod/Part/Makefile.am | 11 - src/Mod/PartDesign/App/Makefile.am | 106 ---- src/Mod/PartDesign/Gui/Makefile.am | 205 ------- src/Mod/PartDesign/Gui/Resources/Makefile.am | 86 --- src/Mod/PartDesign/Makefile.am | 20 - src/Mod/PartDesign/Scripts/Makefile.am | 15 - src/Mod/Plot/Makefile.am | 37 -- src/Mod/Points/App/Makefile.am | 79 --- src/Mod/Points/Gui/Makefile.am | 129 ---- src/Mod/Points/Makefile.am | 11 - src/Mod/Raytracing/App/Makefile.am | 79 --- src/Mod/Raytracing/Gui/Makefile.am | 147 ----- src/Mod/Raytracing/Makefile.am | 11 - src/Mod/Raytracing/Templates/Makefile.am | 7 - src/Mod/ReverseEngineering/App/Makefile.am | 74 --- src/Mod/ReverseEngineering/Gui/Makefile.am | 77 --- .../Gui/Resources/Makefile.am | 75 --- src/Mod/ReverseEngineering/Makefile.am | 11 - src/Mod/Robot/App/Makefile.am | 257 -------- src/Mod/Robot/Gui/Makefile.am | 143 ----- src/Mod/Robot/Gui/Resources/Makefile.am | 88 --- src/Mod/Robot/Lib/Makefile.am | 29 - src/Mod/Robot/Makefile.am | 15 - src/Mod/Sandbox/App/Makefile.am | 53 -- src/Mod/Sandbox/Gui/Makefile.am | 71 --- src/Mod/Sandbox/Makefile.am | 10 - src/Mod/Ship/Makefile.am | 49 -- src/Mod/Sketcher/App/Makefile.am | 108 ---- src/Mod/Sketcher/App/freegcs/Makefile.am | 18 - src/Mod/Sketcher/Gui/Makefile.am | 152 ----- src/Mod/Sketcher/Gui/Resources/Makefile.am | 153 ----- src/Mod/Sketcher/Makefile.am | 11 - src/Mod/Sketcher/Templates/Makefile.am | 7 - src/Mod/Start/App/Makefile.am | 46 -- src/Mod/Start/Gui/Makefile.am | 71 --- src/Mod/Start/Gui/Resources/Makefile.am | 78 --- src/Mod/Start/Makefile.am | 11 - src/Mod/Start/StartPage/Makefile.am | 41 -- src/Mod/TemplatePyMod/Makefile.am | 15 - src/Mod/Test/Gui/Makefile.am | 124 ---- src/Mod/Test/Makefile.am | 21 - src/Mod/Web/Gui/Makefile.am | 74 --- src/Mod/Web/Gui/Resources/Makefile.am | 38 -- src/Mod/Web/Makefile.am | 11 - src/Tools/Makefile.am | 52 -- src/Tools/_TEMPLATE_/App/Makefile.am | 47 -- src/Tools/_TEMPLATE_/Gui/Makefile.am | 79 --- src/Tools/_TEMPLATE_/Makefile.am | 10 - 111 files changed, 8765 deletions(-) delete mode 100644 Makefile.am delete mode 100644 data/Makefile.am delete mode 100644 data/examples/Makefile.am delete mode 100644 src/3rdParty/Makefile.am delete mode 100644 src/3rdParty/Pivy/Makefile.am delete mode 100644 src/3rdParty/salomesmesh/Makefile.am delete mode 100644 src/App/Makefile.am delete mode 100644 src/Base/Makefile.am delete mode 100644 src/Build/Makefile.am delete mode 100644 src/Doc/Makefile.am delete mode 100644 src/Gui/Icons/Makefile.am delete mode 100644 src/Gui/Language/Makefile.am delete mode 100644 src/Gui/Makefile.am delete mode 100644 src/Gui/TaskView/Makefile.am delete mode 100644 src/Gui/iisTaskPanel/Makefile.am delete mode 100644 src/Gui/propertyeditor/Makefile.am delete mode 100644 src/Main/Makefile.am delete mode 100644 src/Makefile.am delete mode 100644 src/Mod/Arch/Makefile.am delete mode 100644 src/Mod/Assembly/App/Makefile.am delete mode 100644 src/Mod/Assembly/Gui/Makefile.am delete mode 100644 src/Mod/Assembly/Gui/Resources/Makefile.am delete mode 100644 src/Mod/Assembly/Makefile.am delete mode 100644 src/Mod/Cam/App/Makefile.am delete mode 100644 src/Mod/Cam/Gui/Makefile.am delete mode 100644 src/Mod/Cam/Makefile.am delete mode 100644 src/Mod/Complete/App/Makefile.am delete mode 100644 src/Mod/Complete/Gui/Makefile.am delete mode 100644 src/Mod/Complete/Gui/Resources/Makefile.am delete mode 100644 src/Mod/Complete/Makefile.am delete mode 100644 src/Mod/Draft/Makefile.am delete mode 100644 src/Mod/Drawing/App/Makefile.am delete mode 100644 src/Mod/Drawing/Gui/Makefile.am delete mode 100644 src/Mod/Drawing/Gui/Resources/Makefile.am delete mode 100644 src/Mod/Drawing/Makefile.am delete mode 100644 src/Mod/Drawing/Templates/Makefile.am delete mode 100755 src/Mod/Fem/App/Makefile.am delete mode 100755 src/Mod/Fem/Gui/Makefile.am delete mode 100755 src/Mod/Fem/Gui/Resources/Makefile.am delete mode 100755 src/Mod/Fem/Makefile.am delete mode 100644 src/Mod/Idf/Makefile.am delete mode 100644 src/Mod/Image/App/Makefile.am delete mode 100644 src/Mod/Image/Gui/Makefile.am delete mode 100644 src/Mod/Image/Makefile.am delete mode 100644 src/Mod/Import/App/Makefile.am delete mode 100644 src/Mod/Import/Gui/Makefile.am delete mode 100644 src/Mod/Import/Makefile.am delete mode 100644 src/Mod/Inspection/App/Makefile.am delete mode 100644 src/Mod/Inspection/Gui/Makefile.am delete mode 100644 src/Mod/Inspection/Makefile.am delete mode 100644 src/Mod/JtReader/App/Makefile.am delete mode 100644 src/Mod/JtReader/Makefile.am delete mode 100644 src/Mod/Makefile.am delete mode 100644 src/Mod/Mesh/App/Makefile.am delete mode 100644 src/Mod/Mesh/Gui/Makefile.am delete mode 100644 src/Mod/Mesh/Makefile.am delete mode 100644 src/Mod/MeshPart/App/Makefile.am delete mode 100644 src/Mod/MeshPart/Gui/Makefile.am delete mode 100644 src/Mod/MeshPart/Gui/Resources/Makefile.am delete mode 100644 src/Mod/MeshPart/Makefile.am delete mode 100644 src/Mod/OpenSCAD/Makefile.am delete mode 100644 src/Mod/Part/App/Makefile.am delete mode 100644 src/Mod/Part/Gui/Makefile.am delete mode 100644 src/Mod/Part/Makefile.am delete mode 100644 src/Mod/PartDesign/App/Makefile.am delete mode 100644 src/Mod/PartDesign/Gui/Makefile.am delete mode 100644 src/Mod/PartDesign/Gui/Resources/Makefile.am delete mode 100644 src/Mod/PartDesign/Makefile.am delete mode 100644 src/Mod/PartDesign/Scripts/Makefile.am delete mode 100644 src/Mod/Plot/Makefile.am delete mode 100644 src/Mod/Points/App/Makefile.am delete mode 100644 src/Mod/Points/Gui/Makefile.am delete mode 100644 src/Mod/Points/Makefile.am delete mode 100644 src/Mod/Raytracing/App/Makefile.am delete mode 100644 src/Mod/Raytracing/Gui/Makefile.am delete mode 100644 src/Mod/Raytracing/Makefile.am delete mode 100644 src/Mod/Raytracing/Templates/Makefile.am delete mode 100644 src/Mod/ReverseEngineering/App/Makefile.am delete mode 100644 src/Mod/ReverseEngineering/Gui/Makefile.am delete mode 100644 src/Mod/ReverseEngineering/Gui/Resources/Makefile.am delete mode 100644 src/Mod/ReverseEngineering/Makefile.am delete mode 100644 src/Mod/Robot/App/Makefile.am delete mode 100644 src/Mod/Robot/Gui/Makefile.am delete mode 100644 src/Mod/Robot/Gui/Resources/Makefile.am delete mode 100644 src/Mod/Robot/Lib/Makefile.am delete mode 100644 src/Mod/Robot/Makefile.am delete mode 100644 src/Mod/Sandbox/App/Makefile.am delete mode 100644 src/Mod/Sandbox/Gui/Makefile.am delete mode 100644 src/Mod/Sandbox/Makefile.am delete mode 100644 src/Mod/Ship/Makefile.am delete mode 100644 src/Mod/Sketcher/App/Makefile.am delete mode 100644 src/Mod/Sketcher/App/freegcs/Makefile.am delete mode 100644 src/Mod/Sketcher/Gui/Makefile.am delete mode 100644 src/Mod/Sketcher/Gui/Resources/Makefile.am delete mode 100644 src/Mod/Sketcher/Makefile.am delete mode 100644 src/Mod/Sketcher/Templates/Makefile.am delete mode 100644 src/Mod/Start/App/Makefile.am delete mode 100644 src/Mod/Start/Gui/Makefile.am delete mode 100644 src/Mod/Start/Gui/Resources/Makefile.am delete mode 100644 src/Mod/Start/Makefile.am delete mode 100644 src/Mod/Start/StartPage/Makefile.am delete mode 100644 src/Mod/TemplatePyMod/Makefile.am delete mode 100644 src/Mod/Test/Gui/Makefile.am delete mode 100644 src/Mod/Test/Makefile.am delete mode 100644 src/Mod/Web/Gui/Makefile.am delete mode 100644 src/Mod/Web/Gui/Resources/Makefile.am delete mode 100644 src/Mod/Web/Makefile.am delete mode 100644 src/Tools/Makefile.am delete mode 100644 src/Tools/_TEMPLATE_/App/Makefile.am delete mode 100644 src/Tools/_TEMPLATE_/Gui/Makefile.am delete mode 100644 src/Tools/_TEMPLATE_/Makefile.am diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index b303e6d540e2..000000000000 --- a/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -ACLOCAL_AMFLAGS = -I m4 - -SUBDIRS=data src - -EXTRA_DIST = \ - cMake/ConfigureChecks.cmake \ - cMake/FindCoin3D.cmake \ - cMake/FindCoin3DDoc.cmake \ - cMake/FindEigen2.cmake \ - cMake/FindEigen3.cmake \ - cMake/FindF2C.cmake \ - cMake/FindODE.cmake \ - cMake/FindOpenCasCade.cmake \ - cMake/FindOpenCV.cmake \ - cMake/FindSoQt.cmake \ - cMake/FindSpnav.cmake \ - cMake/FindXercesC.cmake \ - cMake/FreeCadMacros.cmake \ - cMake/UseLibPack6x.cmake \ - cMake/UseLibPack7x.cmake \ - cMake/UseLibPackCustom.cmake \ - config.h.cmake \ - CMakeLists.txt \ - autogen.sh \ - BuildAll.bat \ - build.sh \ - ChangeLog.txt \ - copying.lib \ - README.Linux \ - README.Win32 - -debian-package: - $(top_srcdir)/package/makedebian.sh - -if HAVE_DOXYGEN -devdoc: - doxygen $(top_builddir)/src/Doc/BuildDevDoc.cfg -endif - diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index f25701ca003c..000000000000 --- a/data/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -SUBDIRS=examples - -# Change data dir from default -datadir = @datadir@/data -data_DATA = \ - License.txt - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt - diff --git a/data/examples/Makefile.am b/data/examples/Makefile.am deleted file mode 100644 index d94f45eca8ed..000000000000 --- a/data/examples/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ - -# Change data dir from default -datadir = @datadir@/data/examples -data_DATA = \ - DrawingExample.FCStd \ - EngineBlock.FCStd \ - PartDesignExample.FCStd \ - RobotExample.FCStd \ - Schenkel.stp \ - ArchDetail.FCStd - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt - diff --git a/src/3rdParty/Makefile.am b/src/3rdParty/Makefile.am deleted file mode 100644 index d887904bf487..000000000000 --- a/src/3rdParty/Makefile.am +++ /dev/null @@ -1,132 +0,0 @@ -#SUBDIRS=Pivy -if HAVE_OPENCASCADE -SUBDIRS=salomesmesh -endif - -EXTRA_DIST = \ - CMakeLists.txt \ - boost/numeric/bindings/LICENSE_1_0.txt \ - boost/numeric/bindings/amos/amos.h \ - boost/numeric/bindings/amos/amos.hpp \ - boost/numeric/bindings/amos/amos_names.h \ - boost/numeric/bindings/amos/amos_overloads.hpp \ - boost/numeric/bindings/atlas/cblas.hpp \ - boost/numeric/bindings/atlas/cblas1.hpp \ - boost/numeric/bindings/atlas/cblas1_overloads.hpp \ - boost/numeric/bindings/atlas/cblas2.hpp \ - boost/numeric/bindings/atlas/cblas2_overloads.hpp \ - boost/numeric/bindings/atlas/cblas3.hpp \ - boost/numeric/bindings/atlas/cblas3_overloads.hpp \ - boost/numeric/bindings/atlas/cblas_enum.hpp \ - boost/numeric/bindings/atlas/cblas_inc.hpp \ - boost/numeric/bindings/atlas/clapack.hpp \ - boost/numeric/bindings/atlas/clapack_inc.hpp \ - boost/numeric/bindings/atlas/clapack_overloads.hpp \ - boost/numeric/bindings/blas/blas.h \ - boost/numeric/bindings/blas/blas.hpp \ - boost/numeric/bindings/blas/blas1.hpp \ - boost/numeric/bindings/blas/blas1_overloads.hpp \ - boost/numeric/bindings/blas/blas2.hpp \ - boost/numeric/bindings/blas/blas2_overloads.hpp \ - boost/numeric/bindings/blas/blas3.hpp \ - boost/numeric/bindings/blas/blas3_overloads.hpp \ - boost/numeric/bindings/blas/blas_names.h \ - boost/numeric/bindings/lapack/gees.hpp \ - boost/numeric/bindings/lapack/geev.hpp \ - boost/numeric/bindings/lapack/geqrf.hpp \ - boost/numeric/bindings/lapack/gesdd.hpp \ - boost/numeric/bindings/lapack/gesv.hpp \ - boost/numeric/bindings/lapack/gesvd.hpp \ - boost/numeric/bindings/lapack/hbev.hpp \ - boost/numeric/bindings/lapack/hbevx.hpp \ - boost/numeric/bindings/lapack/heev.hpp \ - boost/numeric/bindings/lapack/heevd.hpp \ - boost/numeric/bindings/lapack/heevx.hpp \ - boost/numeric/bindings/lapack/hesv.hpp \ - boost/numeric/bindings/lapack/hpsv.hpp \ - boost/numeric/bindings/lapack/hseqr.hpp \ - boost/numeric/bindings/lapack/ilaenv.hpp \ - boost/numeric/bindings/lapack/lapack.h \ - boost/numeric/bindings/lapack/lapack.hpp \ - boost/numeric/bindings/lapack/lapack_names.h \ - boost/numeric/bindings/lapack/orgqr.hpp \ - boost/numeric/bindings/lapack/ormqr.hpp \ - boost/numeric/bindings/lapack/posv.hpp \ - boost/numeric/bindings/lapack/ppsv.hpp \ - boost/numeric/bindings/lapack/spsv.hpp \ - boost/numeric/bindings/lapack/steqr.hpp \ - boost/numeric/bindings/lapack/syev.hpp \ - boost/numeric/bindings/lapack/syevd.hpp \ - boost/numeric/bindings/lapack/syevx.hpp \ - boost/numeric/bindings/lapack/sysv.hpp \ - boost/numeric/bindings/lapack/sytrd.hpp \ - boost/numeric/bindings/lapack/trevc.hpp \ - boost/numeric/bindings/lapack/trexc.hpp \ - boost/numeric/bindings/lapack/workspace.hpp \ - boost/numeric/bindings/umfpack/umfpack.hpp \ - boost/numeric/bindings/umfpack/umfpack_inc.hpp \ - boost/numeric/bindings/umfpack/umfpack_overloads.hpp \ - boost/numeric/bindings/traits/detail/array.hpp \ - boost/numeric/bindings/traits/detail/array_impl.hpp \ - boost/numeric/bindings/traits/detail/generate_const.hpp \ - boost/numeric/bindings/traits/detail/symm_herm_traits.hpp \ - boost/numeric/bindings/traits/detail/ublas_ordering.hpp \ - boost/numeric/bindings/traits/detail/ublas_uplo.hpp \ - boost/numeric/bindings/traits/detail/utils.hpp \ - boost/numeric/bindings/traits/algorithm.hpp \ - boost/numeric/bindings/traits/boost_array.hpp \ - boost/numeric/bindings/traits/c_array.hpp \ - boost/numeric/bindings/traits/config.hpp \ - boost/numeric/bindings/traits/fortran.h \ - boost/numeric/bindings/traits/matrix_raw.hpp \ - boost/numeric/bindings/traits/matrix_traits.hpp \ - boost/numeric/bindings/traits/sparse_traits.hpp \ - boost/numeric/bindings/traits/std_valarray.hpp \ - boost/numeric/bindings/traits/std_vector.hpp \ - boost/numeric/bindings/traits/symm_herm_raw.hpp \ - boost/numeric/bindings/traits/tnt.hpp \ - boost/numeric/bindings/traits/traits.hpp \ - boost/numeric/bindings/traits/transpose.hpp \ - boost/numeric/bindings/traits/type.h \ - boost/numeric/bindings/traits/type.hpp \ - boost/numeric/bindings/traits/type_traits.hpp \ - boost/numeric/bindings/traits/ublas_banded.hpp \ - boost/numeric/bindings/traits/ublas_hermitian.hpp \ - boost/numeric/bindings/traits/ublas_matrix.hpp \ - boost/numeric/bindings/traits/ublas_sparse.hpp \ - boost/numeric/bindings/traits/ublas_symmetric.hpp \ - boost/numeric/bindings/traits/ublas_vector.hpp \ - boost/numeric/bindings/traits/ublas_vector2.hpp \ - boost/numeric/bindings/traits/vector_raw.hpp \ - boost/numeric/bindings/traits/vector_traits.hpp - -# For Debian based system we don't need these sources -if MAKE_NO_DFSG_PACKAGE -EXTRA_DIST += \ - Pivy/gui/__init__.py \ - Pivy/gui/soqt.py \ - Pivy/AUTHORS \ - Pivy/CMakeLists.txt \ - Pivy/coin.py \ - Pivy/coin_header_includes.h \ - Pivy/coin_wrap.cpp \ - Pivy/__init__.py \ - Pivy/LICENSE \ - Pivy/README \ - Pivy/sogui.py \ - Pivy/soqt_wrap.cpp \ - Pivy-0.5/gui/__init__.py \ - Pivy-0.5/gui/soqt.py \ - Pivy-0.5/AUTHORS \ - Pivy-0.5/CMakeLists.txt \ - Pivy-0.5/coin.py \ - Pivy-0.5/coin_header_includes.h \ - Pivy-0.5/coin_wrap.cpp \ - Pivy-0.5/__init__.py \ - Pivy-0.5/LICENSE \ - Pivy-0.5/README \ - Pivy-0.5/sogui.py \ - Pivy-0.5/soqt.py \ - Pivy-0.5/soqt_wrap.cpp -endif - diff --git a/src/3rdParty/Pivy/Makefile.am b/src/3rdParty/Pivy/Makefile.am deleted file mode 100644 index 64ce159d9237..000000000000 --- a/src/3rdParty/Pivy/Makefile.am +++ /dev/null @@ -1,73 +0,0 @@ - -lib_LTLIBRARIES=_coin.la _soqt.la - -#-------------------------------------------------------------------------------------- -# Coin - -_coin_la_SOURCES=\ - coin_wrap.cpp \ - coin_header_includes.h - -# the library search path. -_coin_la_LDFLAGS = $(sim_ac_coin_ldflags) -module -avoid-version -_coin_la_CPPFLAGS = -fno-strict-aliasing - -_coin_la_LIBADD = \ - -l@PYTHON_LIB@ \ - $(sim_ac_coin_libs) - -_coindir = $(prefix)/bin/pivy -_coin_DATA = \ - __init__.py \ - coin.py \ - sogui.py - -#-------------------------------------------------------------------------------------- -# SoQt - -_soqt_la_SOURCES=\ - soqt_wrap.cpp - -# the library search path. -_soqt_la_LDFLAGS = $(sim_ac_coin_ldflags) $(sim_ac_soqt_ldflags) $(QT_LIBS) -module -avoid-version -_soqt_la_CPPFLAGS = -fno-strict-aliasing - -_soqt_la_LIBADD = \ - -l@PYTHON_LIB@ \ - $(sim_ac_coin_libs) \ - $(sim_ac_soqt_libs) - -_soqt.la: $(_soqt_la_OBJECTS) $(_soqt_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir)/gui $(_soqt_la_LDFLAGS) $(_soqt_la_OBJECTS) $(_soqt_la_LIBADD) $(LIBS) - -_soqtdir = $(prefix)/bin/pivy/gui -_soqt_DATA = \ - __init__.py \ - soqt.py - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -AM_CXXFLAGS = $(all_includes) $(QT_CXXFLAGS) -I$(top_srcdir)/src -I$(top_builddir)/src - -libdir = $(prefix)/bin/pivy -install-exec-hook: - $(mkdir_p) $(DESTDIR)$(libdir)/gui - mv $(DESTDIR)$(libdir)/_soqt.* \ - $(DESTDIR)$(libdir)/gui/ - -uninstall-hook: - rm -r $(DESTDIR)$(libdir)/gui - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - __init__.py \ - coin.py \ - sogui.py \ - soqt.py \ - AUTHORS \ - LICENSE \ - README \ - CMakeLists.txt - diff --git a/src/3rdParty/salomesmesh/Makefile.am b/src/3rdParty/salomesmesh/Makefile.am deleted file mode 100644 index 97752e485642..000000000000 --- a/src/3rdParty/salomesmesh/Makefile.am +++ /dev/null @@ -1,389 +0,0 @@ -# dir variable for easy change of Makefile.am locations -smeshdir = ./ - -# copy some files -targetdir = $(prefix) -#dist_target_DATA = LICENCE.lgpl -EXTRA_DIST = CMakeLists.txt LICENCE.lgpl.txt - -# set compiler flags and include directories, -fpermissive and -ffriend-injection not needed for occ6.3 -AM_CPPFLAGS = -I$(OCC_INC) -I$(srcdir)/$(smeshdir)inc/ $(all_includes) -AM_CXXFLAGS = -Wno-sign-compare -Wno-switch -Wno-reorder -Wno-unused -Wno-parentheses -Wno-comment - -# set library names -if NETGEN -lib_LTLIBRARIES = libNETGENPlugin.la libSMDS.la libDriver.la libDriverSTL.la libDriverDAT.la libDriverUNV.la libSMESHDS.la libSMESH.la libStdMeshers.la -else -lib_LTLIBRARIES = libDriver.la libSMDS.la libDriverSTL.la libDriverDAT.la libDriverUNV.la libSMESHDS.la libSMESH.la libStdMeshers.la -endif - -# set global linker flags (remove '-Wl,--no-undefined' since this doesn't seem to work on MacOSX) -#AM_LDFLAGS = -version-info 1:0:0 -Wl,--no-undefined -L$(OCC_LIB) -AM_LDFLAGS = -version-info 1:0:0 -L$(OCC_LIB) \ - -lTKernel -lTKService -lTKMath -lTKBRep -lTKTopAlgo -lTKGeomAlgo \ - -lTKGeomBase -lTKG3d -lTKG2d -lTKMeshVS -lTKShHealing -lTKPrim - -#uninstall-local: -# -rm -rf $(DESTDIR)$(libdir) -# -rm -rf $(DESTDIR)$(includedir) -# -rm $(DESTDIR)$(prefix)/env_smesh.sh -# -#install-exec-local: -# test -z "$(DESTDIR)$(prefix)" || $(mkdir_p) "$(DESTDIR)$(prefix)" -# @echo "#!/bin/bash" > $(DESTDIR)$(prefix)/env_smesh.sh -# @echo "export SMESHROOT="$(prefix) >> $(DESTDIR)$(prefix)/env_smesh.sh -# @echo "if [ -z "LD_LIBRARY_PATH" ];" >> $(DESTDIR)$(prefix)/env_smesh.sh -# @echo "then LD_LIBRARY_PATH="$(libdir)";" >> $(DESTDIR)$(prefix)/env_smesh.sh -# @echo "else LD_LIBRARY_PATH="$(libdir)":\$$LD_LIBRARY_PATH;" >> $(DESTDIR)$(prefix)/env_smesh.sh -# @echo "fi" >> $(DESTDIR)$(prefix)/env_smesh.sh -# chmod a+x $(DESTDIR)$(prefix)/env_smesh.sh - -# set SMDS sources -libSMDS_la_SOURCES = $(srcdir)/$(smeshdir)src/SMDS/SMDS_EdgePosition.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_FaceOfEdges.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_FaceOfNodes.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_FacePosition.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_IteratorOfElements.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_Mesh.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_MeshEdge.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_MeshElement.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_MeshElementIDFactory.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_MeshFace.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_MeshGroup.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_MeshIDFactory.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_MeshNode.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_MeshObject.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_MeshVolume.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_PolygonalFaceOfNodes.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_PolyhedralVolumeOfNodes.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_Position.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_QuadraticEdge.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_QuadraticFaceOfNodes.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_QuadraticVolumeOfNodes.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_SpacePosition.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_VertexPosition.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_VolumeOfFaces.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_VolumeOfNodes.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_MemoryLimit.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_VolumeTool.cpp \ -$(srcdir)/$(smeshdir)src/SMDS/SMDS_Mesh0DElement.cpp - -# set Driver sources -libDriver_la_SOURCES = $(srcdir)/$(smeshdir)src/Driver/Driver_Document.cpp \ -$(srcdir)/$(smeshdir)src/Driver/Driver_Mesh.cpp \ -$(srcdir)/$(smeshdir)src/Driver/Driver_SMDS_Mesh.cpp \ -$(srcdir)/$(smeshdir)src/Driver/Driver_SMESHDS_Mesh.cpp - -# set DriverSTL sources -libDriverSTL_la_SOURCES = $(srcdir)/$(smeshdir)src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp \ -$(srcdir)/$(smeshdir)src/DriverSTL/DriverSTL_W_SMDS_Mesh.cpp - -libDriverSTL_la_LIBADD = -lSMDS -lDriver -libDriverSTL_la_DEPENDENCIES = libSMDS.la libDriver.la - -# set DriverDAT sources -libDriverDAT_la_SOURCES = $(srcdir)/$(smeshdir)src/DriverDAT/DriverDAT_R_SMDS_Mesh.cpp \ -$(srcdir)/$(smeshdir)src/DriverDAT/DriverDAT_R_SMESHDS_Document.cpp \ -$(srcdir)/$(smeshdir)src/DriverDAT/DriverDAT_R_SMESHDS_Mesh.cpp \ -$(srcdir)/$(smeshdir)src/DriverDAT/DriverDAT_W_SMDS_Mesh.cpp \ -$(srcdir)/$(smeshdir)src/DriverDAT/DriverDAT_W_SMESHDS_Document.cpp \ -$(srcdir)/$(smeshdir)src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.cpp - -libDriverDAT_la_LIBADD = -lSMDS -lDriver -libDriverDAT_la_DEPENDENCIES = libSMDS.la libDriver.la - -# set DriverUNV sources -libDriverUNV_la_SOURCES = $(srcdir)/$(smeshdir)src/DriverUNV/DriverUNV_R_SMDS_Mesh.cpp \ -$(srcdir)/$(smeshdir)src/DriverUNV/DriverUNV_R_SMESHDS_Document.cpp \ -$(srcdir)/$(smeshdir)src/DriverUNV/DriverUNV_R_SMESHDS_Mesh.cpp \ -$(srcdir)/$(smeshdir)src/DriverUNV/DriverUNV_W_SMDS_Mesh.cpp \ -$(srcdir)/$(smeshdir)src/DriverUNV/DriverUNV_W_SMESHDS_Document.cpp \ -$(srcdir)/$(smeshdir)src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.cpp \ -$(srcdir)/$(smeshdir)src/DriverUNV/UNV2411_Structure.cpp \ -$(srcdir)/$(smeshdir)src/DriverUNV/UNV2412_Structure.cpp \ -$(srcdir)/$(smeshdir)src/DriverUNV/UNV2417_Structure.cpp \ -$(srcdir)/$(smeshdir)src/DriverUNV/UNV_Utilities.cpp - -libDriverUNV_la_LIBADD = -lSMDS -lDriver -libDriverUNV_la_DEPENDENCIES = libSMDS.la libDriver.la - -# set SMESHDS sources -libSMESHDS_la_SOURCES = $(srcdir)/$(smeshdir)src/SMESHDS/SMESHDS_Command.cpp \ -$(srcdir)/$(smeshdir)src/SMESHDS/SMESHDS_Document.cpp \ -$(srcdir)/$(smeshdir)src/SMESHDS/SMESHDS_Group.cpp \ -$(srcdir)/$(smeshdir)src/SMESHDS/SMESHDS_GroupBase.cpp \ -$(srcdir)/$(smeshdir)src/SMESHDS/SMESHDS_GroupOnGeom.cpp \ -$(srcdir)/$(smeshdir)src/SMESHDS/SMESHDS_Hypothesis.cpp \ -$(srcdir)/$(smeshdir)src/SMESHDS/SMESHDS_Mesh.cpp \ -$(srcdir)/$(smeshdir)src/SMESHDS/SMESHDS_Script.cpp \ -$(srcdir)/$(smeshdir)src/SMESHDS/SMESHDS_SubMesh.cpp - -libSMESHDS_la_LIBADD = -lSMDS -libSMESHDS_la_DEPENDENCIES = libSMDS.la - -# set SMESH sources -libSMESH_la_SOURCES = $(srcdir)/$(smeshdir)src/SMESH/SMESH_0D_Algo.cpp \ -$(srcdir)/$(smeshdir)src/SMESH/SMESH_1D_Algo.cpp \ -$(srcdir)/$(smeshdir)src/SMESH/SMESH_2D_Algo.cpp \ -$(srcdir)/$(smeshdir)src/SMESH/SMESH_3D_Algo.cpp \ -$(srcdir)/$(smeshdir)src/SMESH/SMESH_Algo.cpp \ -$(srcdir)/$(smeshdir)src/SMESH/SMESH_Block.cpp \ -$(srcdir)/$(smeshdir)src/SMESH/SMESH_Exception.cpp \ -$(srcdir)/$(smeshdir)src/SMESH/SMESH_Gen.cpp \ -$(srcdir)/$(smeshdir)src/SMESH/SMESH_Group.cpp \ -$(srcdir)/$(smeshdir)src/SMESH/SMESH_HypoFilter.cpp \ -$(srcdir)/$(smeshdir)src/SMESH/SMESH_Hypothesis.cpp \ -$(srcdir)/$(smeshdir)src/SMESH/SMESH_Mesh.cpp \ -$(srcdir)/$(smeshdir)src/SMESH/SMESH_MeshEditor.cpp \ -$(srcdir)/$(smeshdir)src/SMESH/SMESH_MesherHelper.cpp \ -$(srcdir)/$(smeshdir)src/SMESH/SMESH_Octree.cpp \ -$(srcdir)/$(smeshdir)src/SMESH/SMESH_OctreeNode.cpp \ -$(srcdir)/$(smeshdir)src/SMESH/SMESH_Pattern.cpp \ -$(srcdir)/$(smeshdir)src/SMESH/SMESH_subMesh.cpp \ -$(srcdir)/$(smeshdir)src/SMESH/SMESH_MeshVSLink.cpp \ -$(srcdir)/$(smeshdir)src/Controls/SMESHControls.cpp \ -$(srcdir)/$(smeshdir)src/Controls/SMESH_Controls.cpp - -libSMESH_la_LIBADD = -lSMDS -lSMESHDS -lDriver -lDriverSTL -lDriverUNV -lDriverDAT -libSMESH_la_DEPENDENCIES = libSMDS.la libSMESHDS.la libDriver.la \ - libDriverSTL.la libDriverUNV.la libDriverDAT.la - -# set StdMeshers sources -libStdMeshers_la_SOURCES = $(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Arithmetic1D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_AutomaticLength.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_CompositeSegment_1D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Deflection1D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Distribution.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_FaceSide.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Hexa_3D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_LayerDistribution.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_LengthFromEdges.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_LocalLength.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_MaxElementArea.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_MaxElementVolume.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_MEFISTO_2D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_NotConformAllowed.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_NumberOfLayers.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_NumberOfSegments.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Penta_3D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Prism_3D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_ProjectionSource1D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_ProjectionSource2D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_ProjectionSource3D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_ProjectionUtils.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Projection_1D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Projection_2D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Projection_3D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Propagation.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_QuadranglePreference.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Quadrangle_2D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_QuadraticMesh.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_RadialPrism_3D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_Regular_1D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_SegmentAroundVertex_0D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_TrianglePreference.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_UseExisting_1D2D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_MaxLength.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_StartEndLength.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_FixedPoints1D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_LayerDistribution2D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_NumberOfLayers2D.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_QuadrangleParams.cpp \ -$(srcdir)/$(smeshdir)src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp \ -$(srcdir)/$(smeshdir)src/MEFISTO2/aptrte.cpp \ -$(srcdir)/$(smeshdir)src/MEFISTO2/trte.f - -libStdMeshers_la_LIBADD = $(FCLIBS) -lSMESH -lSMDS -lSMESHDS -libStdMeshers_la_DEPENDENCIES = libSMESH.la libSMDS.la libSMESHDS.la -if STDMESHERS64BIT -libStdMeshers_la_CXXFLAGS = $(AM_CXXFLAGS) -DPCLINUX64 -endif - -# set NETGENPlugin sources -libNETGENPlugin_la_SOURCES = $(srcdir)/$(smeshdir)src/NETGENPlugin/NETGENPlugin_Hypothesis.cpp \ -$(srcdir)/$(smeshdir)src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cpp \ -$(srcdir)/$(smeshdir)src/NETGENPlugin/NETGENPlugin_Mesher.cpp \ -$(srcdir)/$(smeshdir)src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cpp \ -$(srcdir)/$(smeshdir)src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cpp \ -$(srcdir)/$(smeshdir)src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp \ -$(srcdir)/$(smeshdir)src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cpp \ -$(srcdir)/$(smeshdir)src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cpp \ -$(srcdir)/$(smeshdir)src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp - -# include files but do not install otherwise use include_HEADERS -#includedir = @includedir@/salomesmesh -noinst_HEADERS = \ -$(srcdir)/$(smeshdir)inc/aptrte.h \ -$(srcdir)/$(smeshdir)inc/DriverDAT_R_SMDS_Mesh.h \ -$(srcdir)/$(smeshdir)inc/DriverDAT_R_SMESHDS_Document.h \ -$(srcdir)/$(smeshdir)inc/DriverDAT_R_SMESHDS_Mesh.h \ -$(srcdir)/$(smeshdir)inc/DriverDAT_W_SMDS_Mesh.h \ -$(srcdir)/$(smeshdir)inc/DriverDAT_W_SMESHDS_Document.h \ -$(srcdir)/$(smeshdir)inc/DriverDAT_W_SMESHDS_Mesh.h \ -$(srcdir)/$(smeshdir)inc/DriverSTL_R_SMDS_Mesh.h \ -$(srcdir)/$(smeshdir)inc/DriverSTL_W_SMDS_Mesh.h \ -$(srcdir)/$(smeshdir)inc/DriverUNV_R_SMDS_Mesh.h \ -$(srcdir)/$(smeshdir)inc/DriverUNV_R_SMESHDS_Document.h \ -$(srcdir)/$(smeshdir)inc/DriverUNV_R_SMESHDS_Mesh.h \ -$(srcdir)/$(smeshdir)inc/DriverUNV_W_SMDS_Mesh.h \ -$(srcdir)/$(smeshdir)inc/DriverUNV_W_SMESHDS_Document.h \ -$(srcdir)/$(smeshdir)inc/DriverUNV_W_SMESHDS_Mesh.h \ -$(srcdir)/$(smeshdir)inc/Driver_Document.h \ -$(srcdir)/$(smeshdir)inc/Driver_Mesh.h \ -$(srcdir)/$(smeshdir)inc/Driver_SMDS_Mesh.h \ -$(srcdir)/$(smeshdir)inc/Driver_SMESHDS_Mesh.h \ -$(srcdir)/$(smeshdir)inc/NETGENPlugin_Hypothesis.hxx \ -$(srcdir)/$(smeshdir)inc/NETGENPlugin_Hypothesis_2D.hxx \ -$(srcdir)/$(smeshdir)inc/NETGENPlugin_Mesher.hxx \ -$(srcdir)/$(smeshdir)inc/NETGENPlugin_NETGEN_2D.hxx \ -$(srcdir)/$(smeshdir)inc/NETGENPlugin_NETGEN_2D3D.hxx \ -$(srcdir)/$(smeshdir)inc/NETGENPlugin_NETGEN_3D.hxx \ -$(srcdir)/$(smeshdir)inc/Rn.h \ -$(srcdir)/$(smeshdir)inc/SMDSAbs_ElementType.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_EdgePosition.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_ElemIterator.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_FaceOfEdges.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_FaceOfNodes.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_FacePosition.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_Iterator.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_IteratorOfElements.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_Mesh.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_MeshEdge.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_MeshElement.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_MeshElementIDFactory.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_MeshFace.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_MeshGroup.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_MeshIDFactory.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_MeshNode.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_MeshObject.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_MeshVolume.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_PolygonalFaceOfNodes.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_PolyhedralVolumeOfNodes.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_Position.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_QuadraticEdge.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_QuadraticFaceOfNodes.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_QuadraticVolumeOfNodes.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_SetIterator.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_SpacePosition.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_TypeOfPosition.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_VertexPosition.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_VolumeOfFaces.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_VolumeOfNodes.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_VolumeTool.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_Mesh0DElement.hxx \ -$(srcdir)/$(smeshdir)inc/SMESHDS_Command.hxx \ -$(srcdir)/$(smeshdir)inc/SMESHDS_CommandType.hxx \ -$(srcdir)/$(smeshdir)inc/SMESHDS_Document.hxx \ -$(srcdir)/$(smeshdir)inc/SMESHDS_Group.hxx \ -$(srcdir)/$(smeshdir)inc/SMESHDS_GroupBase.hxx \ -$(srcdir)/$(smeshdir)inc/SMESHDS_GroupOnGeom.hxx \ -$(srcdir)/$(smeshdir)inc/SMESHDS_Hypothesis.hxx \ -$(srcdir)/$(smeshdir)inc/SMESHDS_Mesh.hxx \ -$(srcdir)/$(smeshdir)inc/SMESHDS_Script.hxx \ -$(srcdir)/$(smeshdir)inc/SMESHDS_SubMesh.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_0D_Algo.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_1D_Algo.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_2D_Algo.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_3D_Algo.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_Algo.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_Array1.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_Array2.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_Block.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_Comment.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_ComputeError.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_Controls.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_ControlsDef.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_DataMapOfElemPtrSequenceOfElemPtr.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_DefineArray2.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_DefineIndexedMap.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_ExceptHandlers.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_Exception.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_Gen.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_Group.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_HypoFilter.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_Hypothesis.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_IndexedDataMapOfShapeIndexedMapOfShape.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_IndexedMap.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_Mesh.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_MeshEditor.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_MesherHelper.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_MeshVSLink.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_MeshVSLink.ixx \ -$(srcdir)/$(smeshdir)inc/SMESH_MeshVSLink.jxx \ -$(srcdir)/$(smeshdir)inc/Handle_SMESH_MeshVSLink.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_Octree.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_OctreeNode.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_Pattern.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_SequenceOfElemPtr.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_SequenceOfNode.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_subMesh.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_subMeshEventListener.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_Arithmetic1D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_AutomaticLength.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_CompositeSegment_1D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_Deflection1D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_Distribution.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_FaceSide.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_Hexa_3D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_LayerDistribution.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_LengthFromEdges.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_LocalLength.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_MaxElementArea.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_MaxElementVolume.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_MEFISTO_2D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_NotConformAllowed.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_NumberOfLayers.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_NumberOfSegments.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_Penta_3D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_Prism_3D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_ProjectionSource1D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_ProjectionSource2D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_ProjectionSource3D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_ProjectionUtils.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_Projection_1D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_Projection_2D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_Projection_3D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_Propagation.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_QuadranglePreference.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_Quadrangle_2D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_QuadraticMesh.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_RadialPrism_3D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_Regular_1D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_SegmentAroundVertex_0D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_SegmentLengthAroundVertex.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_StartEndLength.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_FixedPoints1D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_LayerDistribution2D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_NumberOfLayers2D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_QuadrangleParams.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_RadialQuadrangle_1D2D.hxx \ -$(srcdir)/$(smeshdir)inc/UNV2411_Structure.hxx \ -$(srcdir)/$(smeshdir)inc/UNV2412_Structure.hxx \ -$(srcdir)/$(smeshdir)inc/UNV2417_Structure.hxx \ -$(srcdir)/$(smeshdir)inc/UNV_Utilities.hxx \ -$(srcdir)/$(smeshdir)inc/NETGENPlugin_Defs.hxx \ -$(srcdir)/$(smeshdir)inc/NETGENPlugin_NETGEN_2D_ONLY.hxx \ -$(srcdir)/$(smeshdir)inc/NETGENPlugin_SimpleHypothesis_2D.hxx \ -$(srcdir)/$(smeshdir)inc/NETGENPlugin_SimpleHypothesis_3D.hxx \ -$(srcdir)/$(smeshdir)inc/SMDS_MeshInfo.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_DriverDAT.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_DriverSTL.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_DriverUNV.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_SMDS.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_SMESH.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_SMESHDS.hxx \ -$(srcdir)/$(smeshdir)inc/SMESH_StdMeshers.hxx \ -$(srcdir)/$(smeshdir)inc/SMESHDS_DataMapOfShape.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_QuadToTriaAdaptor.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_TrianglePreference.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_UseExisting_1D2D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_CompositeHexa_3D.hxx \ -$(srcdir)/$(smeshdir)inc/StdMeshers_MaxLength.hxx \ -$(srcdir)/$(smeshdir)inc/OpUtil.hxx \ -$(srcdir)/$(smeshdir)inc/Utils_ExceptHandlers.hxx \ -$(srcdir)/$(smeshdir)inc/Utils_SALOME_Exception.hxx \ -$(srcdir)/$(smeshdir)inc/utilities.h - diff --git a/src/App/Makefile.am b/src/App/Makefile.am deleted file mode 100644 index ac9a3df9707c..000000000000 --- a/src/App/Makefile.am +++ /dev/null @@ -1,141 +0,0 @@ - -lib_LTLIBRARIES=libFreeCADApp.la - -BUILT_SOURCES=\ - ComplexGeoDataPy.cpp \ - DocumentObjectGroupPy.cpp \ - DocumentObjectPy.cpp \ - DocumentPy.cpp \ - FeaturePythonPy.cpp \ - MaterialPy.cpp \ - PropertyContainerPy.cpp \ - InitScript.h \ - TestScript.h - -libFreeCADApp_la_BUILT=\ - ComplexGeoDataPy.h \ - DocumentObjectGroupPy.h \ - DocumentObjectPy.h \ - DocumentPy.h \ - FeaturePythonPy.h \ - MaterialPy.h \ - PropertyContainerPy.h - -libFreeCADApp_la_SOURCES=\ - Annotation.cpp \ - Annotation.h \ - Application.cpp \ - ApplicationPy.cpp \ - ColorModel.cpp \ - ComplexGeoData.cpp \ - ComplexGeoDataPyImp.cpp \ - Document.cpp \ - DocumentObject.cpp \ - DocumentObjectFileIncluded.cpp \ - DocumentObjectGroup.cpp \ - DocumentObjectGroupPyImp.cpp \ - DocumentObjectPyImp.cpp \ - DocumentObserver.cpp \ - DocumentObserverPython.cpp \ - DocumentPyImp.cpp \ - DynamicProperty.cpp \ - FeaturePython.cpp \ - FeaturePythonPyImp.cpp \ - FeatureTest.cpp \ - GeoFeature.cpp \ - InventorObject.cpp \ - VRMLObject.cpp \ - Material.cpp \ - MaterialPyImp.cpp \ - MeasureDistance.cpp \ - Placement.cpp \ - PreCompiled.cpp \ - PreCompiled.h \ - Property.cpp \ - PropertyFile.cpp \ - PropertyGeo.cpp \ - PropertyContainer.cpp \ - PropertyContainerPyImp.cpp \ - PropertyLinks.cpp \ - PropertyPythonObject.cpp \ - PropertyStandard.cpp \ - PropertyUnits.cpp \ - Transactions.cpp - -includedir = @includedir@/App - -nodist_include_HEADERS=\ - $(libFreeCADApp_la_BUILT) - -include_HEADERS=\ - Application.h \ - ColorModel.h \ - ComplexGeoData.h \ - Document.h \ - DocumentObject.h \ - DocumentObjectFileIncluded.h \ - DocumentObjectGroup.h \ - DocumentObserver.h \ - DocumentObserverPython.h \ - DynamicProperty.h \ - FeaturePython.h \ - FeatureTest.h \ - GeoFeature.h \ - InventorObject.h \ - VRMLObject.h \ - Material.h \ - MeasureDistance.h \ - Placement.h \ - Property.h \ - PropertyFile.h \ - PropertyGeo.h \ - PropertyContainer.h \ - PropertyLinks.h \ - PropertyPythonObject.h \ - PropertyStandard.h \ - PropertyUnits.h \ - Transactions.h - -%Script.h: FreeCAD%.py - $(PYTHON) $(top_srcdir)/src/Tools/PythonToCPP.py $< $@ - -%.cpp: %.xml $(top_srcdir)/src/Tools/generateTemplates/templateClassPyExport.py - $(PYTHON) $(top_srcdir)/src/Tools/generate.py --outputPath $(@D) $< - -# the library search path. -libFreeCADApp_la_LDFLAGS = -L../Base $(QT4_CORE_LIBS) $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ - -libFreeCADApp_la_CPPFLAGS = -DRESOURCEDIR=\"$(datadir)\" -DDOCDIR=\"$(docdir)\" - -libFreeCADApp_la_LIBADD = \ - @BOOST_FILESYSTEM_LIB@ \ - @BOOST_PROGOPTIONS_LIB@ \ - @BOOST_SIGNALS_LIB@ \ - @BOOST_SYSTEM_LIB@ \ - @BOOST_REGEX_LIB@ \ - @ZIPIOS_LIB@ \ - -lFreeCADBase \ - -l@PYTHON_LIB@ \ - -lxerces-c - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src $(all_includes) $(QT4_CORE_CXXFLAGS) - -CLEANFILES = $(BUILT_SOURCES) $(libFreeCADApp_la_BUILT) - -EXTRA_DIST = \ - ComplexGeoDataPy.xml \ - DocumentObjectGroupPy.xml \ - DocumentObjectPy.xml \ - DocumentPy.xml \ - FeaturePythonPy.xml \ - MaterialPy.xml \ - PropertyContainerPy.xml \ - core-app.dox \ - CMakeLists.txt \ - FreeCADInit.py \ - FreeCADTest.py - - - diff --git a/src/Base/Makefile.am b/src/Base/Makefile.am deleted file mode 100644 index d94f38828a07..000000000000 --- a/src/Base/Makefile.am +++ /dev/null @@ -1,306 +0,0 @@ - -lib_LTLIBRARIES=libFreeCADBase.la - -BUILT_SOURCES=\ - moc_FutureWatcherProgress.cpp \ - AxisPy.cpp \ - BaseClassPy.cpp \ - BoundBoxPy.cpp \ - MatrixPy.cpp \ - PersistencePy.cpp \ - PlacementPy.cpp \ - RotationPy.cpp \ - VectorPy.cpp - -if HAVE_SWIG_FOUND -BUILT_SOURCES+=swigpyrun.h -endif - - -libFreeCADBase_la_BUILT=\ - AxisPy.h \ - BaseClassPy.h \ - BoundBoxPy.h \ - MatrixPy.h \ - PersistencePy.h \ - PlacementPy.h \ - RotationPy.h \ - VectorPy.h - -libFreeCADBase_la_SOURCES=\ - Axis.cpp \ - AxisPyImp.cpp \ - Base64.cpp \ - BaseClass.cpp \ - BaseClassPyImp.cpp \ - BoundBoxPyImp.cpp \ - Builder3D.cpp \ - Console.cpp \ - Exception.cpp \ - Factory.cpp \ - FileInfo.cpp \ - FileTemplate.cpp \ - FileTemplate.h \ - FutureWatcherProgress.cpp \ - GeometryPyCXX.cpp \ - gzstream.cpp \ - Handle.cpp \ - InputSource.cpp \ - Interpreter.cpp \ - Matrix.cpp \ - MatrixPyImp.cpp \ - MemDebug.cpp \ - MemDebug.h \ - Parameter.cpp \ - ParameterPy.cpp \ - Persistence.cpp \ - PersistencePyImp.cpp \ - Placement.cpp \ - PlacementPyImp.cpp \ - PreCompiled.cpp \ - PreCompiled.h \ - PyExport.cpp \ - PyObjectBase.cpp \ - PyTools.c \ - PyTools.h \ - Reader.cpp \ - Rotation.cpp \ - RotationPyImp.cpp \ - Sequencer.cpp \ - Stream.cpp \ - Swap.cpp \ - swigpyrun.inl \ - swigpyrun.cpp \ - swigpyrun_1.3.25.cpp \ - swigpyrun_1.3.25.h \ - swigpyrun_1.3.33.cpp \ - swigpyrun_1.3.33.h \ - swigpyrun_1.3.36.cpp \ - swigpyrun_1.3.36.h \ - swigpyrun_1.3.38.cpp \ - swigpyrun_1.3.38.h \ - swigpyrun_1.3.40.cpp \ - swigpyrun_1.3.40.h \ - TimeInfo.cpp \ - Type.cpp \ - Tools.cpp \ - Tools2D.cpp \ - Uuid.cpp \ - UnitsApi.cpp \ - UnitsApi.h \ - UnitsApiPy.cpp \ - UnitsSchema.cpp \ - UnitsSchema.h \ - UnitsSchemaInternal.cpp \ - UnitsSchemaInternal.h \ - UnitsSchemaImperial1.cpp \ - UnitsSchemaImperial1.h \ - UnitsSchemaMKS.cpp \ - UnitsSchemaMKS.h \ - VectorPyImp.cpp \ - Vector3D.cpp \ - Writer.cpp \ - XMLTools.cpp - -includedir = @includedir@/Base -nodist_include_HEADERS=\ - $(libFreeCADBase_la_BUILT) - -include_HEADERS=\ - Axis.h \ - Base64.h \ - BaseClass.h \ - BoundBox.h \ - Builder3D.h \ - Console.h \ - Exception.h \ - Factory.h \ - FileInfo.h \ - fdstream.hpp \ - FutureWatcherProgress.h \ - GeometryPyCXX.h \ - gzstream.h \ - Handle.h \ - InputSource.h \ - Interpreter.h \ - Matrix.h \ - Observer.h \ - Parameter.h \ - Persistence.h \ - Placement.h \ - PyExport.h \ - PyObjectBase.h \ - Reader.h \ - Rotation.h \ - Sequencer.h \ - Stream.h \ - Swap.h \ - TimeInfo.h \ - Type.h \ - Tools.h \ - Tools2D.h \ - Uuid.h \ - Vector3D.h \ - ViewProj.h \ - Writer.h \ - XMLTools.h - -if HAVE_SWIG_FOUND -swigpyrun.h: - $(SWIG) -python -external-runtime -endif - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -%.cpp: %.xml $(top_srcdir)/src/Tools/generateTemplates/templateClassPyExport.py - $(PYTHON) $(top_srcdir)/src/Tools/generate.py --outputPath $(@D) $< - -libFreeCADBase_la_LIBADD = \ - @BOOST_REGEX_LIB@ @BOOST_FILESYSTEM_LIB@ \ - @BOOST_SYSTEM_LIB@ @ZIPIOS_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lz - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) $(QT4_CORE_CXXFLAGS) -AM_CFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) - -CLEANFILES = $(BUILT_SOURCES) $(libFreeCADBase_la_BUILT) - -# the library version number -libFreeCADBase_la_LDFLAGS = $(QT4_CORE_LIBS) $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libFreeCADBase_la_CPPFLAGS = -DHAVE_SWIG=$(HAVE_SWIG) - - -EXTRA_DIST = \ - CMakeLists.txt \ - AxisPy.xml \ - BaseClassPy.xml \ - BoundBoxPy.xml \ - MatrixPy.xml \ - PersistencePy.xml \ - PlacementPy.xml \ - RotationPy.xml \ - VectorPy.xml \ - lex.UnitsApi.c \ - UnitsApi.tab.c \ - UnitsApi.l \ - UnitsApi.y \ - core-base.dox - -distclean-compile: - # avoid to remove UnitsApi.tab.c - -# ------------------------------------------------------------------------------- -# Debian based systems offer packages for PyCXX and zipios++ but other Linux -# distributions possibly not. Thus, we must prepare a switch for this Makefile -# to use the local or system-wide packages which will also affect the 'make dist' -# target to create source tarballs without the local PyCXX & zipios++ sources. -# ------------------------------------------------------------------------------- - -# PyCXX stuff -if MAKE_NO_DFSG_PACKAGE -PYCXXSRC=../CXX -EXTRA_DIST += \ - $(PYCXXSRC)/Config.hxx \ - $(PYCXXSRC)/Exception.hxx \ - $(PYCXXSRC)/Extensions.hxx \ - $(PYCXXSRC)/IndirectPythonInterface.hxx \ - $(PYCXXSRC)/Objects.hxx \ - $(PYCXXSRC)/Version.hxx \ - $(PYCXXSRC)/WrapPython.h \ - $(PYCXXSRC)/COPYRIGHT \ - $(PYCXXSRC)/pycxx.dox \ - $(PYCXXSRC)/Python2/Config.hxx \ - $(PYCXXSRC)/Python2/CxxDebug.hxx \ - $(PYCXXSRC)/Python2/cxxextensions.c \ - $(PYCXXSRC)/Python2/cxx_extensions.cxx \ - $(PYCXXSRC)/Python2/cxxsupport.cxx \ - $(PYCXXSRC)/Python2/Exception.hxx \ - $(PYCXXSRC)/Python2/ExtensionModule.hxx \ - $(PYCXXSRC)/Python2/ExtensionOldType.hxx \ - $(PYCXXSRC)/Python2/Extensions.hxx \ - $(PYCXXSRC)/Python2/ExtensionType.hxx \ - $(PYCXXSRC)/Python2/ExtensionTypeBase.hxx \ - $(PYCXXSRC)/Python2/IndirectPythonInterface.cxx \ - $(PYCXXSRC)/Python2/IndirectPythonInterface.hxx \ - $(PYCXXSRC)/Python2/Objects.hxx \ - $(PYCXXSRC)/Python2/PythonType.hxx -else -PYCXXSRC=/usr/share/@PYTHON_LIB@/CXX -endif - -nodist_libFreeCADBase_la_SOURCES=\ - $(PYCXXSRC)/cxxextensions.c \ - $(PYCXXSRC)/cxx_extensions.cxx \ - $(PYCXXSRC)/cxxsupport.cxx \ - $(PYCXXSRC)/IndirectPythonInterface.cxx - -# zipios++ stuff -if MAKE_NO_DFSG_PACKAGE -ZIPIOS_SRC=../zipios++ -nodist_libFreeCADBase_la_SOURCES += \ - $(ZIPIOS_SRC)/basicentry.cpp \ - $(ZIPIOS_SRC)/collcoll.cpp \ - $(ZIPIOS_SRC)/deflateoutputstreambuf.cpp \ - $(ZIPIOS_SRC)/dircoll.cpp \ - $(ZIPIOS_SRC)/directory.cpp \ - $(ZIPIOS_SRC)/fcoll.cpp \ - $(ZIPIOS_SRC)/fcollexceptions.cpp \ - $(ZIPIOS_SRC)/fileentry.cpp \ - $(ZIPIOS_SRC)/filepath.cpp \ - $(ZIPIOS_SRC)/filterinputstreambuf.cpp \ - $(ZIPIOS_SRC)/filteroutputstreambuf.cpp \ - $(ZIPIOS_SRC)/gzipoutputstream.cpp \ - $(ZIPIOS_SRC)/gzipoutputstreambuf.cpp \ - $(ZIPIOS_SRC)/inflateinputstreambuf.cpp \ - $(ZIPIOS_SRC)/zipfile.cpp \ - $(ZIPIOS_SRC)/ziphead.cpp \ - $(ZIPIOS_SRC)/zipheadio.cpp \ - $(ZIPIOS_SRC)/zipinputstream.cpp \ - $(ZIPIOS_SRC)/zipinputstreambuf.cpp \ - $(ZIPIOS_SRC)/zipoutputstreambuf.cpp \ - $(ZIPIOS_SRC)/zipoutputstream.cpp - -EXTRA_DIST += \ - $(ZIPIOS_SRC)/backbuffer.h \ - $(ZIPIOS_SRC)/basicentry.h \ - $(ZIPIOS_SRC)/collcoll.h \ - $(ZIPIOS_SRC)/deflateoutputstreambuf.h \ - $(ZIPIOS_SRC)/dircoll.h \ - $(ZIPIOS_SRC)/directory.h \ - $(ZIPIOS_SRC)/fcoll.h \ - $(ZIPIOS_SRC)/fcollexceptions.h \ - $(ZIPIOS_SRC)/fileentry.h \ - $(ZIPIOS_SRC)/filepath.h \ - $(ZIPIOS_SRC)/filterinputstreambuf.h \ - $(ZIPIOS_SRC)/filteroutputstreambuf.h \ - $(ZIPIOS_SRC)/gzipoutputstream.h \ - $(ZIPIOS_SRC)/gzipoutputstreambuf.h \ - $(ZIPIOS_SRC)/inflateinputstreambuf.h \ - $(ZIPIOS_SRC)/meta-iostreams.h \ - $(ZIPIOS_SRC)/outputstringstream.h \ - $(ZIPIOS_SRC)/simplesmartptr.h \ - $(ZIPIOS_SRC)/virtualseeker.h \ - $(ZIPIOS_SRC)/zipfile.h \ - $(ZIPIOS_SRC)/ziphead.h \ - $(ZIPIOS_SRC)/zipheadio.h \ - $(ZIPIOS_SRC)/zipinputstream.h \ - $(ZIPIOS_SRC)/zipinputstreambuf.h \ - $(ZIPIOS_SRC)/zipios_common.h \ - $(ZIPIOS_SRC)/zipios-config.h \ - $(ZIPIOS_SRC)/zipios_defs.h \ - $(ZIPIOS_SRC)/zipoutputstreambuf.h \ - $(ZIPIOS_SRC)/zipoutputstream.h \ - $(nodist_libFreeCADBase_la_SOURCES) \ - $(ZIPIOS_SRC)/zipios.dox -endif - diff --git a/src/Build/Makefile.am b/src/Build/Makefile.am deleted file mode 100644 index 56582de335f7..000000000000 --- a/src/Build/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ - -BUILT_SOURCES = \ - Version.h - -Version.h: Version.h.in - $(PYTHON) $(top_srcdir)/src/Tools/SubWCRev.py --srcdir=$(top_srcdir) --bindir=$(top_builddir) - - -include_HEADERS=\ - Version.h - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - BuildVersion.bat \ - Version.h.in \ - CMakeLists.txt - diff --git a/src/Doc/Makefile.am b/src/Doc/Makefile.am deleted file mode 100644 index 8580d1a61e8f..000000000000 --- a/src/Doc/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -doc_DATA = \ - freecad.qch \ - freecad.qhc \ - Start_Page.html - -EXTRA_DIST = \ - $(doc_DATA) \ - CMakeLists.txt \ - doctips.dox \ - mainpage.dox \ - primary-groups.dox \ - FreecadDoxygenLayout.xml diff --git a/src/Gui/Icons/Makefile.am b/src/Gui/Icons/Makefile.am deleted file mode 100644 index a2f753923ba4..000000000000 --- a/src/Gui/Icons/Makefile.am +++ /dev/null @@ -1,121 +0,0 @@ -noinst_LTLIBRARIES=libIcons.la - -BUILT_SOURCES=\ - qrc_resource.cpp - -nodist_libIcons_la_SOURCES=\ - qrc_resource.cpp - -data_DATA = freecad.xpm freecad-doc.png - -EXTRA_DIST = \ - $(data_DATA) \ - ClassBrowser/const_member.png \ - ClassBrowser/member.png \ - ClassBrowser/method.png \ - ClassBrowser/property.png \ - ClassBrowser/type_class.png \ - ClassBrowser/type_enum.png \ - ClassBrowser/type_module.png \ - ClassBrowser/const_member.svg \ - ClassBrowser/member.svg \ - ClassBrowser/method.svg \ - ClassBrowser/property.svg \ - ClassBrowser/type_class.svg \ - ClassBrowser/type_enum.svg \ - ClassBrowser/type_module.svg \ - add.png \ - delete.png \ - edit_remove.png \ - mouse_pointer.png \ - BmpFactoryIcons.cpp \ - background.xpm \ - bulb.xpm \ - button_down.xpm \ - button_left.xpm \ - button_right.xpm \ - button_up.xpm \ - Document.xpm \ - Feature.xpm \ - freecadsplash.png \ - freecad.svg \ - images.cpp \ - macro-execute.svg \ - macro-record.svg \ - macro-stop.svg \ - preferences-display.svg \ - preferences-general.svg \ - Std_ViewScreenShot.svg \ - utilities-terminal.svg \ - breakpoint.png \ - debug-marker.png \ - debug-start.svg \ - debug-stop.svg \ - document-new.svg \ - document-open.svg \ - document-save.svg \ - document-save-as.svg \ - document-print.svg \ - document-properties.svg \ - system-log-out.svg \ - edit_Cancel.svg \ - edit_OK.svg \ - edit-copy.svg \ - edit-cut.svg \ - edit-delete.svg \ - edit-edit.svg \ - edit-paste.svg \ - edit-select-all.svg \ - edit-select-box.svg \ - edit-redo.svg \ - edit-undo.svg \ - preferences-system.svg \ - window-new.svg \ - camera-photo.svg \ - applications-accessories.svg \ - accessories-text-editor.svg \ - help-browser.svg \ - spaceball_button.svg \ - SpNav-PanLR.png \ - SpNav-PanUD.png \ - SpNav-Roll.png \ - SpNav-Spin.png \ - SpNav-Tilt.png \ - SpNav-Zoom.png \ - view-unselectable.svg \ - view-refresh.svg \ - view-measurement.svg \ - view-fullscreen.svg \ - view-axometric.svg \ - view-isometric.svg \ - view-perspective.svg \ - view-bottom.svg \ - view-front.svg \ - view-left.svg \ - view-rear.svg \ - view-right.svg \ - view-top.svg \ - view-zoom-all.svg \ - view-zoom-border.svg \ - view-zoom-fit.svg \ - view-zoom-in.svg \ - view-zoom-out.svg \ - view-zoom-selection.svg \ - view-rotate-left.svg \ - view-rotate-right.svg \ - Tree_Annotation.svg \ - Tree_Dimension.svg \ - Tree_Python.svg \ - resource.qrc - - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(QT_CXXFLAGS) $(all_includes) - -CLEANFILES = $(BUILT_SOURCES) - diff --git a/src/Gui/Language/Makefile.am b/src/Gui/Language/Makefile.am deleted file mode 100644 index 1033bb0ffdda..000000000000 --- a/src/Gui/Language/Makefile.am +++ /dev/null @@ -1,91 +0,0 @@ -noinst_LTLIBRARIES=libLanguage.la - -BUILT_SOURCES=\ - moc_Translator.cpp \ - qrc_translation.cpp - -nodist_libLanguage_la_SOURCES=\ - qrc_translation.cpp - -libLanguage_la_SOURCES=\ - Translator.cpp \ - Translator.h - -EXTRA_DIST = \ - translation.qrc \ - FreeCAD.po \ - FreeCAD_af.qm \ - FreeCAD_de.qm \ - FreeCAD_es-ES.qm \ - FreeCAD_fi.qm \ - FreeCAD_fr.qm \ - FreeCAD_hr.qm \ - FreeCAD_it.qm \ - FreeCAD_nl.qm \ - FreeCAD_no.qm \ - FreeCAD_pl.qm \ - FreeCAD_pt-BR.qm \ - FreeCAD_ru.qm \ - FreeCAD_sv-SE.qm \ - FreeCAD_uk.qm \ - FreeCAD_zh-CN.qm \ - FreeCAD_zh-TW.qm \ - FreeCAD_cs.qm \ - FreeCAD_tr.qm \ - FreeCAD_hu.qm \ - FreeCAD_ja.qm \ - FreeCAD_ro.qm \ - FreeCAD_sk.qm \ - FreeCAD_af.ts \ - FreeCAD_de.ts \ - FreeCAD_es-ES.ts \ - FreeCAD_fi.ts \ - FreeCAD_fr.ts \ - FreeCAD_hr.ts \ - FreeCAD_it.ts \ - FreeCAD_nl.ts \ - FreeCAD_no.ts \ - FreeCAD_pl.ts \ - FreeCAD_pt-BR.ts \ - FreeCAD_ru.ts \ - FreeCAD_sv-SE.ts \ - FreeCAD_uk.ts \ - FreeCAD_zh-CN.ts \ - FreeCAD_zh-TW.ts \ - FreeCAD_cs.ts \ - FreeCAD_tr.ts \ - FreeCAD_hu.ts \ - FreeCAD_ja.ts \ - FreeCAD_ro.ts \ - FreeCAD_sk.ts \ - qt_de.qm \ - qt_es-ES.qm \ - qt_fr.qm \ - qt_it.qm \ - qt_jp.qm \ - qt_pl.qm \ - qt_pt-BR.qm \ - qt_ru.qm \ - qt_sv-SE.qm \ - qt_uk.qm \ - qt_zh-CN.qm - - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(srcdir)/.. $(QT_CXXFLAGS) $(all_includes) - -CLEANFILES = $(BUILT_SOURCES) - diff --git a/src/Gui/Makefile.am b/src/Gui/Makefile.am deleted file mode 100644 index e82edc1260cb..000000000000 --- a/src/Gui/Makefile.am +++ /dev/null @@ -1,563 +0,0 @@ -SUBDIRS=Icons Language propertyeditor iisTaskPanel TaskView - -lib_LTLIBRARIES=libFreeCADGui.la - -BUILT_SOURCES=\ - moc_Action.cpp \ - moc_CallTips.cpp \ - moc_CombiView.cpp \ - moc_Control.cpp \ - moc_DemoMode.cpp \ - moc_DlgActionsImp.cpp \ - moc_DlgActivateWindowImp.cpp \ - moc_DlgCommandsImp.cpp \ - moc_DlgCustomizeImp.cpp \ - moc_DlgCustomizeSpaceball.cpp \ - moc_DlgCustomizeSpNavSettings.cpp \ - moc_DlgDisplayPropertiesImp.cpp \ - moc_DlgEditorImp.cpp \ - moc_DlgGeneralImp.cpp \ - moc_DlgInputDialogImp.cpp \ - moc_DlgKeyboardImp.cpp \ - moc_DlgMacroExecuteImp.cpp \ - moc_DlgMacroRecordImp.cpp \ - moc_DlgMaterialPropertiesImp.cpp \ - moc_DlgEditFileIncludeProptertyExternal.cpp \ - moc_DlgOnlineHelpImp.cpp \ - moc_DlgParameterImp.cpp \ - moc_DlgPreferencesImp.cpp \ - moc_DlgProjectUtility.cpp \ - moc_DlgReportViewImp.cpp \ - moc_DlgRunExternal.cpp \ - moc_DlgSettings3DViewImp.cpp \ - moc_DlgSettingsViewColor.cpp \ - moc_DlgSettingsColorGradientImp.cpp \ - moc_DlgSettingsDocumentImp.cpp \ - moc_DlgSettingsImageImp.cpp \ - moc_DlgSettingsMacroImp.cpp \ - moc_DlgSettingsUnitsImp.cpp \ - moc_DlgTipOfTheDayImp.cpp \ - moc_DlgToolbarsImp.cpp \ - moc_TaskDlgRelocation.cpp \ - moc_DlgUndoRedo.cpp \ - moc_DockWindow.cpp \ - moc_DockWindowManager.cpp \ - moc_DownloadDialog.cpp \ - moc_FileDialog.cpp \ - moc_Flag.cpp \ - moc_GuiApplicationNativeEventAware.cpp \ - moc_HelpView.cpp \ - moc_InputVector.cpp \ - moc_MainWindow.cpp \ - moc_ManualAlignment.cpp \ - moc_NetworkRetriever.cpp \ - moc_OnlineDocumentation.cpp \ - moc_Placement.cpp \ - moc_PrefWidgets.cpp \ - moc_ProgressBar.cpp \ - moc_ProgressDialog.cpp \ - moc_PropertyPage.cpp \ - moc_PropertyView.cpp \ - moc_PythonConsole.cpp \ - moc_PythonDebugger.cpp \ - moc_PythonEditor.cpp \ - moc_EditorView.cpp \ - moc_ReportView.cpp \ - moc_SceneInspector.cpp \ - moc_SelectionView.cpp \ - moc_SpinBox.cpp \ - moc_Splashscreen.cpp \ - moc_TaskPanelView.cpp \ - moc_TextEdit.cpp \ - moc_TextureMapping.cpp \ - moc_ToolBox.cpp \ - moc_Transform.cpp \ - moc_Tree.cpp \ - moc_TreeView.cpp \ - moc_MDIView.cpp\ - moc_View3DInventor.cpp \ - moc_WidgetFactory.cpp \ - moc_Widgets.cpp \ - ui_AboutApplication.h \ - ui_DemoMode.h \ - ui_DlgActions.h \ - ui_DlgActivateWindow.h \ - ui_DlgAuthorization.h \ - ui_DlgChooseIcon.h \ - ui_DlgCommands.h \ - ui_DlgCustomizeSpNavSettings.h \ - ui_DlgDisplayProperties.h \ - ui_DlgEditor.h \ - ui_DlgInputDialog.h \ - ui_DlgKeyboard.h \ - ui_DlgGeneral.h \ - ui_DlgMacroExecute.h \ - ui_DlgMacroRecord.h \ - ui_DlgMaterialProperties.h \ - ui_DlgOnlineHelp.h \ - ui_DlgParameter.h \ - ui_DlgPreferences.h \ - ui_DlgProjectInformation.h \ - ui_DlgProjectUtility.h \ - ui_DlgReportView.h \ - ui_DlgRunExternal.h \ - ui_DlgSettings3DView.h \ - ui_DlgSettingsViewColor.h \ - ui_DlgSettingsColorGradient.h \ - ui_DlgSettingsDocument.h \ - ui_DlgSettingsImage.h \ - ui_DlgSettingsMacro.h \ - ui_DlgSettingsUnits.h \ - ui_DlgTipOfTheDay.h \ - ui_DlgToolbars.h \ - ui_DlgTreeWidget.h \ - ui_DlgLocationAngle.h \ - ui_DlgLocationPos.h \ - ui_SceneInspector.h \ - ui_MouseButtons.h \ - ui_InputVector.h \ - ui_Placement.h \ - ui_TextureMapping.h \ - DocumentPy.cpp \ - PythonWorkbenchPy.cpp \ - SelectionObjectPy.cpp \ - WorkbenchPy.cpp \ - ViewProviderPy.cpp \ - ViewProviderDocumentObjectPy.cpp \ - ViewProviderPythonFeaturePy.cpp \ - GuiInitScript.h - -libFreeCADGui_la_UI=\ - AboutApplication.ui \ - DemoMode.ui \ - DlgActions.ui \ - DlgActivateWindow.ui \ - DlgAuthorization.ui \ - DlgChooseIcon.ui \ - DlgCommands.ui \ - DlgCustomizeSpNavSettings.ui \ - DlgDisplayProperties.ui \ - DlgEditor.ui \ - DlgGeneral.ui \ - DlgInputDialog.ui \ - DlgKeyboard.ui \ - DlgMacroExecute.ui \ - DlgMacroRecord.ui \ - DlgMaterialProperties.ui \ - DlgOnlineHelp.ui \ - DlgParameter.ui \ - DlgPreferences.ui \ - DlgProjectInformation.ui \ - DlgProjectUtility.ui \ - DlgReportView.ui \ - DlgRunExternal.ui \ - DlgSettings3DView.ui \ - DlgSettingsViewColor.ui \ - DlgSettingsDocument.ui \ - DlgSettingsImage.ui \ - DlgSettingsMacro.ui \ - DlgSettingsUnits.ui \ - DlgSettingsColorGradient.ui \ - DlgTipOfTheDay.ui \ - DlgToolbars.ui \ - DlgLocationAngle.ui \ - DlgLocationPos.ui \ - DlgTreeWidget.ui \ - MouseButtons.ui \ - SceneInspector.ui \ - InputVector.ui \ - Placement.ui \ - TextureMapping.ui - -libFreeCADGui_la_BUILT=\ - DocumentPy.h \ - PythonWorkbenchPy.h \ - SelectionObjectPy.h \ - ViewProviderPy.h \ - ViewProviderDocumentObjectPy.h \ - ViewProviderPythonFeaturePy.h \ - WorkbenchPy.h - -libFreeCADGui_la_SOURCES=\ - Inventor/SoDrawingGrid.cpp \ - Action.cpp \ - Application.cpp \ - ApplicationPy.cpp \ - Assistant.cpp \ - Assistant.h \ - BitmapFactory.cpp \ - BlenderNavigationStyle.cpp \ - CADNavigationStyle.cpp \ - CallTips.cpp \ - CombiView.cpp \ - Control.cpp \ - Command.cpp \ - CommandDoc.cpp \ - CommandFeat.cpp \ - CommandMacro.cpp \ - CommandStd.cpp \ - CommandWindow.cpp \ - CommandTest.cpp \ - CommandView.cpp \ - DemoMode.cpp \ - DemoMode.h \ - DlgActionsImp.cpp \ - DlgActionsImp.h \ - DlgActivateWindowImp.cpp \ - DlgActivateWindowImp.h \ - DlgCommandsImp.cpp \ - DlgCommandsImp.h \ - DlgCustomizeImp.cpp \ - DlgCustomizeImp.h \ - DlgCustomizeSpaceball.cpp \ - DlgCustomizeSpaceball.h \ - DlgCustomizeSpNavSettings.cpp \ - DlgCustomizeSpNavSettings.h \ - DlgDisplayPropertiesImp.cpp \ - DlgDisplayPropertiesImp.h \ - DlgEditorImp.cpp \ - DlgEditorImp.h \ - DlgGeneralImp.cpp \ - DlgGeneralImp.h \ - DlgInputDialogImp.cpp \ - DlgInputDialogImp.h \ - DlgKeyboardImp.cpp \ - DlgKeyboardImp.h \ - DlgMacroExecuteImp.cpp \ - DlgMacroExecuteImp.h \ - DlgMacroRecordImp.cpp \ - DlgMacroRecordImp.h \ - DlgMaterialPropertiesImp.cpp \ - DlgMaterialPropertiesImp.h \ - DlgOnlineHelpImp.cpp \ - DlgOnlineHelpImp.h \ - DlgParameterImp.cpp \ - DlgParameterImp.h \ - DlgPreferencesImp.cpp \ - DlgPreferencesImp.h \ - DlgProjectInformationImp.cpp \ - DlgProjectInformationImp.h \ - DlgProjectUtility.cpp \ - DlgProjectUtility.h \ - DlgReportViewImp.cpp \ - DlgReportViewImp.h \ - DlgRunExternal.cpp \ - DlgRunExternal.h \ - DlgEditFileIncludeProptertyExternal.cpp \ - DlgEditFileIncludeProptertyExternal.h \ - DlgSettings3DViewImp.cpp \ - DlgSettings3DViewImp.h \ - DlgSettingsViewColor.cpp \ - DlgSettingsViewColor.h \ - DlgSettingsColorGradientImp.cpp \ - DlgSettingsColorGradientImp.h \ - DlgSettingsDocumentImp.cpp \ - DlgSettingsDocumentImp.h \ - DlgSettingsImageImp.cpp \ - DlgSettingsImageImp.h \ - DlgSettingsMacroImp.cpp \ - DlgSettingsMacroImp.h \ - DlgSettingsUnitsImp.cpp \ - DlgSettingsUnitsImp.h \ - DlgTipOfTheDayImp.cpp \ - DlgTipOfTheDayImp.h \ - DlgToolbarsImp.cpp \ - DlgToolbarsImp.h \ - DownloadDialog.cpp \ - DownloadDialog.h \ - TaskDlgRelocation.cpp \ - TaskDlgRelocation.h \ - DlgUndoRedo.cpp \ - DlgUndoRedo.h \ - DockWindow.cpp \ - DockWindowManager.cpp \ - Document.cpp \ - DocumentPyImp.cpp \ - DocumentModel.cpp \ - FileDialog.cpp \ - Flag.cpp \ - GuiApplicationNativeEventAware.cpp \ - GuiApplicationNativeEventAware.h \ - GuiConsole.cpp \ - GuiConsole.h \ - HelpView.cpp \ - InputVector.cpp \ - InputVector.h \ - InventorNavigationStyle.cpp \ - Placement.cpp \ - Placement.h \ - Macro.cpp \ - MainWindow.cpp \ - ManualAlignment.cpp \ - ManualAlignment.h \ - MDIView.cpp \ - MenuManager.cpp \ - MergeDocuments.cpp \ - MouseSelection.cpp \ - NavigationStyle.cpp \ - NetworkRetriever.cpp \ - OnlineDocumentation.cpp \ - OnlineDocumentation.h \ - PreCompiled.cpp \ - PreCompiled.h \ - PrefWidgets.cpp \ - ProgressBar.cpp \ - ProgressDialog.cpp \ - PropertyPage.cpp \ - PropertyView.cpp \ - PythonConsole.cpp \ - PythonConsolePy.cpp \ - PythonConsolePy.h \ - PythonDebugger.cpp \ - PythonDebugger.h \ - PythonEditor.cpp \ - EditorView.cpp \ - PythonWorkbenchPyImp.cpp \ - ReportView.cpp \ - resource.cpp \ - SceneInspector.cpp \ - SceneInspector.h \ - Selection.cpp \ - SelectionObject.cpp \ - SelectionFilter.cpp \ - SelectionObjectPyImp.cpp \ - SelectionView.cpp \ - SoAxisCrossKit.cpp \ - SoFCBackgroundGradient.cpp \ - SoFCBoundingBox.cpp \ - SoFCColorBar.cpp \ - SoFCColorGradient.cpp \ - SoFCColorLegend.cpp \ - SoFCDB.cpp \ - SoFCDB.h \ - SoFCInteractiveElement.cpp \ - SoNavigationDragger.cpp \ - SoFCOffscreenRenderer.cpp \ - SoFCSelection.cpp \ - SoFCUnifiedSelection.cpp \ - SoFCSelectionAction.cpp \ - SoFCVectorizeSVGAction.cpp \ - SoFCVectorizeU3DAction.cpp \ - SoNavigationDraggerLayout.h \ - SoTextLabel.cpp \ - SpaceballEvent.cpp \ - SpaceballEvent.h \ - SpinBox.cpp \ - Splashscreen.cpp \ - SplitView3DInventor.cpp \ - SyntaxHighlighter.cpp \ - TaskPanelView.cpp \ - TextEdit.cpp \ - TextureMapping.cpp \ - TextureMapping.h \ - Thumbnail.cpp \ - ToolBarManager.cpp \ - ToolBox.cpp \ - ToolBoxManager.cpp \ - TouchpadNavigationStyle.cpp \ - Transform.cpp \ - Transform.h \ - Tree.cpp \ - TreeView.cpp \ - Utilities.cpp \ - View.cpp \ - View3DInventor.cpp \ - View3DInventorExamples.cpp \ - View3DInventorExamples.h \ - View3DInventorViewer.cpp \ - View3DPy.cpp \ - ViewProvider.cpp \ - ViewProviderBuilder.cpp \ - ViewProviderAnnotation.cpp \ - ViewProviderDocumentObject.cpp \ - ViewProviderDocumentObjectGroup.cpp \ - ViewProviderExtern.cpp \ - ViewProviderFeature.cpp \ - ViewProviderGeometryObject.cpp \ - ViewProviderInventorObject.cpp \ - ViewProviderVRMLObject.cpp \ - ViewProviderPyImp.cpp \ - ViewProviderDocumentObjectPyImp.cpp \ - ViewProviderMeasureDistance.cpp \ - ViewProviderPythonFeature.cpp \ - ViewProviderPythonFeaturePyImp.cpp \ - WaitCursor.cpp \ - WhatsThis.cpp \ - WidgetFactory.cpp \ - Widgets.cpp \ - Window.cpp \ - Workbench.cpp \ - WorkbenchFactory.cpp \ - WorkbenchManager.cpp \ - WorkbenchPyImp.cpp - -includedir = @includedir@/Gui -nodist_include_HEADERS=\ - $(libFreeCADGui_la_BUILT) - -include_HEADERS=\ - Inventor/SoDrawingGrid.h \ - Qt4All.h \ - InventorAll.h \ - Action.h \ - Application.h \ - BitmapFactory.h \ - CallTips.h \ - CombiView.h \ - Control.h \ - Command.h \ - DockWindow.h \ - DockWindowManager.h \ - Document.h \ - DocumentModel.h \ - FileDialog.h \ - Flag.h \ - HelpView.h \ - Macro.h \ - MainWindow.h \ - MDIView.h \ - MenuManager.h \ - MergeDocuments.h \ - MouseSelection.h \ - NavigationStyle.h \ - NetworkRetriever.h \ - PrefWidgets.h \ - ProgressBar.h \ - ProgressDialog.h \ - PropertyPage.h \ - PropertyView.h \ - PythonConsole.h \ - PythonEditor.h \ - EditorView.h \ - ReportView.h \ - Selection.h \ - SelectionObject.h \ - SelectionFilter.h \ - SelectionView.h \ - SoAxisCrossKit.h \ - SoFCBackgroundGradient.h \ - SoFCBoundingBox.h \ - SoFCColorBar.h \ - SoFCColorGradient.h \ - SoFCColorLegend.h \ - SoFCInteractiveElement.h \ - SoNavigationDragger.h \ - SoFCOffscreenRenderer.h \ - SoFCSelection.h \ - SoFCUnifiedSelection.h \ - SoFCSelectionAction.h \ - SoFCVectorizeSVGAction.h \ - SoFCVectorizeU3DAction.h \ - SoTextLabel.h \ - SpinBox.h \ - Splashscreen.h \ - SplitView3DInventor.h \ - SyntaxHighlighter.h \ - TaskPanelView.h \ - TextEdit.h \ - Thumbnail.h \ - ToolBarManager.h \ - ToolBox.h \ - ToolBoxManager.h \ - Tree.h \ - TreeView.h \ - Utilities.h \ - View.h \ - View3DInventor.h \ - View3DInventorViewer.h \ - View3DPy.h \ - ViewProvider.h \ - ViewProviderBuilder.h \ - ViewProviderAnnotation.h \ - ViewProviderDocumentObject.h \ - ViewProviderDocumentObjectGroup.h \ - ViewProviderMeasureDistance.h \ - ViewProviderExtern.h \ - ViewProviderFeature.h \ - ViewProviderGeometryObject.h \ - ViewProviderInventorObject.h \ - ViewProviderVRMLObject.h \ - ViewProviderPythonFeature.h \ - WaitCursor.h \ - WhatsThis.h \ - WidgetFactory.h \ - Widgets.h \ - Window.h \ - Workbench.h \ - WorkbenchFactory.h \ - WorkbenchManager.h - -EXTRA_DIST = \ - $(libFreeCADGui_la_UI) \ - SoNavigationDraggerLayout.iv \ - lex.SelectionFilter.c \ - SelectionFilter.l \ - SelectionFilter.y \ - SelectionFilter.tab.c \ - FreeCADGuiInit.py \ - DocumentPy.xml \ - PythonWorkbenchPy.xml \ - SelectionObjectPy.xml \ - WorkbenchPy.xml \ - ViewProviderPy.xml \ - ViewProviderDocumentObjectPy.xml \ - ViewProviderPythonFeaturePy.xml \ - CMakeLists.txt \ - core-gui.dox - -distclean-compile: - # avoid to remove SelectionFilter.tab.c - -# the library search path. -libFreeCADGui_la_LDFLAGS = -L../Base -L../App $(QT_LIBS) $(sim_ac_coin_ldflags) $(sim_ac_coin_libs) \ - $(sim_ac_soqt_ldflags) $(sim_ac_soqt_libs) $(all_libraries) -version-info \ - @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ - -libFreeCADGui_la_LIBADD =\ - Icons/libIcons.la \ - Language/libLanguage.la \ - propertyeditor/libpropertyeditor.la \ - iisTaskPanel/libTaskPanel.la \ - TaskView/libTaskView.la \ - @BOOST_FILESYSTEM_LIB@ @BOOST_SIGNALS_LIB@ \ - @BOOST_PROGOPTIONS_LIB@ @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ @ZIPIOS_LIB@ \ - -lQtUiTools \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp - -if HAVE_SPNAV_FOUND -libFreeCADGui_la_LIBADD += -lspnav -libFreeCADGui_la_CPPFLAGS = -DSPNAV_FOUND -endif - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -%Script.h: FreeCAD%.py - $(PYTHON) $(top_srcdir)/src/Tools/PythonToCPP.py $< $@ - -%.cpp: %.xml $(top_srcdir)/src/Tools/generateTemplates/templateClassPyExport.py - $(PYTHON) $(top_srcdir)/src/Tools/generate.py --outputPath $(@D) $< - - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) $(QT_CXXFLAGS) \ - -I$(sim_ac_coin_includedir) -I$(sim_ac_soqt_includedir) - -CLEANFILES = $(BUILT_SOURCES) $(libFreeCADGui_la_BUILT) - diff --git a/src/Gui/TaskView/Makefile.am b/src/Gui/TaskView/Makefile.am deleted file mode 100644 index ba21333e370b..000000000000 --- a/src/Gui/TaskView/Makefile.am +++ /dev/null @@ -1,64 +0,0 @@ -noinst_LTLIBRARIES=libTaskView.la - -BUILT_SOURCES=\ - moc_TaskAppearance.cpp \ - moc_TaskSelectLinkProperty.cpp \ - moc_TaskDialog.cpp \ - moc_TaskWatcher.cpp \ - moc_TaskEditControl.cpp \ - moc_TaskView.cpp \ - ui_TaskAppearance.h \ - ui_TaskSelectLinkProperty.h \ - ui_TaskEditControl.h - - -libTaskView_la_UI=\ - TaskAppearance.ui \ - TaskSelectLinkProperty.ui \ - TaskEditControl.ui - -libTaskView_la_SOURCES=\ - TaskAppearance.cpp \ - TaskSelectLinkProperty.cpp \ - TaskDialog.cpp \ - TaskDialogPython.cpp \ - TaskWatcher.cpp \ - TaskEditControl.cpp \ - TaskView.cpp - -includedir = @includedir@/Gui/TaskView - -include_HEADERS=\ - TaskAppearance.h \ - TaskSelectLinkProperty.h \ - TaskDialog.h \ - TaskDialogPython.h \ - TaskWatcher.h \ - TaskEditControl.h \ - TaskView.h - -EXTRA_DIST = \ - $(libTaskView_la_UI) - -%.cpp: %.xml $(top_srcdir)/src/Tools/generateTemplates/templateClassPyExport.py - $(PYTHON) $(top_srcdir)/src/Tools/generate.py --outputPath $(@D) $< - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(srcdir)/.. $(QT_CXXFLAGS) $(all_includes) \ - -I$(sim_ac_coin_includedir) -I$(sim_ac_soqt_includedir) - -CLEANFILES = $(BUILT_SOURCES) - diff --git a/src/Gui/iisTaskPanel/Makefile.am b/src/Gui/iisTaskPanel/Makefile.am deleted file mode 100644 index ec20bb067aad..000000000000 --- a/src/Gui/iisTaskPanel/Makefile.am +++ /dev/null @@ -1,67 +0,0 @@ -noinst_LTLIBRARIES=libTaskPanel.la - -BUILT_SOURCES=\ - moc_iisiconlabel.cpp \ - moc_iistaskbox.cpp \ - moc_iistaskgroup.cpp \ - moc_iistaskheader.cpp \ - qrc_iisTaskPanel.cpp - -libTaskPanel_la_SOURCES=\ - src/iisfreecadscheme.cpp \ - src/iisiconlabel.cpp \ - src/iistaskbox.cpp \ - src/iistaskgroup.cpp \ - src/iistaskheader.cpp \ - src/iistaskpanel.cpp \ - src/iistaskpanelscheme.cpp \ - src/iiswinxptaskpanelscheme.cpp \ - include/iisTaskPanel - -nodist_libTaskPanel_la_SOURCES=\ - $(BUILT_SOURCES) - -includedir = @includedir@/Gui/iisTaskPanel/src - -include_HEADERS=\ - src/iisfreecadscheme.h \ - src/iisiconlabel.h \ - src/iistaskbox.h \ - src/iistaskgroup.h \ - src/iistaskheader.h \ - src/iistaskpanel.h \ - src/iistaskpanel_global.h \ - src/iistaskpanelscheme.h \ - src/iiswinxptaskpanelscheme.h - -EXTRA_DIST = \ - src/Resources/headerButtonFold.png \ - src/Resources/headerButtonFold.xpm \ - src/Resources/headerButtonFoldOver.png \ - src/Resources/headerButtonFoldOver_XPBlue1.png \ - src/Resources/headerButtonFoldOver_XPBlue2.png \ - src/Resources/headerButtonFold_XPBlue1.png \ - src/Resources/headerButtonFold_XPBlue2.png \ - src/Resources/headerButtonUnfold.png \ - src/Resources/headerButtonUnfoldOver.png \ - src/Resources/headerButtonUnfoldOver_XPBlue1.png \ - src/Resources/headerButtonUnfoldOver_XPBlue2.png \ - src/Resources/headerButtonUnfold_XPBlue1.png \ - src/Resources/headerButtonUnfold_XPBlue2.png \ - src/Resources/screen2.psd \ - src/iisTaskPanel.qrc - -# rule for Qt MetaObject Compiler: -moc_%.cpp: src/%.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: src/%.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(srcdir)/.. $(QT_CXXFLAGS) $(all_includes) - -CLEANFILES = $(BUILT_SOURCES) - diff --git a/src/Gui/propertyeditor/Makefile.am b/src/Gui/propertyeditor/Makefile.am deleted file mode 100644 index cbed9d25af82..000000000000 --- a/src/Gui/propertyeditor/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -noinst_LTLIBRARIES=libpropertyeditor.la - -BUILT_SOURCES=\ - moc_PropertyEditor.cpp \ - moc_PropertyItem.cpp \ - moc_PropertyItemDelegate.cpp \ - moc_PropertyModel.cpp - -libpropertyeditor_la_SOURCES=\ - PropertyEditor.cpp \ - PropertyItem.cpp \ - PropertyItemDelegate.cpp \ - PropertyModel.cpp - - -includedir = @includedir@/Gui/propertyeditor - -include_HEADERS=\ - PropertyEditor.h \ - PropertyItem.h \ - PropertyItemDelegate.h \ - PropertyModel.h - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(srcdir)/.. $(QT_CXXFLAGS) $(all_includes) \ - -I$(sim_ac_coin_includedir) -I$(sim_ac_soqt_includedir) - -CLEANFILES = $(BUILT_SOURCES) - diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am deleted file mode 100644 index dff78a8f6432..000000000000 --- a/src/Main/Makefile.am +++ /dev/null @@ -1,72 +0,0 @@ -bin_PROGRAMS=FreeCAD FreeCADCmd -lib_LTLIBRARIES=FreeCAD.la FreeCADGui.la - -#-------------------------------------------------------------------------------------- -FreeCAD_SOURCES= \ - MainGui.cpp - -# the library search path. -FreeCAD_LDFLAGS = -L../Base -L../App -L../Gui $(QT_LIBS) $(all_libraries) - -FreeCAD_LDADD=\ - -l@PYTHON_LIB@ \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui - -#-------------------------------------------------------------------------------------- -FreeCADCmd_SOURCES= \ - MainCmd.cpp - -# the library search path. -FreeCADCmd_LDFLAGS = -L../Base -L../App $(all_libraries) - -FreeCADCmd_LDADD=\ - -l@PYTHON_LIB@ \ - -lFreeCADBase \ - -lFreeCADApp - -#-------------------------------------------------------------------------------------- -FreeCAD_la_SOURCES= \ - MainPy.cpp - -# the library search path. -FreeCAD_la_LDFLAGS = -L../Base -L../App $(all_libraries) -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -module -avoid-version - -FreeCAD_la_LIBADD=\ - -ldl \ - -l@PYTHON_LIB@ \ - -lFreeCADBase \ - -lFreeCADApp -#-------------------------------------------------------------------------------------- -FreeCADGui_la_SOURCES= \ - FreeCADGuiPy.cpp - -# the library search path. -FreeCADGui_la_LDFLAGS = -L../Base -L../App -L../Gui $(QT_LIBS) \ - $(sim_ac_coin_ldflags) $(sim_ac_coin_libs) \ - $(sim_ac_soqt_ldflags) $(sim_ac_soqt_libs) \ - $(all_libraries) -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -module -avoid-version - -FreeCADGui_la_LIBADD=\ - -ldl \ - -l@PYTHON_LIB@ \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \ - $(QT_CXXFLAGS) $(all_includes) \ - -I$(sim_ac_coin_includedir) -I$(sim_ac_soqt_includedir) - -EXTRA_DIST = \ - res/FreeCAD.exe.manifest \ - res/FreeCADD.exe.manifest \ - freecad.rc \ - CMakeLists.txt \ - core-main.dox \ - icon.ico - diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index f1889f9aec9b..000000000000 --- a/src/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -SUBDIRS=Build 3rdParty Base App Gui Main Doc Mod Tools - -include_HEADERS = \ - FCConfig.h - -EXTRA_DIST = \ - CMakeLists.txt - diff --git a/src/Mod/Arch/Makefile.am b/src/Mod/Arch/Makefile.am deleted file mode 100644 index 89d59669f3dd..000000000000 --- a/src/Mod/Arch/Makefile.am +++ /dev/null @@ -1,70 +0,0 @@ -#BUILT_SOURCES=\ -# Arch_rc.py - -# rules for Qt Resource Compiler: -#%_rc.py: Resources/%.qrc -# $(PYRCC4) -name $(*F) $< -o $(@F) - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Arch -data_DATA = \ - Arch_rc.py \ - Arch.py \ - ArchComponent.py \ - ArchBuilding.py \ - ArchCell.py \ - ArchFloor.py \ - ifcReader.py \ - importDAE.py \ - importIFC.py \ - importOBJ.py \ - Init.py \ - InitGui.py \ - ArchSite.py \ - ArchStructure.py \ - ArchWall.py \ - ArchSectionPlane.py \ - ArchWindow.py \ - ArchCommands.py \ - ArchAxis.py \ - ArchVRM.py \ - ArchRoof.py - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt \ - arch.dox \ - Resources/Arch.qrc \ - Resources/icons/preferences-arch.svg \ - Resources/icons/Arch_Building.svg \ - Resources/icons/Arch_Cell.svg \ - Resources/icons/Arch_Floor.svg \ - Resources/icons/Arch_Site.svg \ - Resources/icons/Arch_Structure.svg \ - Resources/icons/Arch_Wall.svg \ - Resources/icons/Arch_Add.svg \ - Resources/icons/Arch_Remove.svg \ - Resources/icons/Arch_MeshToShape.svg \ - Resources/icons/Arch_SplitMesh.svg \ - Resources/icons/Arch_RemoveShape.svg \ - Resources/icons/Arch_SectionPlane.svg \ - Resources/icons/Arch_Window.svg \ - Resources/icons/Arch_Wall_Tree.svg \ - Resources/icons/Arch_Cell_Tree.svg \ - Resources/icons/Arch_Building_Tree.svg \ - Resources/icons/Arch_Floor_Tree.svg \ - Resources/icons/Arch_SectionPlane_Tree.svg \ - Resources/icons/Arch_Site_Tree.svg \ - Resources/icons/Arch_Structure_Tree.svg \ - Resources/icons/Arch_Window_Tree.svg \ - Resources/icons/Arch_Axis.svg \ - Resources/icons/Arch_Axis_Tree.svg \ - Resources/icons/Arch_Roof.svg \ - Resources/icons/Arch_Roof_Tree.svg \ - Resources/icons/Arch_CloseHoles.svg \ - Resources/icons/Arch_Check.svg \ - Resources/icons/Arch_SelectNonManifold.svg \ - Resources/ui/archprefs-base.ui - diff --git a/src/Mod/Assembly/App/Makefile.am b/src/Mod/Assembly/App/Makefile.am deleted file mode 100644 index 6d2ed8ac3f02..000000000000 --- a/src/Mod/Assembly/App/Makefile.am +++ /dev/null @@ -1,66 +0,0 @@ - -lib_LTLIBRARIES=libAssembly.la Assembly.la - -libAssembly_la_SOURCES=\ - AppAssemblyPy.cpp \ - PreCompiled.cpp \ - PreCompiled.h - - -# the library search path. -libAssembly_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Mod/Part/App $(all_libraries) -L$(OCC_LIB) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libAssembly_la_CPPFLAGS = -DAssemblyAppExport= - -libAssembly_la_LIBADD = \ - @BOOST_REGEX_LIB@ @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lPart \ - -lTKernel \ - -lTKG2d \ - -lTKG3d \ - -lTKMath \ - -lTKSTEP \ - -lTKIGES \ - -lTKSTL \ - -lTKShHealing \ - -lTKXSBase \ - -lTKBool \ - -lTKBO \ - -lTKBRep \ - -lTKTopAlgo \ - -lTKGeomAlgo \ - -lTKGeomBase \ - -lTKOffset \ - -lTKPrim \ - -lTKHLR - -#-------------------------------------------------------------------------------------- -# Loader of libAssembly - -Assembly_la_SOURCES=\ - AppAssembly.cpp - -# the library search path. -Assembly_la_LDFLAGS = $(libAssembly_la_LDFLAGS) -module -avoid-version -Assembly_la_CPPFLAGS = $(libAssembly_la_CPPFLAGS) - -Assembly_la_LIBADD = \ - $(libAssembly_la_LIBADD) \ - -lAssembly - -Assembly_la_DEPENDENCIES = libAssembly.la - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(OCC_INC) $(all_includes) - - -libdir = $(prefix)/Mod/Assembly - -EXTRA_DIST = \ - CMakeLists.txt diff --git a/src/Mod/Assembly/Gui/Makefile.am b/src/Mod/Assembly/Gui/Makefile.am deleted file mode 100644 index 55eba4b7bcb0..000000000000 --- a/src/Mod/Assembly/Gui/Makefile.am +++ /dev/null @@ -1,74 +0,0 @@ -SUBDIRS=Resources - -lib_LTLIBRARIES=libAssemblyGui.la AssemblyGui.la - -#BUILT_SOURCES - -libAssemblyGui_la_SOURCES=\ - AppAssemblyGuiPy.cpp \ - Command.cpp \ - PreCompiled.cpp \ - PreCompiled.h \ - Workbench.cpp \ - Workbench.h - -# the library search path. -libAssemblyGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui -L../App $(QT_LIBS) $(GL_LIBS) \ - $(all_libraries) -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libAssemblyGui_la_CPPFLAGS = -DAssemblyAppExport= -DAssemblyGuiExport= - -libAssemblyGui_la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui \ - -lAssembly - -#-------------------------------------------------------------------------------------- -# Loader of libAssemblyGui - -AssemblyGui_la_SOURCES=\ - AppAssemblyGui.cpp - -# the library search path. -AssemblyGui_la_LDFLAGS = $(libAssemblyGui_la_LDFLAGS) -module -avoid-version -AssemblyGui_la_CPPFLAGS = $(libAssemblyGui_la_CPPFLAGS) - -AssemblyGui_la_LIBADD = \ - $(libAssemblyGui_la_LIBADD) \ - Resources/libResources.la \ - -lAssemblyGui - -AssemblyGui_la_DEPENDENCIES = libAssemblyGui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(QT_CXXFLAGS) $(all_includes) - - -libdir = $(prefix)/Mod/Assembly - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - CMakeLists.txt - diff --git a/src/Mod/Assembly/Gui/Resources/Makefile.am b/src/Mod/Assembly/Gui/Resources/Makefile.am deleted file mode 100644 index 929834cd9029..000000000000 --- a/src/Mod/Assembly/Gui/Resources/Makefile.am +++ /dev/null @@ -1,75 +0,0 @@ -noinst_LTLIBRARIES=libResources.la - -BUILT_SOURCES=\ - qrc_Assembly.cpp - -nodist_libResources_la_SOURCES=\ - qrc_Assembly.cpp - -EXTRA_DIST = \ - icons/actions/Axle_constraint.svg \ - translations/Assembly_af.qm \ - translations/Assembly_de.qm \ - translations/Assembly_es-ES.qm \ - translations/Assembly_fi.qm \ - translations/Assembly_fr.qm \ - translations/Assembly_hr.qm \ - translations/Assembly_hu.qm \ - translations/Assembly_it.qm \ - translations/Assembly_ja.qm \ - translations/Assembly_nl.qm \ - translations/Assembly_no.qm \ - translations/Assembly_pl.qm \ - translations/Assembly_pt-BR.qm \ - translations/Assembly_ru.qm \ - translations/Assembly_sv-SE.qm \ - translations/Assembly_uk.qm \ - translations/Assembly_zh-CN.qm \ - translations/Assembly_zh-TW.qm \ - translations/Assembly_cs.qm \ - translations/Assembly_tr.qm \ - translations/Assembly_ro.qm \ - translations/Assembly_sk.qm \ - translations/Assembly_af.ts \ - translations/Assembly_de.ts \ - translations/Assembly_es-ES.ts \ - translations/Assembly_fi.ts \ - translations/Assembly_fr.ts \ - translations/Assembly_hr.ts \ - translations/Assembly_hu.ts \ - translations/Assembly_ja.ts \ - translations/Assembly_it.ts \ - translations/Assembly_nl.ts \ - translations/Assembly_no.ts \ - translations/Assembly_pl.ts \ - translations/Assembly_pt-BR.ts \ - translations/Assembly_ru.ts \ - translations/Assembly_sv-SE.ts \ - translations/Assembly_uk.ts \ - translations/Assembly_zh-CN.ts \ - translations/Assembly_zh-TW.ts \ - translations/Assembly_cs.ts \ - translations/Assembly_tr.ts \ - translations/Assembly_ro.ts \ - translations/Assembly_sk.ts \ - Assembly.qrc \ - UpdateResources.bat - - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(srcdir)/.. $(all_includes) $(QT_CXXFLAGS) - -CLEANFILES = $(BUILT_SOURCES) diff --git a/src/Mod/Assembly/Makefile.am b/src/Mod/Assembly/Makefile.am deleted file mode 100644 index ea56f6061fd5..000000000000 --- a/src/Mod/Assembly/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -SUBDIRS=App Gui - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Assembly - -data_DATA = Init.py InitGui.py - -EXTRA_DIST = \ - $(data_DATA) \ - assembly.dox \ - CMakeLists.txt diff --git a/src/Mod/Cam/App/Makefile.am b/src/Mod/Cam/App/Makefile.am deleted file mode 100644 index 5b63a2c399db..000000000000 --- a/src/Mod/Cam/App/Makefile.am +++ /dev/null @@ -1,112 +0,0 @@ - -lib_LTLIBRARIES=libCam.la Cam.la - - -libCam_la_SOURCES=\ - AppCamPy.cpp \ - Approx.cpp \ - Approx.h \ - best_fit.cpp \ - best_fit.h \ - BRepAdaptor_CompCurve2.cxx \ - BRepAdaptor_CompCurve2.h \ - ConvertDyna.cpp \ - ConvertDyna.h \ - cutting_tools.cpp \ - cutting_tools.h \ - deviation.cpp \ - deviation.h \ - edgesort.cpp \ - edgesort.h \ - mergedata.cpp \ - mergedata.h \ - path_simulate.cpp \ - path_simulate.h \ - PreCompiled.cpp \ - PreCompiled.h \ - routine.cpp \ - routine.h \ - stuff.h \ - SpringbackCorrection.cpp \ - SpringbackCorrection.h \ - UniGridApprox.cpp \ - UniGridApprox.h \ - WireExplorer.cxx \ - WireExplorer.h - -# the library search path. -libCam_la_LDFLAGS = -L../../../Base -L../../../App \ - $(sim_ac_coin_ldflags) $(sim_ac_coin_libs) \ - -L../../../Mod/Part/App -L../../../Mod/Mesh/App -L/usr/X11R6/lib -L$(OCC_LIB) -L/usr/lib/atlas \ - $(GTS_LIBS) $(all_libraries) -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libCam_la_CPPFLAGS = $(sim_ac_coin_cppflags) $(sim_ac_soqt_cppflags) -DAppCamExport= - -libCam_la_LIBADD = \ - -lxerces-c \ - -lboost_filesystem \ - -l@PYTHON_LIB@ \ - -lFreeCADBase \ - -lFreeCADApp \ - -lPart \ - -lMesh \ - -lTKernel \ - -lTKG2d \ - -lTKG3d \ - -lTKMath \ - -lTKSTEP \ - -lTKIGES \ - -lTKSTL \ - -lTKShHealing \ - -lTKXSBase \ - -lTKBool \ - -lTKBO \ - -lTKBRep \ - -lTKTopAlgo \ - -lTKGeomAlgo \ - -lTKGeomBase \ - -lTKOffset \ - -lTKPrim \ - -lTKMesh \ - -lblas \ - -lumfpack \ - -lamd \ - -lcblas \ - -lANN \ - -lSMDS \ - -lSMESHDS \ - -lSMESH \ - -lclapack - - -%.cpp: %.xml $(top_srcdir)/src/Tools/generateTemplates/templateClassPyExport.py - $(PYTHON) $(top_srcdir)/src/Tools/generate.py --outputPath $(@D) $< - -#-------------------------------------------------------------------------------------- -# Loader of libCam - -Cam_la_SOURCES=\ - AppCam.cpp - -# the library search path. -Cam_la_LDFLAGS = $(libCam_la_LDFLAGS) -module -avoid-version -Cam_la_CPPFLAGS = $(libCam_la_CPPFLAGS) - -Cam_la_LIBADD = \ - $(libCam_la_LIBADD) \ - -lCam - -Cam_la_DEPENDENCIES = libCam.la - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) -I$(OCC_INC) $(GTS_CFLAGS) \ - -I$(top_srcdir)/src/3rdParty $(QT4_CORE_CXXFLAGS) \ - -I$(top_srcdir)/src/3rdParty/salomesmesh/inc -I$(top_srcdir)/src/3rdParty/ANN/include - -libdir = $(prefix)/Mod/Cam - -CLEANFILES = $(BUILT_SOURCES) $(libCam_la_BUILT) - -EXTRA_DIST = \ - CMakeLists.txt diff --git a/src/Mod/Cam/Gui/Makefile.am b/src/Mod/Cam/Gui/Makefile.am deleted file mode 100644 index 266570c4a41b..000000000000 --- a/src/Mod/Cam/Gui/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ - -lib_LTLIBRARIES=libCamGui.la CamGui.la - -BUILT_SOURCES=\ - ui_Cutting.h \ - moc_Cutting.cpp - -libCamGui_la_SOURCES=\ - Command.cpp \ - Cutting.cpp \ - Cutting.h \ - PreCompiled.cpp \ - PreCompiled.h \ - Workbench.cpp \ - Workbench.h - -# the library search path. -libCamGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui -L../App $(QT_LIBS) $(sim_ac_coin_ldflags) \ - -L../../Part/Gui \ - $(sim_ac_coin_libs) $(sim_ac_soqt_ldflags) $(sim_ac_soqt_libs) -L$(OCC_LIB) $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libCamGui_la_CPPFLAGS = $(sim_ac_coin_cppflags) -DAppCamExport= -DAppCamGuiExport= - -libCamGui_la_LIBADD = \ - -lxerces-c \ - -l@PYTHON_LIB@ \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui \ - -lTKernel \ - -lPartGui \ - -lCam - -#-------------------------------------------------------------------------------------- -# Loader of libCamGui - -CamGui_la_SOURCES=\ - AppCamGui.cpp - -# the library search path. -CamGui_la_LDFLAGS = $(libCamGui_la_LDFLAGS) -module -avoid-version -CamGui_la_CPPFLAGS = $(libCamGui_la_CPPFLAGS) - -CamGui_la_LIBADD = \ - $(libCamGui_la_LIBADD) \ - -lCamGui - -CamGui_la_DEPENDENCIES = libCamGui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(QT_CXXFLAGS) -I$(OCC_INC) $(all_includes) - - -libdir = $(prefix)/Mod/Cam - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - CMakeLists.txt \ - Cutting.ui diff --git a/src/Mod/Cam/Makefile.am b/src/Mod/Cam/Makefile.am deleted file mode 100644 index 6cdecb8abc2f..000000000000 --- a/src/Mod/Cam/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -SUBDIRS=App Gui - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Cam - -data_DATA = Init.py InitGui.py - -EXTRA_DIST = \ - $(data_DATA) \ - cam.dox \ - CMakeLists.txt diff --git a/src/Mod/Complete/App/Makefile.am b/src/Mod/Complete/App/Makefile.am deleted file mode 100644 index 958b16c19724..000000000000 --- a/src/Mod/Complete/App/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -lib_LTLIBRARIES=libComplete.la Complete.la - -libComplete_la_SOURCES=\ - AppCompletePy.cpp \ - CompleteConfiguration.h \ - PreCompiled.cpp \ - PreCompiled.h - - -# the library search path. -libComplete_la_LDFLAGS = -L../../../Base -L../../../App $(all_libraries) -version-info \ - @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libComplete_la_CPPFLAGS = -DCompleteExport= - -libComplete_la_LIBADD = \ - @BOOST_REGEX_LIB@ @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp - -#-------------------------------------------------------------------------------------- -# Loader of libComplete - -Complete_la_SOURCES=\ - AppComplete.cpp - -# the library search path. -Complete_la_LDFLAGS = $(libComplete_la_LDFLAGS) -module -avoid-version -Complete_la_CPPFLAGS = $(libComplete_la_CPPFLAGS) - -Complete_la_LIBADD = \ - $(libComplete_la_LIBADD) \ - -lComplete - -Complete_la_DEPENDENCIES = libComplete.la - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) - -libdir = $(prefix)/Mod/Complete - -EXTRA_DIST = \ - CMakeLists.txt diff --git a/src/Mod/Complete/Gui/Makefile.am b/src/Mod/Complete/Gui/Makefile.am deleted file mode 100644 index 2263b69b5df0..000000000000 --- a/src/Mod/Complete/Gui/Makefile.am +++ /dev/null @@ -1,71 +0,0 @@ -SUBDIRS=Resources - -lib_LTLIBRARIES=libCompleteGui.la CompleteGui.la - -libCompleteGui_la_SOURCES=\ - AppCompleteGuiPy.cpp \ - Command.cpp \ - PreCompiled.cpp \ - PreCompiled.h \ - Workbench.cpp \ - Workbench.h - -# the library search path. -libCompleteGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui -L../App $(QT_LIBS) $(GL_LIBS) \ - $(all_libraries) -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libCompleteGui_la_CPPFLAGS = -DCompleteAppExport= -DCompleteGuiExport= - -libCompleteGui_la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui \ - -lComplete - -#-------------------------------------------------------------------------------------- -# Loader of libCompleteGui - -CompleteGui_la_SOURCES=\ - AppCompleteGui.cpp - -# the library search path. -CompleteGui_la_LDFLAGS = $(libCompleteGui_la_LDFLAGS) -module -avoid-version -CompleteGui_la_CPPFLAGS = $(libCompleteGui_la_CPPFLAGS) - -CompleteGui_la_LIBADD = \ - $(libCompleteGui_la_LIBADD) \ - Resources/libResources.la \ - -lCompleteGui - -CompleteGui_la_DEPENDENCIES = libCompleteGui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(QT_CXXFLAGS) $(all_includes) - -libdir = $(prefix)/Mod/Complete - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - CMakeLists.txt - diff --git a/src/Mod/Complete/Gui/Resources/Makefile.am b/src/Mod/Complete/Gui/Resources/Makefile.am deleted file mode 100644 index 38b9b696a903..000000000000 --- a/src/Mod/Complete/Gui/Resources/Makefile.am +++ /dev/null @@ -1,74 +0,0 @@ -noinst_LTLIBRARIES=libResources.la - -BUILT_SOURCES=\ - qrc_Complete.cpp - -nodist_libResources_la_SOURCES=\ - qrc_Complete.cpp - -EXTRA_DIST = \ - translations/Complete_af.qm \ - translations/Complete_de.qm \ - translations/Complete_es-ES.qm \ - translations/Complete_fi.qm \ - translations/Complete_fr.qm \ - translations/Complete_hr.qm \ - translations/Complete_it.qm \ - translations/Complete_nl.qm \ - translations/Complete_no.qm \ - translations/Complete_pl.qm \ - translations/Complete_pt-BR.qm \ - translations/Complete_ru.qm \ - translations/Complete_sv-SE.qm \ - translations/Complete_uk.qm \ - translations/Complete_zh-CN.qm \ - translations/Complete_zh-TW.qm \ - translations/Complete_cs.qm \ - translations/Complete_tr.qm \ - translations/Complete_ro.qm \ - translations/Complete_sk.qm \ - translations/Complete_ja.qm \ - translations/Complete_hu.qm \ - translations/Complete_af.ts \ - translations/Complete_de.ts \ - translations/Complete_es-ES.ts \ - translations/Complete_fi.ts \ - translations/Complete_fr.ts \ - translations/Complete_hr.ts \ - translations/Complete_it.ts \ - translations/Complete_nl.ts \ - translations/Complete_no.ts \ - translations/Complete_pl.ts \ - translations/Complete_pt-BR.ts \ - translations/Complete_ru.ts \ - translations/Complete_sv-SE.ts \ - translations/Complete_uk.ts \ - translations/Complete_zh-CN.ts \ - translations/Complete_zh-TW.ts \ - translations/Complete_cs.ts \ - translations/Complete_tr.ts \ - translations/Complete_ro.ts \ - translations/Complete_sk.ts \ - translations/Complete_ja.ts \ - translations/Complete_hu.ts \ - Complete.qrc \ - UpdateResources.bat - - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(srcdir)/.. $(QT_CXXFLAGS) $(all_includes) - -CLEANFILES = $(BUILT_SOURCES) diff --git a/src/Mod/Complete/Makefile.am b/src/Mod/Complete/Makefile.am deleted file mode 100644 index e2d98de3db5f..000000000000 --- a/src/Mod/Complete/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -SUBDIRS=App Gui - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Complete - -data_DATA = Init.py InitGui.py - -EXTRA_DIST = \ - $(data_DATA) \ - complete.dox \ - CMakeLists.txt diff --git a/src/Mod/Draft/Makefile.am b/src/Mod/Draft/Makefile.am deleted file mode 100644 index de7bfaab4f8d..000000000000 --- a/src/Mod/Draft/Makefile.am +++ /dev/null @@ -1,145 +0,0 @@ -#BUILT_SOURCES=\ -# Draft_rc.py - -# rules for Qt Resource Compiler: -#%_rc.py: Resources/%.qrc -# $(PYRCC4) -name $(*F) $< -o $(@F) - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Draft -data_DATA = \ - Draft.py \ - DraftTools.py \ - DraftGui.py \ - DraftSnap.py \ - DraftTrackers.py \ - DraftVecUtils.py \ - DraftGeomUtils.py \ - WorkingPlane.py \ - importOCA.py \ - importDXF.py \ - importSVG.py \ - importAirfoilDAT.py \ - Init.py \ - InitGui.py \ - macros.py \ - Draft_rc.py - -nobase_data_DATA = \ - draftlibs/dxfColorMap.py \ - draftlibs/dxfImportObjects.py \ - draftlibs/dxfLibrary.py \ - draftlibs/dxfReader.py \ - draftlibs/__init__.py - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - $(data_DATA) $(nobase_data_DATA) \ - CMakeLists.txt \ - draft.dox \ - Resources/Draft.qrc \ - Resources/icons/Draft_2DShapeView.svg \ - Resources/icons/Draft_AddPoint.svg \ - Resources/icons/Draft_AddToGroup.svg \ - Resources/icons/Draft_Apply.svg \ - Resources/icons/Draft_Arc.svg \ - Resources/icons/Draft_Array.svg \ - Resources/icons/Draft_BSpline.svg \ - Resources/icons/Draft_Circle.svg \ - Resources/icons/Draft_Clone.svg \ - Resources/icons/Draft_Construction.svg \ - Resources/icons/Draft_Cursor.svg \ - Resources/icons/Draft_DelPoint.svg \ - Resources/icons/Draft_Dimension.svg \ - Resources/icons/Draft_Dot.svg \ - Resources/icons/Draft_Downgrade.svg \ - Resources/icons/Draft_Draft2Sketch.svg \ - Resources/icons/Draft_Draft.svg \ - Resources/icons/Draft_Drawing.svg \ - Resources/icons/Draft_Edit.svg \ - Resources/icons/Draft_Finish.svg \ - Resources/icons/Draft_Line.svg \ - Resources/icons/Draft_Lock.svg \ - Resources/icons/Draft_Macro.svg \ - Resources/icons/Draft_Move.svg \ - Resources/icons/Draft_Offset.svg \ - Resources/icons/Draft_Point.svg \ - Resources/icons/Draft_Polygon.svg \ - Resources/icons/Draft_Rectangle.svg \ - Resources/icons/Draft_Rotate.svg \ - Resources/icons/Draft_Scale.svg \ - Resources/icons/Draft_SelectGroup.svg \ - Resources/icons/Draft_SelectPlane.svg \ - Resources/icons/Draft_SwitchMode.svg \ - Resources/icons/Draft_Text.svg \ - Resources/icons/Draft_Trimex.svg \ - Resources/icons/Draft_Upgrade.svg \ - Resources/icons/Draft_Wipe.svg \ - Resources/icons/Draft_Wire.svg \ - Resources/icons/Draft_WireToBSpline.svg \ - Resources/icons/preferences-draft.svg \ - Resources/icons/Snap_Angle.svg \ - Resources/icons/Snap_Center.svg \ - Resources/icons/Snap_Endpoint.svg \ - Resources/icons/Snap_Extension.svg \ - Resources/icons/Snap_Grid.svg \ - Resources/icons/Snap_Intersection.svg \ - Resources/icons/Snap_Lock.svg \ - Resources/icons/Snap_Midpoint.svg \ - Resources/icons/Snap_Near.svg \ - Resources/icons/Snap_Ortho.svg \ - Resources/icons/Snap_Parallel.svg \ - Resources/icons/Snap_Perpendicular.svg \ - Resources/patterns/concrete.svg \ - Resources/patterns/cross.svg \ - Resources/patterns/line.svg \ - Resources/patterns/simple.svg \ - Resources/patterns/square.svg \ - Resources/translations/Draft_af.qm \ - Resources/translations/Draft_af.ts \ - Resources/translations/Draft_de.qm \ - Resources/translations/Draft_de.ts \ - Resources/translations/Draft_es-ES.qm \ - Resources/translations/Draft_es-ES.ts \ - Resources/translations/Draft_fi.qm \ - Resources/translations/Draft_fi.ts \ - Resources/translations/Draft_fr.qm \ - Resources/translations/Draft_fr.ts \ - Resources/translations/Draft_hr.qm \ - Resources/translations/Draft_hr.ts \ - Resources/translations/Draft_hu.qm \ - Resources/translations/Draft_hu.ts \ - Resources/translations/Draft_it.qm \ - Resources/translations/Draft_it.ts \ - Resources/translations/Draft_ja.qm \ - Resources/translations/Draft_ja.ts \ - Resources/translations/Draft_nl.qm \ - Resources/translations/Draft_nl.ts \ - Resources/translations/Draft_no.qm \ - Resources/translations/Draft_no.ts \ - Resources/translations/Draft_pl.qm \ - Resources/translations/Draft_pl.ts \ - Resources/translations/Draft_pt-BR.qm \ - Resources/translations/Draft_pt-BR.ts \ - Resources/translations/Draft_ru.qm \ - Resources/translations/Draft_ru.ts \ - Resources/translations/Draft_sv-SE.qm \ - Resources/translations/Draft_sv-SE.ts \ - Resources/translations/Draft_uk.qm \ - Resources/translations/Draft_uk.ts \ - Resources/translations/Draft_zh-CN.qm \ - Resources/translations/Draft_zh-CN.ts \ - Resources/translations/Draft_zh-TW.qm \ - Resources/translations/Draft_zh-TW.ts \ - Resources/translations/Draft_cs.qm \ - Resources/translations/Draft_cs.ts \ - Resources/translations/Draft_sk.qm \ - Resources/translations/Draft_sk.ts \ - Resources/translations/Draft_tr.qm \ - Resources/translations/Draft_tr.ts \ - Resources/translations/Draft_ro.qm \ - Resources/translations/Draft_ro.ts \ - Resources/ui/userprefs-base.ui \ - Resources/ui/userprefs-import.ui - diff --git a/src/Mod/Drawing/App/Makefile.am b/src/Mod/Drawing/App/Makefile.am deleted file mode 100644 index 098b9b786a58..000000000000 --- a/src/Mod/Drawing/App/Makefile.am +++ /dev/null @@ -1,86 +0,0 @@ - -lib_LTLIBRARIES=libDrawing.la Drawing.la - -libDrawing_la_SOURCES=\ - AppDrawingPy.cpp \ - DrawingExport.cpp \ - DrawingExport.h \ - FeaturePage.cpp \ - FeaturePage.h \ - FeatureProjection.cpp \ - FeatureProjection.h \ - FeatureView.cpp \ - FeatureView.h \ - FeatureViewPart.cpp \ - FeatureViewPart.h \ - FeatureViewAnnotation.cpp \ - FeatureViewAnnotation.h \ - FeatureClip.cpp \ - FeatureClip.h \ - PageGroup.cpp \ - PageGroup.h \ - ProjectionAlgos.cpp \ - ProjectionAlgos.h \ - PreCompiled.cpp \ - PreCompiled.h - - -# the library search path. -libDrawing_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Mod/Part/App \ - -L$(OCC_LIB) $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libDrawing_la_CPPFLAGS = -DDrawingExport= - -libDrawing_la_LIBADD = \ - @BOOST_REGEX_LIB@ @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lPart \ - -lTKernel \ - -lTKG2d \ - -lTKG3d \ - -lTKMath \ - -lTKSTEP \ - -lTKIGES \ - -lTKSTL \ - -lTKShHealing \ - -lTKXSBase \ - -lTKBool \ - -lTKBO \ - -lTKBRep \ - -lTKTopAlgo \ - -lTKGeomAlgo \ - -lTKGeomBase \ - -lTKOffset \ - -lTKPrim \ - -lTKHLR \ - -lTKMesh - -#-------------------------------------------------------------------------------------- -# Loader of libDrawing - -Drawing_la_SOURCES=\ - AppDrawing.cpp - -# the library search path. -Drawing_la_LDFLAGS = $(libDrawing_la_LDFLAGS) -module -avoid-version -Drawing_la_CPPFLAGS = $(libDrawing_la_CPPFLAGS) - -Drawing_la_LIBADD = \ - $(libDrawing_la_LIBADD) \ - -lDrawing - -Drawing_la_DEPENDENCIES = libDrawing.la - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(OCC_INC) $(all_includes) - - -libdir = $(prefix)/Mod/Drawing - -EXTRA_DIST = \ - CMakeLists.txt diff --git a/src/Mod/Drawing/Gui/Makefile.am b/src/Mod/Drawing/Gui/Makefile.am deleted file mode 100644 index 704a755d0b02..000000000000 --- a/src/Mod/Drawing/Gui/Makefile.am +++ /dev/null @@ -1,97 +0,0 @@ -SUBDIRS=Resources - -lib_LTLIBRARIES=libDrawingGui.la DrawingGui.la - -BUILT_SOURCES=\ - moc_DrawingView.cpp \ - moc_TaskOrthoViews.cpp \ - ui_TaskOrthoViews.h \ - moc_TaskDialog.cpp - -libDrawingGui_la_UI=\ - TaskOrthoViews.ui - -libDrawingGui_la_SOURCES=\ - AppDrawingGuiPy.cpp \ - Command.cpp \ - DrawingView.cpp \ - DrawingView.h \ - PreCompiled.cpp \ - PreCompiled.h \ - TaskDialog.cpp \ - TaskDialog.h \ - TaskOrthoViews.cpp \ - TaskOrthoViews.h \ - ViewProviderPage.cpp \ - ViewProviderPage.h \ - ViewProviderView.cpp \ - ViewProviderView.h \ - Workbench.cpp \ - Workbench.h - -# the library search path. -libDrawingGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui -L../../Part/App -L../App \ - -L$(OCC_LIB) $(QT_LIBS) $(GL_LIBS) $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libDrawingGui_la_CPPFLAGS = -DDrawingAppExport= -DDrawingGuiExport= - -libDrawingGui_la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lTKernel \ - -lTKMath \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui \ - -lPart \ - -lDrawing - -#-------------------------------------------------------------------------------------- -# Loader of libDrawingGui - -DrawingGui_la_SOURCES=\ - AppDrawingGui.cpp - -# the library search path. -DrawingGui_la_LDFLAGS = $(libDrawingGui_la_LDFLAGS) -module -avoid-version -DrawingGui_la_CPPFLAGS = $(libDrawingGui_la_CPPFLAGS) - -DrawingGui_la_LIBADD = \ - $(libDrawingGui_la_LIBADD) \ - Resources/libResources.la \ - -lDrawingGui - -DrawingGui_la_DEPENDENCIES = libDrawingGui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) $(QT_CXXFLAGS) \ - -I$(sim_ac_coin_includedir) -I$(sim_ac_soqt_includedir) -I$(OCC_INC) - - -libdir = $(prefix)/Mod/Drawing - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - $(libDrawingGui_la_UI) \ - CMakeLists.txt - diff --git a/src/Mod/Drawing/Gui/Resources/Makefile.am b/src/Mod/Drawing/Gui/Resources/Makefile.am deleted file mode 100644 index e0cfc8dfef8e..000000000000 --- a/src/Mod/Drawing/Gui/Resources/Makefile.am +++ /dev/null @@ -1,92 +0,0 @@ -noinst_LTLIBRARIES=libResources.la - -BUILT_SOURCES=\ - qrc_Drawing.cpp - -nodist_libResources_la_SOURCES=\ - qrc_Drawing.cpp - -EXTRA_DIST = \ - icons/actions/document-new.png \ - icons/actions/document-new.svg \ - icons/actions/drawing-landscape-A0.svg \ - icons/actions/drawing-landscape-A1.svg \ - icons/actions/drawing-landscape-A2.svg \ - icons/actions/drawing-landscape.svg \ - icons/actions/drawing-view.svg \ - icons/actions/drawing-landscape-A3.svg \ - icons/actions/drawing-landscape-A4.svg \ - icons/actions/drawing-landscape-new.svg \ - icons/actions/drawing-portrait-A4.svg \ - icons/actions/drawing-orthoviews.svg \ - icons/actions/drawing-openbrowser.svg \ - icons/actions/drawing-annotation.svg \ - icons/actions/drawing-clip.svg \ - icons/Page.svg \ - icons/Pages.svg \ - icons/View.svg \ - translations/Drawing_af.qm \ - translations/Drawing_de.qm \ - translations/Drawing_es-ES.qm \ - translations/Drawing_fi.qm \ - translations/Drawing_fr.qm \ - translations/Drawing_hr.qm \ - translations/Drawing_it.qm \ - translations/Drawing_nl.qm \ - translations/Drawing_no.qm \ - translations/Drawing_pl.qm \ - translations/Drawing_pt-BR.qm \ - translations/Drawing_ru.qm \ - translations/Drawing_sv-SE.qm \ - translations/Drawing_uk.qm \ - translations/Drawing_zh-CN.qm \ - translations/Drawing_zh-TW.qm \ - translations/Drawing_cs.qm \ - translations/Drawing_tr.qm \ - translations/Drawing_ro.qm \ - translations/Drawing_sk.qm \ - translations/Drawing_ja.qm \ - translations/Drawing_hu.qm \ - translations/Drawing_af.ts \ - translations/Drawing_de.ts \ - translations/Drawing_es-ES.ts \ - translations/Drawing_fi.ts \ - translations/Drawing_fr.ts \ - translations/Drawing_hr.ts \ - translations/Drawing_it.ts \ - translations/Drawing_nl.ts \ - translations/Drawing_no.ts \ - translations/Drawing_pl.ts \ - translations/Drawing_pt-BR.ts \ - translations/Drawing_ru.ts \ - translations/Drawing_sv-SE.ts \ - translations/Drawing_uk.ts \ - translations/Drawing_zh-CN.ts \ - translations/Drawing_zh-TW.ts \ - translations/Drawing_cs.ts \ - translations/Drawing_tr.ts \ - translations/Drawing_ro.ts \ - translations/Drawing_sk.ts \ - translations/Drawing_ja.ts \ - translations/Drawing_hu.ts \ - Drawing.qrc \ - UpdateResources.bat - - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(srcdir)/.. $(QT_CXXFLAGS) $(all_includes) - -CLEANFILES = $(BUILT_SOURCES) diff --git a/src/Mod/Drawing/Makefile.am b/src/Mod/Drawing/Makefile.am deleted file mode 100644 index c11383b919b9..000000000000 --- a/src/Mod/Drawing/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -SUBDIRS=App Gui Templates - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Drawing - -data_DATA = Init.py InitGui.py DrawingAlgos.py DrawingExample.py DrawingTests.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt \ - drawing.dox diff --git a/src/Mod/Drawing/Templates/Makefile.am b/src/Mod/Drawing/Templates/Makefile.am deleted file mode 100644 index 07142111b43d..000000000000 --- a/src/Mod/Drawing/Templates/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -# Change data dir from default $(datadir) to $(datadir)/Mod/Drawing/Templates -datadir = @datadir@/Mod/Drawing/Templates -data_DATA = \ - A3_Landscape.svg \ - A4_Landscape.svg \ - A4_Simple.svg - -EXTRA_DIST = \ - $(data_DATA) diff --git a/src/Mod/Fem/App/Makefile.am b/src/Mod/Fem/App/Makefile.am deleted file mode 100755 index 00d959e8aa31..000000000000 --- a/src/Mod/Fem/App/Makefile.am +++ /dev/null @@ -1,85 +0,0 @@ - -lib_LTLIBRARIES=libFem.la Fem.la - -BUILT_SOURCES=\ - FemMeshPy.cpp - -libFem_la_BUILT=\ - FemMeshPy.h - -libFem_la_SOURCES = \ - AppFemPy.cpp \ - FemMesh.cpp \ - FemMesh.h \ - FemMeshPyImp.cpp \ - FemMeshObject.cpp \ - FemMeshObject.h \ - FemMeshProperty.cpp \ - FemMeshProperty.h \ - HypothesisPy.cpp \ - HypothesisPy.h \ - PreCompiled.cpp \ - PreCompiled.h - -%.cpp: %.xml $(top_srcdir)/src/Tools/generateTemplates/templateClassPyExport.py - $(PYTHON) $(top_srcdir)/src/Tools/generate.py --outputPath $(@D) $< - -# the library search path. -libFem_la_LDFLAGS = -L../../../Base -L../../../App -L$(OCC_LIB) \ - -L$(top_builddir)/src/Mod/Mesh/App -L$(top_builddir)/src/Mod/Part/App \ - -L$(top_builddir)/src/3rdParty/salomesmesh $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libFem_la_CPPFLAGS = -DFemAppExport= - -libFem_la_LIBADD = \ - @BOOST_REGEX_LIB@ @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lPart \ - -lMesh \ - -lTKernel \ - -lTKG2d \ - -lTKG3d \ - -lTKMath \ - -lTKXSBase \ - -lTKBRep \ - -lTKTopAlgo \ - -lTKGeomAlgo \ - -lTKGeomBase \ - -lSMESH \ - -lSMESHDS \ - -lSMDS \ - -lStdMeshers - -#-------------------------------------------------------------------------------------- -# Loader of libFem - -Fem_la_SOURCES=\ - AppFem.cpp - -# the library search path. -Fem_la_LDFLAGS = $(libFem_la_LDFLAGS) -module -avoid-version -Fem_la_CPPFLAGS = $(libFem_la_CPPFLAGS) - -Fem_la_LIBADD = \ - $(libFem_la_LIBADD) \ - -lFem - -Fem_la_DEPENDENCIES = libFem.la - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/src/3rdParty/salomesmesh/inc \ - $(all_includes) -I$(OCC_INC) - - -libdir = $(prefix)/Mod/Fem - -CLEANFILES = $(BUILT_SOURCES) $(libFem_la_BUILT) - -EXTRA_DIST = \ - FemMeshPy.xml \ - CMakeLists.txt diff --git a/src/Mod/Fem/Gui/Makefile.am b/src/Mod/Fem/Gui/Makefile.am deleted file mode 100755 index 8c54a6194784..000000000000 --- a/src/Mod/Fem/Gui/Makefile.am +++ /dev/null @@ -1,89 +0,0 @@ -SUBDIRS=Resources - -lib_LTLIBRARIES=libFemGui.la FemGui.la - -BUILT_SOURCES=\ - ui_Hypothesis.h \ - moc_Hypothesis.cpp - -libFemGui_la_SOURCES=\ - AppFemGuiPy.cpp \ - Command.cpp \ - Hypothesis.cpp \ - Hypothesis.h \ - PreCompiled.cpp \ - PreCompiled.h \ - ViewProviderFemMesh.cpp \ - ViewProviderFemMesh.h \ - Workbench.cpp \ - Workbench.h - -# the library search path. -libFemGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui -L../App \ - -L$(top_builddir)/src/3rdParty/salomesmesh \ - $(sim_ac_coin_ldflags) $(sim_ac_coin_libs) \ - $(sim_ac_soqt_ldflags) $(sim_ac_soqt_libs) \ - $(QT_LIBS) $(GL_LIBS) $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libFemGui_la_CPPFLAGS = -DFemAppExport= -DFemGuiExport= - -libFemGui_la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui \ - -lSMESH \ - -lSMDS \ - -lFem - -#-------------------------------------------------------------------------------------- -# Loader of libFemGui - -FemGui_la_SOURCES=\ - AppFemGui.cpp - -# the library search path. -FemGui_la_LDFLAGS = $(libFemGui_la_LDFLAGS) -module -avoid-version -FemGui_la_CPPFLAGS = $(libFemGui_la_CPPFLAGS) - -FemGui_la_LIBADD = \ - $(libFemGui_la_LIBADD) \ - Resources/libResources.la \ - -lFemGui - -FemGui_la_DEPENDENCIES = libFemGui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(QT_CXXFLAGS) $(all_includes) \ - -I$(sim_ac_coin_includedir) -I$(sim_ac_soqt_includedir) \ - -I$(OCC_INC) -I$(top_srcdir)/src/3rdParty/salomesmesh/inc - - -libdir = $(prefix)/Mod/Fem - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - CMakeLists.txt \ - Hypothesis.ui - diff --git a/src/Mod/Fem/Gui/Resources/Makefile.am b/src/Mod/Fem/Gui/Resources/Makefile.am deleted file mode 100755 index c0e453e0b1d3..000000000000 --- a/src/Mod/Fem/Gui/Resources/Makefile.am +++ /dev/null @@ -1,76 +0,0 @@ -noinst_LTLIBRARIES=libResources.la - -BUILT_SOURCES=\ - qrc_Fem.cpp - -nodist_libResources_la_SOURCES=\ - qrc_Fem.cpp - -EXTRA_DIST = \ - icons/Fem_FemMesh.svg \ - translations/Fem_af.qm \ - translations/Fem_af.ts \ - translations/Fem_de.qm \ - translations/Fem_de.ts \ - translations/Fem_es-ES.qm \ - translations/Fem_es-ES.ts \ - translations/Fem_fi.qm \ - translations/Fem_fi.ts \ - translations/Fem_fr.qm \ - translations/Fem_fr.ts \ - translations/Fem_hr.qm \ - translations/Fem_hr.ts \ - translations/Fem_it.qm \ - translations/Fem_it.ts \ - translations/Fem_nl.qm \ - translations/Fem_nl.ts \ - translations/Fem_no.qm \ - translations/Fem_no.ts \ - translations/Fem_pl.qm \ - translations/Fem_pl.ts \ - translations/Fem_pt-BR.qm \ - translations/Fem_pt-BR.ts \ - translations/Fem_ru.qm \ - translations/Fem_ru.ts \ - translations/Fem_sv-SE.qm \ - translations/Fem_sv-SE.ts \ - translations/Fem_uk.qm \ - translations/Fem_uk.ts \ - translations/Fem_zh-CN.qm \ - translations/Fem_zh-CN.ts \ - translations/Fem_zh-TW.qm \ - translations/Fem_zh-TW.ts \ - translations/Fem_ro.qm \ - translations/Fem_ro.ts \ - translations/Fem_cs.qm \ - translations/Fem_cs.ts \ - translations/Fem_sk.qm \ - translations/Fem_sk.ts \ - translations/Fem_tr.qm \ - translations/Fem_tr.ts \ - translations/Fem_hu.qm \ - translations/Fem_hu.ts \ - translations/Fem_ja.qm \ - translations/Fem_ja.ts \ - Fem.qrc \ - UpdateResources.bat - - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(srcdir)/.. $(all_includes) $(QT_CXXFLAGS) - -CLEANFILES = $(BUILT_SOURCES) - diff --git a/src/Mod/Fem/Makefile.am b/src/Mod/Fem/Makefile.am deleted file mode 100755 index 1c13a8205674..000000000000 --- a/src/Mod/Fem/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -SUBDIRS=App Gui - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Fem - -data_DATA = Init.py InitGui.py convert2TetGen.py FemExample.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt \ - fem.dox diff --git a/src/Mod/Idf/Makefile.am b/src/Mod/Idf/Makefile.am deleted file mode 100644 index cd166dee1f7b..000000000000 --- a/src/Mod/Idf/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Idf -data_DATA = \ - Idf.py \ - Init.py - -if MAKE_NO_DFSG_PACKAGE -data_DATA += \ - ISOL.emn \ - ISOL.emp - -nobase_data_DATA = \ - lib/0603_SMD.stp \ - lib/0805_SMD.stp \ - lib/1206_SMD.stp \ - lib/1210_SMD.stp \ - lib/1812_SMD.stp \ - lib/2225_SMD.stp \ - lib/2512_SMD.stp \ - lib/CAP_50SGV_8_10.stp \ - lib/EPL22_6_16.stp \ - lib/footprints_models.csv \ - lib/I22_2_5_16.stp \ - lib/I22_2_5_16withEPL22_6_16.stp \ - lib/MSOP_10.stp \ - lib/RLF_12545.stp \ - lib/RLF_7030.stp \ - lib/SMB_DO_214AA.stp \ - lib/SMC_DO_214AB.stp \ - lib/SOD_323.igs \ - lib/SOD_323.stp \ - lib/SOD_523.stp \ - lib/SOT23.stp \ - lib/SOT404.stp \ - lib/SOT428_DPAK.stp \ - lib/SOT_323_3.stp \ - lib/SOT_96.stp \ - lib/TCMT1107_4.stp \ - lib/TSM_103_01_L_DV_A.stp \ - lib/TSM_104_01_L_DV_A.stp \ - lib/TSS0P_8.stp \ - lib/VC0603_SMD.stp -endif - -EXTRA_DIST = \ - $(data_DATA) $(nobase_data_DATA) \ - CMakeLists.txt - diff --git a/src/Mod/Image/App/Makefile.am b/src/Mod/Image/App/Makefile.am deleted file mode 100644 index c758d6955946..000000000000 --- a/src/Mod/Image/App/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ - -lib_LTLIBRARIES=libImage.la Image.la - -libImage_la_SOURCES=\ - ImageBase.cpp \ - ImagePlane.cpp \ - PreCompiled.cpp \ - PreCompiled.h - -includedir = @includedir@/Mod/Image/App - -include_HEADERS=\ - ImageBase.h \ - ImagePlane.h - -# the library search path. -libImage_la_LDFLAGS = -L../../../Base -L../../../App $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libImage_la_CPPFLAGS = -DImageAppExport= - -# $(opencv_LIBS) -libImage_la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp - -#-------------------------------------------------------------------------------------- -# Loader of libImage - -Image_la_SOURCES=\ - AppImage.cpp - -# the library search path. -Image_la_LDFLAGS = $(libImage_la_LDFLAGS) -module -avoid-version -Image_la_CPPFLAGS = $(libImage_la_CPPFLAGS) - -Image_la_LIBADD = \ - $(libImage_la_LIBADD) \ - -lImage - -Image_la_DEPENDENCIES = libImage.la - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -# $(opencv_CFLAGS) -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) - -libdir = $(prefix)/Mod/Image - -EXTRA_DIST = \ - CMakeLists.txt diff --git a/src/Mod/Image/Gui/Makefile.am b/src/Mod/Image/Gui/Makefile.am deleted file mode 100644 index e893b9346854..000000000000 --- a/src/Mod/Image/Gui/Makefile.am +++ /dev/null @@ -1,137 +0,0 @@ - -lib_LTLIBRARIES=libImageGui.la ImageGui.la - -BUILT_SOURCES=\ - moc_GLImageBox.cpp \ - moc_ImageView.cpp \ - qrc_Image.cpp - -libImageGui_la_SOURCES=\ - AppImageGuiPy.cpp \ - Command.cpp \ - GLImageBox.cpp \ - ImageView.cpp \ - PreCompiled.cpp \ - PreCompiled.h \ - ViewProviderImagePlane.cpp \ - ViewProviderImagePlane.h \ - Workbench.cpp \ - XpmImages.h - -includedir = @includedir@/Mod/Image/Gui - -include_HEADERS=\ - GLImageBox.h \ - ImageView.h \ - Workbench.h - -# the library search path. -libImageGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui -L../App \ - $(QT_LIBS) $(GL_LIBS) $(all_libraries) \ - $(sim_ac_coin_ldflags) $(sim_ac_coin_libs) \ - $(sim_ac_soqt_ldflags) $(sim_ac_soqt_libs) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libImageGui_la_CPPFLAGS = -DImageAppExport= -DImageGuiExport= - -# $(opencv_LIBS) -libImageGui_la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui \ - -lImage - -#-------------------------------------------------------------------------------------- -# Loader of libImageGui - -ImageGui_la_SOURCES=\ - AppImageGui.cpp - -# the library search path. -ImageGui_la_LDFLAGS = $(libImageGui_la_LDFLAGS) -module -avoid-version -ImageGui_la_CPPFLAGS = $(libImageGui_la_CPPFLAGS) - -ImageGui_la_LIBADD = \ - $(libImageGui_la_LIBADD) \ - -lImageGui - -ImageGui_la_DEPENDENCIES = libImageGui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: Resources/%.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -# set the include path found by configure -# $(opencv_CFLAGS) -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) $(QT_CXXFLAGS) \ - -I$(sim_ac_coin_includedir) -I$(sim_ac_soqt_includedir) - -libdir = $(prefix)/Mod/Image - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - CMakeLists.txt \ - Resources/Image.qrc \ - Resources/translations/Image_af.qm \ - Resources/translations/Image_af.ts \ - Resources/translations/Image_de.qm \ - Resources/translations/Image_de.ts \ - Resources/translations/Image_es-ES.qm \ - Resources/translations/Image_es-ES.ts \ - Resources/translations/Image_fi.qm \ - Resources/translations/Image_fi.ts \ - Resources/translations/Image_fr.qm \ - Resources/translations/Image_fr.ts \ - Resources/translations/Image_hr.qm \ - Resources/translations/Image_hr.ts \ - Resources/translations/Image_it.qm \ - Resources/translations/Image_it.ts \ - Resources/translations/Image_nl.qm \ - Resources/translations/Image_nl.ts \ - Resources/translations/Image_no.qm \ - Resources/translations/Image_no.ts \ - Resources/translations/Image_pl.qm \ - Resources/translations/Image_pl.ts \ - Resources/translations/Image_pt-BR.qm \ - Resources/translations/Image_pt-BR.ts \ - Resources/translations/Image_ru.qm \ - Resources/translations/Image_ru.ts \ - Resources/translations/Image_sv-SE.qm \ - Resources/translations/Image_sv-SE.ts \ - Resources/translations/Image_uk.qm \ - Resources/translations/Image_uk.ts \ - Resources/translations/Image_zh-CN.qm \ - Resources/translations/Image_zh-CN.ts \ - Resources/translations/Image_hu.qm \ - Resources/translations/Image_hu.ts \ - Resources/translations/Image_ja.qm \ - Resources/translations/Image_ja.ts \ - Resources/translations/Image_ro.qm \ - Resources/translations/Image_ro.ts \ - Resources/translations/Image_zh-TW.qm \ - Resources/translations/Image_zh-TW.ts \ - Resources/translations/Image_cs.qm \ - Resources/translations/Image_cs.ts \ - Resources/translations/Image_tr.qm \ - Resources/translations/Image_tr.ts \ - Resources/translations/Image_sk.qm \ - Resources/translations/Image_sk.ts \ - Resources/icons/image-import.svg - diff --git a/src/Mod/Image/Makefile.am b/src/Mod/Image/Makefile.am deleted file mode 100644 index 6ec5222a8ff7..000000000000 --- a/src/Mod/Image/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -SUBDIRS=App Gui - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Image -data_DATA = Init.py InitGui.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt \ - image.dox diff --git a/src/Mod/Import/App/Makefile.am b/src/Mod/Import/App/Makefile.am deleted file mode 100644 index d771ca680646..000000000000 --- a/src/Mod/Import/App/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ - -lib_LTLIBRARIES=libImport.la - -libImport_la_SOURCES=\ - AppImport.cpp \ - AppImportPy.cpp \ - FeatureImportIges.cpp \ - FeatureImportIges.h \ - FeatureImportStep.cpp \ - FeatureImportStep.h \ - PreCompiled.cpp \ - PreCompiled.h - - -# the library search path. -libImport_la_LDFLAGS = -L../../../Base -L../../../App -L../../Part/App $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libImport_la_CPPFLAGS = -DAppPartExport= - -libImport_la_LIBADD = \ - -lTKIGES \ - -lTKSTEP \ - -lFreeCADBase \ - -lFreeCADApp \ - -lPart - -# set the include path found by configure -AM_CXXFLAGS = $(all_includes) -I../../../ - -libdir = $(prefix)/Mod/Import - -# We need this softlink for Python to load -install-data-local: - cd $(DESTDIR)$(libdir) && \ - rm -f Import.so && \ - $(LN_S) libImport.so Import.so - -EXTRA_DIST = \ - AppImport.dsp \ - AppImport.vcproj \ - Libs.cpp diff --git a/src/Mod/Import/Gui/Makefile.am b/src/Mod/Import/Gui/Makefile.am deleted file mode 100644 index 255e13e93b0f..000000000000 --- a/src/Mod/Import/Gui/Makefile.am +++ /dev/null @@ -1,90 +0,0 @@ - -lib_LTLIBRARIES=libImportGui.la ImportGui.la - -# BUILT_SOURCES=\ -# -libImportGui_la_SOURCES=\ - AppImportGuiPy.cpp \ - Command.cpp \ - PreCompiled.cpp \ - PreCompiled.h \ - Workbench.cpp \ - Workbench.h - -# the library search path. -libImportGui_la_LDFLAGS = \ - -L../../../Base \ - -L../../../App \ - -L../../../Gui \ - -L../../Part/App \ - -L../../Part/Gui \ - -L$(OCC_LIB) $(QT_LIBS) $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ - -libImportGui_la_CPPFLAGS = -DAppPartExport= -DAppPartGuiExport= - -libImportGui_la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lTKernel \ - -lTKMath \ - -lTKBRep \ - -lTKXSBase \ - -lTKXCAF \ - -lTKLCAF \ - -lTKCAF \ - -lTKSTEP \ - -lTKIGES \ - -lTKXDESTEP \ - -lTKXDEIGES \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui \ - -lPart \ - -lPartGui - -#-------------------------------------------------------------------------------------- -# Loader of libImportGui - -ImportGui_la_SOURCES=\ - AppImportGui.cpp - -# the library search path. -ImportGui_la_LDFLAGS = $(libImportGui_la_LDFLAGS) -module -avoid-version -ImportGui_la_CPPFLAGS = $(libImportGui_la_CPPFLAGS) - -ImportGui_la_LIBADD = \ - $(libImportGui_la_LIBADD) \ - -lImportGui - -ImportGui_la_DEPENDENCIES = libImportGui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: Resources/%.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) $(QT_CXXFLAGS) -I$(OCC_INC) \ - -I$(sim_ac_coin_includedir) -I$(sim_ac_soqt_includedir) - -includedir = @includedir@/Mod/Part/Gui -libdir = $(prefix)/Mod/Import - -#CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - CMakeLists.txt diff --git a/src/Mod/Import/Makefile.am b/src/Mod/Import/Makefile.am deleted file mode 100644 index 13848ebefa4c..000000000000 --- a/src/Mod/Import/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -#SUBDIRS=App Gui -SUBDIRS=Gui - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Import -data_DATA = Init.py InitGui.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt \ - import.dox diff --git a/src/Mod/Inspection/App/Makefile.am b/src/Mod/Inspection/App/Makefile.am deleted file mode 100644 index b2d18e661115..000000000000 --- a/src/Mod/Inspection/App/Makefile.am +++ /dev/null @@ -1,72 +0,0 @@ - -lib_LTLIBRARIES=libInspection.la Inspection.la - -libInspection_la_SOURCES=\ - AppInspectionPy.cpp \ - InspectionFeature.cpp \ - InspectionFeature.h \ - PreCompiled.cpp \ - PreCompiled.h - -includedir = @includedir@/Mod/Inspection/App - -# the library search path. -libInspection_la_LDFLAGS = -L$(top_builddir)/src/Base -L$(top_builddir)/src/App \ - -L$(top_builddir)/src/Mod/Mesh/App \ - -L$(top_builddir)/src/Mod/Points/App \ - -L$(top_builddir)/src/Mod/Part/App \ - -L$(OCC_LIB) $(QT4_CORE_LIBS) $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libInspection_la_CPPFLAGS = -DInspectionAppExport= - -libInspection_la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lTKernel \ - -lTKFillet \ - -lTKG2d \ - -lTKG3d \ - -lTKMath \ - -lTKMesh \ - -lTKXSBase \ - -lTKBool \ - -lTKBO \ - -lTKBRep \ - -lTKTopAlgo \ - -lTKGeomAlgo \ - -lTKGeomBase \ - -lTKOffset \ - -lTKPrim \ - -lFreeCADBase \ - -lFreeCADApp \ - -lMesh \ - -lPoints \ - -lPart - -#-------------------------------------------------------------------------------------- -# Loader of libInspection - -Inspection_la_SOURCES=\ - AppInspection.cpp - -# the library search path. -Inspection_la_LDFLAGS = $(libInspection_la_LDFLAGS) -module -avoid-version -Inspection_la_CPPFLAGS = $(libInspection_la_CPPFLAGS) - -Inspection_la_LIBADD = \ - $(libInspection_la_LIBADD) \ - -lInspection - -Inspection_la_DEPENDENCIES = libInspection.la - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) \ - $(QT4_CORE_CXXFLAGS) -I$(OCC_INC) - -libdir = $(prefix)/Mod/Inspection - -EXTRA_DIST = \ - CMakeLists.txt diff --git a/src/Mod/Inspection/Gui/Makefile.am b/src/Mod/Inspection/Gui/Makefile.am deleted file mode 100644 index 4bd5e561cf7c..000000000000 --- a/src/Mod/Inspection/Gui/Makefile.am +++ /dev/null @@ -1,91 +0,0 @@ - -lib_LTLIBRARIES=libInspectionGui.la InspectionGui.la - -BUILT_SOURCES=\ - ui_VisualInspection.h \ - moc_VisualInspection.cpp \ - qrc_Inspection.cpp - -libInspectionGui_la_SOURCES=\ - AppInspectionGuiPy.cpp \ - Command.cpp \ - PreCompiled.cpp \ - PreCompiled.h \ - ViewProviderInspection.cpp \ - ViewProviderInspection.h \ - VisualInspection.cpp \ - VisualInspection.h \ - Workbench.cpp \ - Workbench.h - -includedir = @includedir@/Mod/Inspection/Gui - -# the library search path. -libInspectionGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui -L../App \ - -L$(top_builddir)/src/Mod/Mesh/App \ - -L$(top_builddir)/src/Mod/Points/App \ - $(sim_ac_coin_ldflags) $(sim_ac_coin_libs) \ - $(sim_ac_soqt_ldflags) $(sim_ac_soqt_libs) \ - $(QT_LIBS) $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ - -libInspectionGui_la_CPPFLAGS = -DInspectionAppExport= -DInspectionGuiExport= - -libInspectionGui_la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui \ - -lMesh \ - -lPoints \ - -lInspection - -#-------------------------------------------------------------------------------------- -# Loader of libInspectionGui - -InspectionGui_la_SOURCES=\ - AppInspectionGui.cpp - -# the library search path. -InspectionGui_la_LDFLAGS = $(libInspectionGui_la_LDFLAGS) -module -avoid-version -InspectionGui_la_CPPFLAGS = $(libInspectionGui_la_CPPFLAGS) - -InspectionGui_la_LIBADD = \ - $(libInspectionGui_la_LIBADD) \ - -lInspectionGui - -InspectionGui_la_DEPENDENCIES = libInspectionGui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: Resources/%.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) $(QT_CXXFLAGS) \ - -I$(sim_ac_coin_includedir) -I$(sim_ac_soqt_includedir) - -libdir = $(prefix)/Mod/Inspection - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - CMakeLists.txt \ - VisualInspection.ui \ - Resources/Inspection.qrc - diff --git a/src/Mod/Inspection/Makefile.am b/src/Mod/Inspection/Makefile.am deleted file mode 100644 index 0d7ceefe13cb..000000000000 --- a/src/Mod/Inspection/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -SUBDIRS=App Gui - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Inspection -data_DATA = Init.py InitGui.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt \ - Inspection.dox diff --git a/src/Mod/JtReader/App/Makefile.am b/src/Mod/JtReader/App/Makefile.am deleted file mode 100644 index 773e279624d8..000000000000 --- a/src/Mod/JtReader/App/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ - -lib_LTLIBRARIES=libJtReader.la JtReader.la - -BUILT_SOURCES=\ - FreeCADpov.h - -libJtReader_la_SOURCES=\ - PreCompiled.cpp \ - PreCompiled.h \ - - -FreeCADpov.h: FreeCADpov - $(PYTHON) $(top_srcdir)/src/Tools/PythonToCPP.py $< $@ - - -# the library search path. -libJtReader_la_LDFLAGS = -L../../../Base -L../../../App -L../../Part/App -L/usr/X11R6/lib -L$(OCC_LIB) \ - $(all_libraries) -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libJtReader_la_CPPFLAGS = -DAppPartExport= -DAppJtReaderExport= -DFeatureRayExportPov= - -libJtReader_la_LIBADD = \ - -lxerces-c \ - -l@PYTHON_LIB@ \ - -lFreeCADBase \ - -lFreeCADApp - -#-------------------------------------------------------------------------------------- -# Loader of libJtReader - -JtReader_la_SOURCES=\ - AppJtReader.cpp - -# the library search path. -JtReader_la_LDFLAGS = $(libJtReader_la_LDFLAGS) -module -avoid-version -JtReader_la_CPPFLAGS = $(libJtReader_la_CPPFLAGS) - -JtReader_la_LIBADD = \ - $(libJtReader_la_LIBADD) \ - -lJtReader - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) - - -libdir = $(prefix)/Mod/JtReader - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - CMakeLists.txt diff --git a/src/Mod/JtReader/Makefile.am b/src/Mod/JtReader/Makefile.am deleted file mode 100644 index 8cec93095d67..000000000000 --- a/src/Mod/JtReader/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -SUBDIRS=App Gui - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/JtReader - -data_DATA = Init.py InitGui.py - -EXTRA_DIST = \ - $(data_DATA) diff --git a/src/Mod/Makefile.am b/src/Mod/Makefile.am deleted file mode 100644 index 075c4b6c2894..000000000000 --- a/src/Mod/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -#SUBDIRS=Part Mesh Points Raytracing Image Drawing Complete Draft Test TemplatePyMod -SUBDIRS=Points Complete Draft Test TemplatePyMod Web Start Idf - -#if HAVE_OPENCV -SUBDIRS += Image -#endif - -#if HAVE_GTS -SUBDIRS += Mesh -#endif - -if HAVE_OPENCASCADE -SUBDIRS += Part Import PartDesign Raytracing Drawing Arch Ship OpenSCAD -endif - -if HAVE_EIGEN3 -if HAVE_OPENCASCADE -SUBDIRS += Robot -endif -endif - -if HAVE_EIGEN3 -if HAVE_OPENCASCADE -SUBDIRS += Sketcher -endif -endif - -#if HAVE_GTS -if HAVE_OPENCASCADE -SUBDIRS += ReverseEngineering MeshPart Fem Inspection -endif -#endif - -if BUILD_ASSEMBLY -SUBDIRS += Assembly -endif - -if BUILD_SANDBOX -SUBDIRS += Sandbox -endif - -if BUILD_CAM -SUBDIRS += Cam -endif - -SUBDIRS += Plot - -EXTRA_DIST = \ - __init__.py \ - CMakeLists.txt \ - mod.dox - diff --git a/src/Mod/Mesh/App/Makefile.am b/src/Mod/Mesh/App/Makefile.am deleted file mode 100644 index 5ba606444c58..000000000000 --- a/src/Mod/Mesh/App/Makefile.am +++ /dev/null @@ -1,381 +0,0 @@ - -lib_LTLIBRARIES=libMesh.la Mesh.la - -BUILT_SOURCES=\ - FacetPy.cpp \ - FeaturePythonPy.cpp \ - MeshFeaturePy.cpp \ - MeshPointPy.cpp \ - MeshPy.cpp - -libMesh_la_BUILT=\ - FacetPy.h \ - FeaturePythonPy.h \ - MeshFeaturePy.h \ - MeshPointPy.h \ - MeshPy.h - -libMesh_la_SOURCES=\ - Core/Algorithm.cpp \ - Core/Algorithm.h \ - Core/Approximation.cpp \ - Core/Approximation.h \ - Core/Builder.cpp \ - Core/Builder.h \ - Core/Curvature.cpp \ - Core/Curvature.h \ - Core/Definitions.cpp \ - Core/Definitions.h \ - Core/Degeneration.cpp \ - Core/Degeneration.h \ - Core/Elements.cpp \ - Core/Elements.h \ - Core/Evaluation.cpp \ - Core/Evaluation.h \ - Core/Grid.cpp \ - Core/Grid.h \ - Core/Helpers.h \ - Core/Info.cpp \ - Core/Info.h \ - Core/Iterator.h \ - Core/MeshKernel.cpp \ - Core/MeshKernel.h \ - Core/MeshIO.cpp \ - Core/MeshIO.h \ - Core/Projection.cpp \ - Core/Projection.h \ - Core/Segmentation.cpp \ - Core/Segmentation.h \ - Core/SetOperations.cpp \ - Core/SetOperations.h \ - Core/Smoothing.cpp \ - Core/Smoothing.h \ - Core/tritritest.h \ - Core/Triangulation.cpp \ - Core/Triangulation.h \ - Core/Trim.cpp \ - Core/Trim.h \ - Core/Tools.cpp \ - Core/Tools.h \ - Core/TopoAlgorithm.cpp \ - Core/TopoAlgorithm.h \ - Core/Visitor.cpp \ - Core/Visitor.h \ - WildMagic4/Wm4ApprCylinderFit3.cpp \ - WildMagic4/Wm4ApprCylinderFit3.h \ - WildMagic4/Wm4ApprLineFit3.cpp \ - WildMagic4/Wm4ApprLineFit3.h \ - WildMagic4/Wm4ApprPlaneFit3.cpp \ - WildMagic4/Wm4ApprPlaneFit3.h \ - WildMagic4/Wm4ApprPolyFit3.cpp \ - WildMagic4/Wm4ApprPolyFit3.h \ - WildMagic4/Wm4ApprQuadraticFit3.cpp \ - WildMagic4/Wm4ApprQuadraticFit3.h \ - WildMagic4/Wm4ApprSphereFit3.cpp \ - WildMagic4/Wm4ApprSphereFit3.h \ - WildMagic4/Wm4BandedMatrix.h \ - WildMagic4/Wm4BandedMatrix.inl \ - WildMagic4/Wm4Box3.h \ - WildMagic4/Wm4Box3.inl \ - WildMagic4/Wm4DelPolygonEdge.cpp \ - WildMagic4/Wm4DelPolygonEdge.h \ - WildMagic4/Wm4DelPolyhedronFace.cpp \ - WildMagic4/Wm4DelPolyhedronFace.h \ - WildMagic4/Wm4DelTetrahedron.cpp \ - WildMagic4/Wm4DelTetrahedron.h \ - WildMagic4/Wm4DelTriangle.cpp \ - WildMagic4/Wm4DelTriangle.h \ - WildMagic4/Wm4Delaunay.cpp \ - WildMagic4/Wm4Delaunay.h \ - WildMagic4/Wm4Delaunay1.cpp \ - WildMagic4/Wm4Delaunay1.h \ - WildMagic4/Wm4Delaunay2.cpp \ - WildMagic4/Wm4Delaunay2.h \ - WildMagic4/Wm4Delaunay3.cpp \ - WildMagic4/Wm4Delaunay3.h \ - WildMagic4/Wm4DistLine3Segment3.cpp \ - WildMagic4/Wm4DistLine3Segment3.h \ - WildMagic4/Wm4DistLine3Triangle3.cpp \ - WildMagic4/Wm4DistLine3Triangle3.h \ - WildMagic4/Wm4DistSegment3Segment3.cpp \ - WildMagic4/Wm4DistSegment3Segment3.h \ - WildMagic4/Wm4DistSegment3Triangle3.cpp \ - WildMagic4/Wm4DistSegment3Triangle3.h \ - WildMagic4/Wm4DistVector3Plane3.cpp \ - WildMagic4/Wm4DistVector3Plane3.h \ - WildMagic4/Wm4DistVector3Segment3.cpp \ - WildMagic4/Wm4DistVector3Segment3.h \ - WildMagic4/Wm4DistVector3Triangle3.cpp \ - WildMagic4/Wm4DistVector3Triangle3.h \ - WildMagic4/Wm4Distance.cpp \ - WildMagic4/Wm4Distance.h \ - WildMagic4/Wm4ETManifoldMesh.cpp \ - WildMagic4/Wm4ETManifoldMesh.h \ - WildMagic4/Wm4ETManifoldMesh.inl \ - WildMagic4/Wm4EdgeKey.h \ - WildMagic4/Wm4EdgeKey.inl \ - WildMagic4/Wm4Eigen.cpp \ - WildMagic4/Wm4Eigen.h \ - WildMagic4/Wm4Foundation.h \ - WildMagic4/Wm4FoundationLIB.h \ - WildMagic4/Wm4FoundationPCH.cpp \ - WildMagic4/Wm4FoundationPCH.h \ - WildMagic4/Wm4GMatrix.h \ - WildMagic4/Wm4GMatrix.inl \ - WildMagic4/Wm4GVector.h \ - WildMagic4/Wm4GVector.inl \ - WildMagic4/Wm4ImplicitSurface.cpp \ - WildMagic4/Wm4ImplicitSurface.h \ - WildMagic4/Wm4Intersector.cpp \ - WildMagic4/Wm4Intersector.h \ - WildMagic4/Wm4Intersector1.cpp \ - WildMagic4/Wm4Intersector1.h \ - WildMagic4/Wm4IntrLine3Box3.cpp \ - WildMagic4/Wm4IntrLine3Box3.h \ - WildMagic4/Wm4IntrLine3Plane3.cpp \ - WildMagic4/Wm4IntrLine3Plane3.h \ - WildMagic4/Wm4IntrSegment3Box3.cpp \ - WildMagic4/Wm4IntrSegment3Box3.h \ - WildMagic4/Wm4IntrSegment3Plane3.cpp \ - WildMagic4/Wm4IntrSegment3Plane3.h \ - WildMagic4/Wm4IntrTriangle2Triangle2.cpp \ - WildMagic4/Wm4IntrTriangle2Triangle2.h \ - WildMagic4/Wm4IntrTriangle3Triangle3.cpp \ - WildMagic4/Wm4IntrTriangle3Triangle3.h \ - WildMagic4/Wm4LinComp.h \ - WildMagic4/Wm4LinComp.inl \ - WildMagic4/Wm4Line3.h \ - WildMagic4/Wm4Line3.inl \ - WildMagic4/Wm4LinearSystem.cpp \ - WildMagic4/Wm4LinearSystem.h \ - WildMagic4/Wm4Mapper2.h \ - WildMagic4/Wm4Mapper2.inl \ - WildMagic4/Wm4Mapper3.h \ - WildMagic4/Wm4Mapper3.inl \ - WildMagic4/Wm4Math.cpp \ - WildMagic4/Wm4Math.h \ - WildMagic4/Wm4Math.inl \ - WildMagic4/Wm4MathMCR.h \ - WildMagic4/Wm4Matrix2.cpp \ - WildMagic4/Wm4Matrix2.h \ - WildMagic4/Wm4Matrix2.inl \ - WildMagic4/Wm4Matrix3.cpp \ - WildMagic4/Wm4Matrix3.h \ - WildMagic4/Wm4Matrix3.inl \ - WildMagic4/Wm4Matrix4.cpp \ - WildMagic4/Wm4Matrix4.h \ - WildMagic4/Wm4Matrix4.inl \ - WildMagic4/Wm4Memory.cpp \ - WildMagic4/Wm4Memory.h \ - WildMagic4/Wm4Memory.inl \ - WildMagic4/Wm4MeshCurvature.cpp \ - WildMagic4/Wm4MeshCurvature.h \ - WildMagic4/Wm4MeshSmoother.cpp \ - WildMagic4/Wm4MeshSmoother.h \ - WildMagic4/Wm4ParametricSurface.cpp \ - WildMagic4/Wm4ParametricSurface.h \ - WildMagic4/Wm4Plane3.h \ - WildMagic4/Wm4Plane3.inl \ - WildMagic4/Wm4Platforms.h \ - WildMagic4/Wm4PolynomialRoots.cpp \ - WildMagic4/Wm4PolynomialRoots.h \ - WildMagic4/Wm4Polynomial1.h \ - WildMagic4/Wm4Polynomial1.inl \ - WildMagic4/Wm4QuadricSurface.cpp \ - WildMagic4/Wm4QuadricSurface.h \ - WildMagic4/Wm4Query.h \ - WildMagic4/Wm4Query.inl \ - WildMagic4/Wm4Query2.h \ - WildMagic4/Wm4Query2.inl \ - WildMagic4/Wm4Query2Filtered.h \ - WildMagic4/Wm4Query2Filtered.inl \ - WildMagic4/Wm4Query2Int64.h \ - WildMagic4/Wm4Query2Int64.inl \ - WildMagic4/Wm4Query2TInteger.h \ - WildMagic4/Wm4Query2TInteger.inl \ - WildMagic4/Wm4Query2TRational.h \ - WildMagic4/Wm4Query2TRational.inl \ - WildMagic4/Wm4Query3.h \ - WildMagic4/Wm4Query3.inl \ - WildMagic4/Wm4Query3Filtered.h \ - WildMagic4/Wm4Query3Filtered.inl \ - WildMagic4/Wm4Query3Int64.h \ - WildMagic4/Wm4Query3Int64.inl \ - WildMagic4/Wm4Query3TInteger.h \ - WildMagic4/Wm4Query3TInteger.inl \ - WildMagic4/Wm4Query3TRational.h \ - WildMagic4/Wm4Query3TRational.inl \ - WildMagic4/Wm4RVector2.h \ - WildMagic4/Wm4RVector2.inl \ - WildMagic4/Wm4RVector3.h \ - WildMagic4/Wm4RVector3.inl \ - WildMagic4/Wm4Segment3.h \ - WildMagic4/Wm4Segment3.inl \ - WildMagic4/Wm4Sphere3.h \ - WildMagic4/Wm4Sphere3.inl \ - WildMagic4/Wm4Surface.cpp \ - WildMagic4/Wm4Surface.h \ - WildMagic4/Wm4System.cpp \ - WildMagic4/Wm4System.h \ - WildMagic4/Wm4System.inl \ - WildMagic4/Wm4THashSet.h \ - WildMagic4/Wm4THashSet.inl \ - WildMagic4/Wm4THashTable.h \ - WildMagic4/Wm4THashTable.inl \ - WildMagic4/Wm4TInteger.h \ - WildMagic4/Wm4TInteger.inl \ - WildMagic4/Wm4TMinHeap.h \ - WildMagic4/Wm4TMinHeap.inl \ - WildMagic4/Wm4TRVector.h \ - WildMagic4/Wm4TRVector.inl \ - WildMagic4/Wm4TRational.h \ - WildMagic4/Wm4TRational.inl \ - WildMagic4/Wm4TSmallUnorderedSet.h \ - WildMagic4/Wm4TSmallUnorderedSet.inl \ - WildMagic4/Wm4TStringHashTable.h \ - WildMagic4/Wm4TStringHashTable.inl \ - WildMagic4/Wm4TTuple.h \ - WildMagic4/Wm4TTuple.inl \ - WildMagic4/Wm4Triangle2.h \ - WildMagic4/Wm4Triangle2.inl \ - WildMagic4/Wm4Triangle3.h \ - WildMagic4/Wm4Triangle3.inl \ - WildMagic4/Wm4TriangleKey.h \ - WildMagic4/Wm4TriangleKey.inl \ - WildMagic4/Wm4TriangulateEC.cpp \ - WildMagic4/Wm4TriangulateEC.h \ - WildMagic4/Wm4UniqueVerticesTriangles.h \ - WildMagic4/Wm4UniqueVerticesTriangles.inl \ - WildMagic4/Wm4VEManifoldMesh.cpp \ - WildMagic4/Wm4VEManifoldMesh.h \ - WildMagic4/Wm4VEManifoldMesh.inl \ - WildMagic4/Wm4Vector2.cpp \ - WildMagic4/Wm4Vector2.h \ - WildMagic4/Wm4Vector2.inl \ - WildMagic4/Wm4Vector3.cpp \ - WildMagic4/Wm4Vector3.h \ - WildMagic4/Wm4Vector3.inl \ - WildMagic4/Wm4Vector4.cpp \ - WildMagic4/Wm4Vector4.h \ - WildMagic4/Wm4Vector4.inl \ - AppMeshPy.cpp \ - Doxygen.cpp \ - Facet.cpp \ - FacetPyImp.cpp \ - FeatureMeshCurvature.cpp \ - FeatureMeshExport.cpp \ - FeatureMeshDefects.cpp \ - FeatureMeshDefects.h \ - FeatureMeshImport.cpp \ - FeatureMeshSegmentByMesh.cpp \ - FeatureMeshSetOperations.cpp \ - FeatureMeshSolid.cpp \ - FeatureMeshTransform.cpp \ - FeatureMeshTransformDemolding.cpp \ - FeaturePythonPyImp.cpp \ - Mesh.cpp \ - MeshFeature.cpp \ - MeshFeaturePyImp.cpp \ - MeshPointPyImp.cpp \ - MeshProperties.cpp \ - MeshPyImp.cpp \ - Segment.cpp \ - PreCompiled.cpp \ - PreCompiled.h - -nodist_include_HEADERS=\ - $(libMesh_la_BUILT) - -include_HEADERS=\ - Facet.h \ - FeatureMeshCurvature.h \ - FeatureMeshExport.h \ - FeatureMeshImport.h \ - FeatureMeshSegmentByMesh.h \ - FeatureMeshSetOperations.h \ - FeatureMeshSolid.h \ - FeatureMeshTransform.h \ - FeatureMeshTransformDemolding.h \ - Mesh.h \ - MeshFeature.h \ - MeshPoint.h \ - MeshProperties.h \ - Segment.h - -nobase_include_HEADERS = \ - Core/Algorithm.h \ - Core/Approximation.h \ - Core/Builder.h \ - Core/Definitions.h \ - Core/Degeneration.h \ - Core/Elements.h \ - Core/Evaluation.h \ - Core/Grid.h \ - Core/Helpers.h \ - Core/Info.h \ - Core/Iterator.h \ - Core/MeshKernel.h \ - Core/MeshIO.h \ - Core/Projection.h \ - Core/SetOperations.h \ - Core/Triangulation.h \ - Core/Tools.h \ - Core/TopoAlgorithm.h \ - Core/Visitor.h - -%.cpp: %.xml $(top_srcdir)/src/Tools/generateTemplates/templateClassPyExport.py - $(PYTHON) $(top_srcdir)/src/Tools/generate.py --outputPath $(@D) $< - - -# the library search path. -libMesh_la_LDFLAGS = -L../../../Base -L../../../App $(QT4_CORE_LIBS) $(all_libraries) $(GTS_LIBS) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libMesh_la_CPPFLAGS = -DMeshExport= -DEIGEN2_SUPPORT - -libMesh_la_LIBADD = \ - @BOOST_FILESYSTEM_LIB@ @BOOST_REGEX_LIB@ @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ @ZIPIOS_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp - -#-------------------------------------------------------------------------------------- -# Loader of libMesh - -Mesh_la_SOURCES=\ - AppMesh.cpp - -# the library search path. -Mesh_la_LDFLAGS = $(libMesh_la_LDFLAGS) -module -avoid-version -Mesh_la_CPPFLAGS = $(libMesh_la_CPPFLAGS) - -Mesh_la_LIBADD = \ - $(libMesh_la_LIBADD) \ - -lMesh - -Mesh_la_DEPENDENCIES = libMesh.la - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src/3rdParty -I$(top_srcdir)/src -I$(top_builddir)/src $(GTS_CFLAGS) \ - $(all_includes) -I$(EIGEN3_INC) $(QT4_CORE_CXXFLAGS) - -includedir = @includedir@/Mod/Mesh/App -libdir = $(prefix)/Mod/Mesh -datadir = $(prefix)/Mod/Mesh -data_DATA = MeshTestsApp.py - -CLEANFILES = $(BUILT_SOURCES) $(libMesh_la_BUILT) - -EXTRA_DIST = \ - $(data_DATA) \ - WildMagic4/wildmagic4.dox \ - CMakeLists.txt \ - FacetPy.xml \ - FeaturePythonPy.xml \ - MeshFeaturePy.xml \ - MeshPointPy.xml \ - MeshPy.xml - - diff --git a/src/Mod/Mesh/Gui/Makefile.am b/src/Mod/Mesh/Gui/Makefile.am deleted file mode 100644 index 1b7669ab77a0..000000000000 --- a/src/Mod/Mesh/Gui/Makefile.am +++ /dev/null @@ -1,179 +0,0 @@ - -lib_LTLIBRARIES=libMeshGui.la MeshGui.la - -BUILT_SOURCES=\ - ui_DlgEvaluateMesh.h \ - ui_DlgRegularSolid.h \ - ui_DlgSettingsMeshView.h \ - ui_DlgSmoothing.h \ - ui_RemoveComponents.h \ - ui_Segmentation.h \ - moc_DlgEvaluateMeshImp.cpp \ - moc_DlgRegularSolidImp.cpp \ - moc_DlgSettingsMeshView.cpp \ - moc_DlgSmoothing.cpp \ - moc_MeshEditor.cpp \ - moc_PropertyEditorMesh.cpp \ - moc_RemoveComponents.cpp \ - qrc_Mesh.cpp - -libMeshGui_la_SOURCES=\ - Command.cpp \ - DlgEvaluateMeshImp.cpp \ - DlgEvaluateMeshImp.h \ - DlgRegularSolidImp.cpp \ - DlgRegularSolidImp.h \ - DlgSettingsMeshView.cpp \ - DlgSettingsMeshView.h \ - DlgSmoothing.cpp \ - DlgSmoothing.h \ - Doxygen.cpp \ - MeshEditor.cpp \ - MeshEditor.h \ - PreCompiled.cpp \ - PreCompiled.h \ - PropertyEditorMesh.cpp \ - RemoveComponents.cpp \ - RemoveComponents.h \ - Segmentation.cpp \ - SoFCIndexedFaceSet.cpp \ - SoFCMeshObject.cpp \ - ViewProvider.cpp \ - ViewProviderPython.cpp \ - ViewProviderMeshFaceSet.cpp \ - ViewProviderCurvature.cpp \ - ViewProviderDefects.cpp \ - ViewProviderTransform.cpp \ - ViewProviderTransformDemolding.cpp \ - Workbench.cpp - -include_HEADERS=\ - PropertyEditorMesh.h \ - Segmentation.h \ - SoFCIndexedFaceSet.h \ - SoFCMeshObject.h \ - ViewProvider.h \ - ViewProviderPython.h \ - ViewProviderMeshFaceSet.h \ - ViewProviderCurvature.h \ - ViewProviderDefects.h \ - ViewProviderTransform.h \ - ViewProviderTransformDemolding.h \ - Workbench.h - -# the library search path. -libMeshGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui -L../App $(QT_LIBS) \ - $(sim_ac_coin_ldflags) $(sim_ac_coin_libs) $(sim_ac_soqt_ldflags) $(sim_ac_soqt_libs) \ - $(all_libraries) -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libMeshGui_la_CPPFLAGS = -DMeshExport= -DMeshGuiExport= - -libMeshGui_la_LIBADD = \ - @BOOST_SIGNALS_LIB@ @BOOST_SYSTEM_LIB@ \ - @GL_LIBS@ @ZIPIOS_LIB@ \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui \ - -lMesh - -#-------------------------------------------------------------------------------------- -# Loader of libMeshGui - -MeshGui_la_SOURCES=\ - AppMeshGui.cpp - -# the library search path. -MeshGui_la_LDFLAGS = $(libMeshGui_la_LDFLAGS) -module -avoid-version -MeshGui_la_CPPFLAGS = $(libMeshGui_la_CPPFLAGS) - -MeshGui_la_LIBADD = \ - $(libMeshGui_la_LIBADD) \ - -l@PYTHON_LIB@ \ - -lMeshGui - -MeshGui_la_DEPENDENCIES = libMeshGui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: Resources/%.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) $(QT_CXXFLAGS) $(GTS_CFLAGS) \ - -I$(sim_ac_coin_includedir) -I$(sim_ac_soqt_includedir) - - -includedir = @includedir@/Mod/Mesh/Gui -libdir = $(prefix)/Mod/Mesh - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - Resources/icons/mesh_cut.svg \ - Resources/icons/mesh_boundary.svg \ - Resources/icons/Tree_Mesh.svg \ - CMakeLists.txt \ - DlgEvaluateMesh.ui \ - DlgRegularSolid.ui \ - DlgSettingsMeshView.ui \ - DlgSmoothing.ui \ - RemoveComponents.ui \ - Segmentation.ui \ - Resources/Mesh.qrc \ - Resources/translations/Mesh_af.qm \ - Resources/translations/Mesh_af.ts \ - Resources/translations/Mesh_de.qm \ - Resources/translations/Mesh_de.ts \ - Resources/translations/Mesh_es-ES.qm \ - Resources/translations/Mesh_es-ES.ts \ - Resources/translations/Mesh_fi.qm \ - Resources/translations/Mesh_fi.ts \ - Resources/translations/Mesh_fr.qm \ - Resources/translations/Mesh_fr.ts \ - Resources/translations/Mesh_hr.qm \ - Resources/translations/Mesh_hr.ts \ - Resources/translations/Mesh_it.qm \ - Resources/translations/Mesh_it.ts \ - Resources/translations/Mesh_nl.qm \ - Resources/translations/Mesh_nl.ts \ - Resources/translations/Mesh_no.qm \ - Resources/translations/Mesh_no.ts \ - Resources/translations/Mesh_pl.qm \ - Resources/translations/Mesh_pl.ts \ - Resources/translations/Mesh_pt-BR.qm \ - Resources/translations/Mesh_pt-BR.ts \ - Resources/translations/Mesh_ru.qm \ - Resources/translations/Mesh_ru.ts \ - Resources/translations/Mesh_sv-SE.qm \ - Resources/translations/Mesh_sv-SE.ts \ - Resources/translations/Mesh_uk.qm \ - Resources/translations/Mesh_uk.ts \ - Resources/translations/Mesh_zh-CN.qm \ - Resources/translations/Mesh_zh-CN.ts \ - Resources/translations/Mesh_zh-TW.qm \ - Resources/translations/Mesh_zh-TW.ts \ - Resources/translations/Mesh_ja.qm \ - Resources/translations/Mesh_ja.ts \ - Resources/translations/Mesh_ro.qm \ - Resources/translations/Mesh_ro.ts \ - Resources/translations/Mesh_tr.qm \ - Resources/translations/Mesh_tr.ts \ - Resources/translations/Mesh_hu.qm \ - Resources/translations/Mesh_hu.ts \ - Resources/translations/Mesh_sk.qm \ - Resources/translations/Mesh_sk.ts \ - Resources/translations/Mesh_cs.qm \ - Resources/translations/Mesh_cs.ts \ - images.h diff --git a/src/Mod/Mesh/Makefile.am b/src/Mod/Mesh/Makefile.am deleted file mode 100644 index 5c55b85cab88..000000000000 --- a/src/Mod/Mesh/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -SUBDIRS=App Gui - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Mesh - -data_DATA = Init.py InitGui.py BuildRegularGeoms.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt \ - mesh.dox diff --git a/src/Mod/MeshPart/App/Makefile.am b/src/Mod/MeshPart/App/Makefile.am deleted file mode 100644 index 50febcffce28..000000000000 --- a/src/Mod/MeshPart/App/Makefile.am +++ /dev/null @@ -1,80 +0,0 @@ - -lib_LTLIBRARIES=libMeshPart.la MeshPart.la - -libMeshPart_la_SOURCES=\ - AppMeshPartPy.cpp \ - CurveProjector.cpp \ - CurveProjector.h \ - MeshAlgos.cpp \ - MeshAlgos.h \ - Mesher.cpp \ - Mesher.h \ - PreCompiled.cpp \ - PreCompiled.h - - -# the library search path. -libMeshPart_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Mod/Part/App \ - -L../../../Mod/Mesh/App -L$(OCC_LIB) $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ - -libMeshPart_la_CPPFLAGS = -DMeshPartAppExport= - -libMeshPart_la_LIBADD = \ - @BOOST_REGEX_LIB@ @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lPart \ - -lMesh \ - -lTKernel \ - -lTKG2d \ - -lTKG3d \ - -lTKMath \ - -lTKXSBase \ - -lTKBRep \ - -lTKTopAlgo \ - -lTKGeomAlgo \ - -lTKGeomBase - -#if HAVE_SALOMESMESH -SMESH_LIBRARY = @top_builddir@/src/3rdParty/salomesmesh -libMeshPart_la_LDFLAGS += -L$(SMESH_LIBRARY) -libMeshPart_la_LIBADD += \ - -lSMESH \ - -lSMDS \ - -lStdMeshers -#endif - -#-------------------------------------------------------------------------------------- -# Loader of libMeshPart - -MeshPart_la_SOURCES=\ - AppMeshPart.cpp - -# the library search path. -MeshPart_la_LDFLAGS = $(libMeshPart_la_LDFLAGS) -module -avoid-version -MeshPart_la_CPPFLAGS = $(libMeshPart_la_CPPFLAGS) - -MeshPart_la_LIBADD = \ - $(libMeshPart_la_LIBADD) \ - -lMeshPart - -MeshPart_la_DEPENDENCIES = libMeshPart.la - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) -I$(OCC_INC) - -#if HAVE_SALOMESMESH -SMESH_INCLUDE = @top_srcdir@/src/3rdParty/salomesmesh/inc -AM_CXXFLAGS += -I$(SMESH_INCLUDE) -DHAVE_SMESH -#endif - - -libdir = $(prefix)/Mod/MeshPart - -EXTRA_DIST = \ - CMakeLists.txt diff --git a/src/Mod/MeshPart/Gui/Makefile.am b/src/Mod/MeshPart/Gui/Makefile.am deleted file mode 100644 index ae6147de4882..000000000000 --- a/src/Mod/MeshPart/Gui/Makefile.am +++ /dev/null @@ -1,95 +0,0 @@ -SUBDIRS=Resources - -lib_LTLIBRARIES=libMeshPartGui.la MeshPartGui.la - -BUILT_SOURCES=\ - moc_Tessellation.cpp \ - ui_Tessellation.h - -libMeshPartGui_la_UI=\ - Tessellation.ui - -libMeshPartGui_la_SOURCES=\ - AppMeshPartGuiPy.cpp \ - Command.cpp \ - Tessellation.cpp \ - Tessellation.h \ - PreCompiled.cpp \ - PreCompiled.h \ - Workbench.cpp \ - Workbench.h - -# the library search path. -libMeshPartGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui -L../App \ - -L../../Mesh/App -L../../Part/App \ - -L$(OCC_LIB) $(QT_LIBS) $(GL_LIBS) $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ - -libMeshPartGui_la_CPPFLAGS = -DMeshPartAppExport= -DMeshPartGuiExport= - -libMeshPartGui_la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui \ - -lMesh \ - -lPart \ - -lMeshPart \ - -lTKernel \ - -lTKMath \ - -lTKXSBase \ - -lTKBRep \ - -lTKTopAlgo \ - -lTKGeomAlgo \ - -lTKGeomBase - -#-------------------------------------------------------------------------------------- -# Loader of libMeshPartGui - -MeshPartGui_la_SOURCES=\ - AppMeshPartGui.cpp - -# the library search path. -MeshPartGui_la_LDFLAGS = $(libMeshPartGui_la_LDFLAGS) -module -avoid-version -MeshPartGui_la_CPPFLAGS = $(libMeshPartGui_la_CPPFLAGS) - -MeshPartGui_la_LIBADD = \ - $(libMeshPartGui_la_LIBADD) \ - Resources/libResources.la \ - -lMeshPartGui - -MeshPartGui_la_DEPENDENCIES = libMeshPartGui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) \ - -I$(OCC_INC) $(QT_CXXFLAGS) - - -libdir = $(prefix)/Mod/MeshPart - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - $(libMeshPartGui_la_UI) \ - CMakeLists.txt - diff --git a/src/Mod/MeshPart/Gui/Resources/Makefile.am b/src/Mod/MeshPart/Gui/Resources/Makefile.am deleted file mode 100644 index 8a9fe8abe00a..000000000000 --- a/src/Mod/MeshPart/Gui/Resources/Makefile.am +++ /dev/null @@ -1,74 +0,0 @@ -noinst_LTLIBRARIES=libResources.la - -BUILT_SOURCES=\ - qrc_MeshPart.cpp - -nodist_libResources_la_SOURCES=\ - qrc_MeshPart.cpp - -EXTRA_DIST = \ - icons/actions/MeshFace.svg \ - translations/MeshPart_af.qm \ - translations/MeshPart_af.ts \ - translations/MeshPart_de.qm \ - translations/MeshPart_de.ts \ - translations/MeshPart_es-ES.qm \ - translations/MeshPart_es-ES.ts \ - translations/MeshPart_fi.qm \ - translations/MeshPart_fi.ts \ - translations/MeshPart_fr.qm \ - translations/MeshPart_fr.ts \ - translations/MeshPart_hr.qm \ - translations/MeshPart_hr.ts \ - translations/MeshPart_it.qm \ - translations/MeshPart_it.ts \ - translations/MeshPart_nl.qm \ - translations/MeshPart_nl.ts \ - translations/MeshPart_no.qm \ - translations/MeshPart_no.ts \ - translations/MeshPart_pl.qm \ - translations/MeshPart_pl.ts \ - translations/MeshPart_pt-BR.qm \ - translations/MeshPart_pt-BR.ts \ - translations/MeshPart_ru.qm \ - translations/MeshPart_ru.ts \ - translations/MeshPart_sv-SE.qm \ - translations/MeshPart_sv-SE.ts \ - translations/MeshPart_uk.qm \ - translations/MeshPart_uk.ts \ - translations/MeshPart_zh-CN.qm \ - translations/MeshPart_zh-CN.ts \ - translations/MeshPart_zh-TW.qm \ - translations/MeshPart_zh-TW.ts \ - translations/MeshPart_hu.qm \ - translations/MeshPart_hu.ts \ - translations/MeshPart_ja.qm \ - translations/MeshPart_ja.ts \ - translations/MeshPart_cs.qm \ - translations/MeshPart_cs.ts \ - translations/MeshPart_sk.qm \ - translations/MeshPart_sk.ts \ - translations/MeshPart_ro.qm \ - translations/MeshPart_ro.ts \ - translations/MeshPart_tr.qm \ - translations/MeshPart_tr.ts \ - MeshPart.qrc - - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(srcdir)/.. $(all_includes) $(QT_CXXFLAGS) - -CLEANFILES = $(BUILT_SOURCES) diff --git a/src/Mod/MeshPart/Makefile.am b/src/Mod/MeshPart/Makefile.am deleted file mode 100644 index 1b62b96f76b1..000000000000 --- a/src/Mod/MeshPart/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -SUBDIRS=App Gui - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/MeshPart - -data_DATA = Init.py InitGui.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt \ - meshpart.dox diff --git a/src/Mod/OpenSCAD/Makefile.am b/src/Mod/OpenSCAD/Makefile.am deleted file mode 100644 index a6b187b73aa7..000000000000 --- a/src/Mod/OpenSCAD/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -#SUBDIRS=App Gui - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/OpenSCAD -data_DATA = \ - Init.py InitGui.py \ - OpenSCAD_rc.py \ - OpenSCAD2Dgeom.py \ - OpenSCADFeatures.py \ - OpenSCADUtils.py \ - OpenSCADCommands.py \ - exportCSG.py \ - importCSG.py \ - tokrules.py \ - colorcodeshapes.py \ - expandplacements.py \ - replaceobj.py - -nobase_data_DATA = \ - ply/lex.py \ - ply/README \ - ply/yacc.py \ - ply/__init__.py - - -EXTRA_DIST = \ - $(data_DATA) $(nobase_data_DATA) \ - CMakeLists.txt \ - OpenSCAD.dox \ - exportVersions.txt \ - importVersions.txt diff --git a/src/Mod/Part/App/Makefile.am b/src/Mod/Part/App/Makefile.am deleted file mode 100644 index ddb4b3946143..000000000000 --- a/src/Mod/Part/App/Makefile.am +++ /dev/null @@ -1,305 +0,0 @@ - -lib_LTLIBRARIES=libPart.la Part.la - -BUILT_SOURCES=\ - ArcPy.cpp \ - ArcOfCirclePy.cpp \ - BRepOffsetAPI_MakePipeShellPy.cpp \ - CirclePy.cpp \ - EllipsePy.cpp \ - HyperbolaPy.cpp \ - ParabolaPy.cpp \ - OffsetCurvePy.cpp \ - GeometryPy.cpp \ - GeometryCurvePy.cpp \ - GeometrySurfacePy.cpp \ - LinePy.cpp \ - PointPy.cpp \ - BezierCurvePy.cpp \ - BSplineCurvePy.cpp \ - PlanePy.cpp \ - ConePy.cpp \ - CylinderPy.cpp \ - SpherePy.cpp \ - ToroidPy.cpp \ - BezierSurfacePy.cpp \ - BSplineSurfacePy.cpp \ - OffsetSurfacePy.cpp \ - RectangularTrimmedSurfacePy.cpp \ - SurfaceOfExtrusionPy.cpp \ - SurfaceOfRevolutionPy.cpp \ - PartFeaturePy.cpp \ - FeaturePythonPy.cpp \ - Part2DObjectPy.cpp \ - TopoShapeCompoundPy.cpp \ - TopoShapeCompSolidPy.cpp \ - TopoShapeEdgePy.cpp \ - TopoShapeFacePy.cpp \ - TopoShapeShellPy.cpp \ - TopoShapeSolidPy.cpp \ - TopoShapeVertexPy.cpp \ - TopoShapeWirePy.cpp \ - TopoShapePy.cpp - -libPart_la_BUILT=\ - ArcPy.h \ - ArcOfCirclePy.h \ - BRepOffsetAPI_MakePipeShellPy.h \ - CirclePy.h \ - EllipsePy.h \ - HyperbolaPy.h \ - ParabolaPy.h \ - OffsetCurvePy.h \ - GeometryPy.h \ - GeometryCurvePy.h \ - GeometrySurfacePy.h \ - LinePy.h \ - PointPy.h \ - BezierCurvePy.h \ - BSplineCurvePy.h \ - PlanePy.h \ - ConePy.h \ - CylinderPy.h \ - SpherePy.h \ - ToroidPy.h \ - BezierSurfacePy.h \ - BSplineSurfacePy.h \ - OffsetSurfacePy.h \ - RectangularTrimmedSurfacePy.h \ - SurfaceOfExtrusionPy.h \ - SurfaceOfRevolutionPy.h \ - PartFeaturePy.h \ - FeaturePythonPy.h \ - Part2DObjectPy.h \ - TopoShapeCompoundPy.h \ - TopoShapeCompSolidPy.h \ - TopoShapeEdgePy.h \ - TopoShapeFacePy.h \ - TopoShapeShellPy.h \ - TopoShapeSolidPy.h \ - TopoShapeVertexPy.h \ - TopoShapeWirePy.h \ - TopoShapePy.h - -libPart_la_SOURCES=\ - AppPartPy.cpp \ - ArcPyImp.cpp \ - ArcOfCirclePyImp.cpp \ - BRepOffsetAPI_MakePipeShellPyImp.cpp \ - CirclePyImp.cpp \ - CrossSection.cpp \ - EllipsePyImp.cpp \ - HyperbolaPyImp.cpp \ - ParabolaPyImp.cpp \ - OffsetCurvePyImp.cpp \ - GeometryPyImp.cpp \ - GeometryCurvePyImp.cpp \ - GeometrySurfacePyImp.cpp \ - LinePyImp.cpp \ - PointPyImp.cpp \ - BezierCurvePyImp.cpp \ - BSplineCurvePyImp.cpp \ - PlanePyImp.cpp \ - ConePyImp.cpp \ - CylinderPyImp.cpp \ - SpherePyImp.cpp \ - ToroidPyImp.cpp \ - BezierSurfacePyImp.cpp \ - BSplineSurfacePyImp.cpp \ - OffsetSurfacePyImp.cpp \ - RectangularTrimmedSurfacePyImp.cpp \ - SurfaceOfExtrusionPyImp.cpp \ - SurfaceOfRevolutionPyImp.cpp \ - edgecluster.cpp \ - FeaturePartBoolean.cpp \ - FeaturePartBox.cpp \ - FeaturePartCircle.cpp \ - FeaturePartCurveNet.cpp \ - FeaturePartCommon.cpp \ - FeaturePartCut.cpp \ - FeaturePartFuse.cpp \ - FeaturePartImportBrep.cpp \ - FeaturePartImportIges.cpp \ - FeaturePartImportStep.cpp \ - FeaturePartPolygon.cpp \ - FeaturePartSection.cpp \ - FeatureChamfer.cpp \ - FeatureExtrusion.cpp \ - FeatureFillet.cpp \ - FeatureGeometrySet.cpp \ - FeatureRevolution.cpp \ - FeatureMirroring.cpp \ - PartFeatures.cpp \ - Geometry.cpp \ - ImportIges.cpp \ - ImportStep.cpp \ - modelRefine.cpp \ - CustomFeature.cpp \ - PartFeature.cpp \ - PartFeatureReference.cpp \ - PartFeaturePyImp.cpp \ - FeaturePythonPyImp.cpp \ - Part2DObject.cpp \ - Part2DObjectPyImp.cpp \ - PreCompiled.cpp \ - PreCompiled.h \ - PrimitiveFeature.cpp \ - ProgressIndicator.cpp \ - PropertyGeometryList.cpp \ - PropertyTopoShape.cpp \ - TopoShape.cpp \ - TopoShapeCompoundPyImp.cpp \ - TopoShapeCompSolidPyImp.cpp \ - TopoShapeEdgePyImp.cpp \ - TopoShapeFacePyImp.cpp \ - TopoShapeShellPyImp.cpp \ - TopoShapeSolidPyImp.cpp \ - TopoShapeVertexPyImp.cpp \ - TopoShapeWirePyImp.cpp \ - TopoShapePyImp.cpp - -nodist_include_HEADERS=\ - $(libPart_la_BUILT) - -include_HEADERS=\ - CrossSection.h \ - edgecluster.h \ - FeaturePartBoolean.h \ - FeaturePartBox.h \ - FeaturePartCircle.h \ - FeaturePartCurveNet.h \ - FeaturePartCommon.h \ - FeaturePartCut.h \ - FeaturePartFuse.h \ - FeaturePartImportBrep.h \ - FeaturePartImportIges.h \ - FeaturePartImportStep.h \ - FeaturePartPolygon.h \ - FeaturePartSection.h \ - FeatureChamfer.h \ - FeatureExtrusion.h \ - FeatureFillet.h \ - FeatureGeometrySet.h \ - FeatureRevolution.h \ - FeatureMirroring.h \ - PartFeatures.h \ - Geometry.h \ - ImportIges.h \ - ImportStep.h \ - modelRefine.h \ - PartFeature.h \ - PartFeatureReference.h \ - CustomFeature.h \ - Part2DObject.h \ - PrimitiveFeature.h \ - ProgressIndicator.h \ - PropertyGeometryList.h \ - PropertyTopoShape.h \ - Tools.h \ - TopoShape.h - - -# the library search path. -libPart_la_LDFLAGS = -L../../../Base -L../../../App -L/usr/X11R6/lib -L$(OCC_LIB) $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libPart_la_CPPFLAGS = -DPartExport= - -libPart_la_LIBADD = \ - @BOOST_FILESYSTEM_LIB@ @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lTKernel \ - -lTKFillet \ - -lTKG2d \ - -lTKG3d \ - -lTKMath \ - -lTKMesh \ - -lTKSTEP \ - -lTKSTEPAttr \ - -lTKSTEPBase \ - -lTKIGES \ - -lTKSTL \ - -lTKShHealing \ - -lTKXSBase \ - -lTKBool \ - -lTKBO \ - -lTKBRep \ - -lTKTopAlgo \ - -lTKGeomAlgo \ - -lTKGeomBase \ - -lTKOffset \ - -lTKPrim - -%.cpp: %.xml $(top_srcdir)/src/Tools/generateTemplates/templateClassPyExport.py - $(PYTHON) $(top_srcdir)/src/Tools/generate.py --outputPath $(@D) $< - -#-------------------------------------------------------------------------------------- -# Loader of libPart - -Part_la_SOURCES=\ - AppPart.cpp - -# the library search path. -Part_la_LDFLAGS = $(libPart_la_LDFLAGS) -module -avoid-version -Part_la_CPPFLAGS = $(libPart_la_CPPFLAGS) - -Part_la_LIBADD = \ - $(libPart_la_LIBADD) \ - -lPart - -Part_la_DEPENDENCIES = libPart.la - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) -I$(OCC_INC) - - -includedir = @includedir@/Mod/Part/App -libdir = $(prefix)/Mod/Part - -CLEANFILES = $(BUILT_SOURCES) $(libPart_la_BUILT) - -EXTRA_DIST = \ - OpenCascadeAll.h \ - ArcPy.xml \ - ArcOfCirclePy.xml \ - BRepOffsetAPI_MakePipeShellPy.xml \ - CirclePy.xml \ - EllipsePy.xml \ - HyperbolaPy.xml \ - ParabolaPy.xml \ - OffsetCurvePy.xml \ - GeometryPy.xml \ - GeometryCurvePy.xml \ - GeometrySurfacePy.xml \ - LinePy.xml \ - PointPy.xml \ - BezierCurvePy.xml \ - BSplineCurvePy.xml \ - PlanePy.xml \ - ConePy.xml \ - CylinderPy.xml \ - SpherePy.xml \ - ToroidPy.xml \ - BezierSurfacePy.xml \ - BSplineSurfacePy.xml \ - OffsetSurfacePy.xml \ - RectangularTrimmedSurfacePy.xml \ - SurfaceOfExtrusionPy.xml \ - SurfaceOfRevolutionPy.xml \ - PartFeaturePy.xml \ - FeaturePythonPy.xml \ - Part2DObjectPy.xml \ - TopoShapePy.xml \ - TopoShapeCompSolidPy.xml \ - TopoShapeCompoundPy.xml \ - TopoShapeEdgePy.xml \ - TopoShapeFacePy.xml \ - TopoShapeShellPy.xml \ - TopoShapeSolidPy.xml \ - TopoShapeVertexPy.xml \ - TopoShapeWirePy.xml \ - CMakeLists.txt diff --git a/src/Mod/Part/Gui/Makefile.am b/src/Mod/Part/Gui/Makefile.am deleted file mode 100644 index edd40b00dae9..000000000000 --- a/src/Mod/Part/Gui/Makefile.am +++ /dev/null @@ -1,298 +0,0 @@ - -lib_LTLIBRARIES=libPartGui.la PartGui.la - -BUILT_SOURCES=\ - ui_CrossSections.h \ - ui_DlgBooleanOperation.h \ - ui_DlgExtrusion.h \ - ui_DlgFilletEdges.h \ - ui_DlgRevolution.h \ - ui_DlgPartBox.h \ - ui_DlgPartCylinder.h \ - ui_DlgPartImportIges.h \ - ui_DlgPartImportStep.h \ - ui_DlgPrimitives.h \ - ui_Location.h \ - ui_DlgSettings3DViewPart.h \ - ui_DlgSettingsGeneral.h \ - ui_Mirroring.h \ - ui_TaskFaceColors.h \ - ui_TaskShapeBuilder.h \ - ui_TaskLoft.h \ - ui_TaskOffset.h \ - ui_TaskSweep.h \ - moc_CrossSections.cpp \ - moc_DlgBooleanOperation.cpp \ - moc_DlgExtrusion.cpp \ - moc_DlgFilletEdges.cpp \ - moc_DlgRevolution.cpp \ - moc_DlgPartBoxImp.cpp \ - moc_DlgPartCylinderImp.cpp \ - moc_DlgPartImportIgesImp.cpp \ - moc_DlgPartImportStepImp.cpp \ - moc_DlgPrimitives.cpp \ - moc_DlgSettings3DViewPartImp.cpp \ - moc_DlgSettingsGeneral.cpp \ - moc_Mirroring.cpp \ - moc_TaskCheckGeometry.cpp \ - moc_TaskFaceColors.cpp \ - moc_TaskShapeBuilder.cpp \ - moc_TaskLoft.cpp \ - moc_TaskOffset.cpp \ - moc_TaskSweep.cpp \ - moc_TaskThickness.cpp \ - qrc_Part.cpp - -libPartGui_la_SOURCES=\ - Command.cpp \ - CommandSimple.cpp \ - CommandParametric.cpp \ - CrossSections.cpp \ - CrossSections.h \ - DlgBooleanOperation.cpp \ - DlgBooleanOperation.h \ - DlgExtrusion.cpp \ - DlgExtrusion.h \ - DlgFilletEdges.cpp \ - DlgFilletEdges.h \ - DlgRevolution.cpp \ - DlgRevolution.h \ - DlgPartBoxImp.cpp \ - DlgPartBoxImp.h \ - DlgPartCylinderImp.cpp \ - DlgPartCylinderImp.h \ - DlgPartImportIgesImp.cpp \ - DlgPartImportIgesImp.h \ - DlgPartImportStepImp.cpp \ - DlgPartImportStepImp.h \ - DlgPrimitives.cpp \ - DlgPrimitives.h \ - DlgSettings3DViewPartImp.cpp \ - DlgSettings3DViewPartImp.h \ - DlgSettingsGeneral.cpp \ - DlgSettingsGeneral.h \ - Mirroring.cpp \ - Mirroring.h \ - TaskCheckGeometry.cpp \ - TaskCheckGeometry.h \ - TaskFaceColors.cpp \ - TaskFaceColors.h \ - TaskShapeBuilder.cpp \ - TaskShapeBuilder.h \ - TaskLoft.cpp \ - TaskLoft.h \ - TaskOffset.cpp \ - TaskOffset.h \ - TaskSweep.cpp \ - TaskSweep.h \ - TaskThickness.cpp \ - TaskThickness.h \ - PreCompiled.cpp \ - PreCompiled.h \ - SoBrepShape.cpp \ - SoFCShapeObject.cpp \ - ViewProvider.cpp \ - ViewProviderExt.cpp \ - ViewProviderReference.cpp \ - ViewProviderBox.cpp \ - ViewProviderCurveNet.cpp \ - ViewProviderImport.cpp \ - ViewProviderExtrusion.cpp \ - ViewProviderMirror.cpp \ - ViewProvider2DObject.cpp \ - ViewProviderPython.cpp \ - ViewProviderBoolean.cpp \ - Workbench.cpp - -include_HEADERS=\ - SoBrepShape.h \ - SoFCShapeObject.h \ - ViewProvider.h \ - ViewProviderExt.h \ - ViewProviderReference.h \ - ViewProviderBox.h \ - ViewProviderCurveNet.h \ - ViewProviderImport.h \ - ViewProviderExtrusion.h \ - ViewProviderMirror.h \ - ViewProvider2DObject.h \ - ViewProviderPython.h \ - ViewProviderBoolean.h \ - Workbench.h - -# the library search path. -libPartGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui -L../App -L$(OCC_LIB) \ - $(sim_ac_coin_ldflags) $(sim_ac_coin_libs) $(sim_ac_soqt_ldflags) $(sim_ac_soqt_libs) \ - $(QT_LIBS) $(all_libraries) -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libPartGui_la_CPPFLAGS = -DPartExport= -DPartGuiExport= - -libPartGui_la_LIBADD = \ - @BOOST_SIGNALS_LIB@ \ - @BOOST_SYSTEM_LIB@ \ - -lxerces-c \ - -l@PYTHON_LIB@ \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui \ - -lTKernel \ - -lTKG2d \ - -lTKG3d \ - -lTKMath \ - -lTKSTEP \ - -lTKIGES \ - -lTKShHealing \ - -lTKXSBase \ - -lTKBool \ - -lTKBO \ - -lTKBRep \ - -lTKTopAlgo \ - -lTKGeomAlgo \ - -lTKGeomBase \ - -lTKPrim \ - -lTKMesh \ - -lPart - -#-------------------------------------------------------------------------------------- -# Loader of libPartGui - -PartGui_la_SOURCES=\ - AppPartGui.cpp - -# the library search path. -PartGui_la_LDFLAGS = $(libPartGui_la_LDFLAGS) -module -avoid-version -PartGui_la_CPPFLAGS = $(libPartGui_la_CPPFLAGS) - -PartGui_la_LIBADD = \ - $(libPartGui_la_LIBADD) \ - -lPartGui - -PartGui_la_DEPENDENCIES = libPartGui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: Resources/%.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) $(QT_CXXFLAGS) -I$(OCC_INC) \ - -I$(sim_ac_coin_includedir) -I$(sim_ac_soqt_includedir) - - -includedir = @includedir@/Mod/Part/Gui -libdir = $(prefix)/Mod/Part - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - Resources/icons/Part_Cylinder.svg \ - Resources/icons/Part_Box.svg \ - Resources/icons/Part_Torus.svg \ - Resources/icons/Part_Cone.svg \ - Resources/icons/Part_Sphere.svg \ - Resources/icons/Part_Booleans.svg \ - Resources/icons/Part_Chamfer.svg \ - Resources/icons/Part_CheckGeometry.svg \ - Resources/icons/Part_Cut.svg \ - Resources/icons/Part_Common.svg \ - Resources/icons/Part_CreatePrimitives.png \ - Resources/icons/Part_CreatePrimitives.svg \ - Resources/icons/Part_Fuse.svg \ - Resources/icons/Part_CrossSections.svg \ - Resources/icons/Part_Section.svg \ - Resources/icons/Part_Extrude.svg \ - Resources/icons/Part_Fillet.svg \ - Resources/icons/Part_Revolve.svg \ - Resources/icons/Part_Import.svg \ - Resources/icons/Part_Loft.svg \ - Resources/icons/Part_Mirror.svg \ - Resources/icons/Part_MirrorPNG.png \ - Resources/icons/Part_Offset.svg \ - Resources/icons/Part_RuledSurface.svg \ - Resources/icons/Part_Shapebuilder.png \ - Resources/icons/Part_Shapebuilder.svg \ - Resources/icons/Part_ShapeInfo.svg \ - Resources/icons/Part_Sweep.svg \ - Resources/icons/Part_Thickness.svg \ - Resources/icons/Tree_Part.svg \ - Resources/icons/preferences-part_design.svg \ - Resources/icons/PartFeature.svg \ - Resources/icons/PartFeature.xpm \ - Resources/icons/PartFeatureImport.xpm \ - CrossSections.ui \ - DlgBooleanOperation.ui \ - DlgExtrusion.ui \ - DlgFilletEdges.ui \ - DlgRevolution.ui \ - DlgPartBox.ui \ - DlgPartCylinder.ui \ - DlgPartImportIges.ui \ - DlgPartImportStep.ui \ - DlgPrimitives.ui \ - Location.ui \ - DlgSettings3DViewPart.ui \ - DlgSettingsGeneral.ui \ - Mirroring.ui \ - TaskFaceColors.ui \ - TaskShapeBuilder.ui \ - TaskLoft.ui \ - TaskOffset.ui \ - TaskSweep.ui \ - Resources/Part.qrc \ - Resources/translations/Part_af.qm \ - Resources/translations/Part_af.ts \ - Resources/translations/Part_de.qm \ - Resources/translations/Part_de.ts \ - Resources/translations/Part_es-ES.qm \ - Resources/translations/Part_es-ES.ts \ - Resources/translations/Part_fi.qm \ - Resources/translations/Part_fi.ts \ - Resources/translations/Part_fr.qm \ - Resources/translations/Part_fr.ts \ - Resources/translations/Part_hr.qm \ - Resources/translations/Part_hr.ts \ - Resources/translations/Part_it.qm \ - Resources/translations/Part_it.ts \ - Resources/translations/Part_nl.qm \ - Resources/translations/Part_nl.ts \ - Resources/translations/Part_no.qm \ - Resources/translations/Part_no.ts \ - Resources/translations/Part_pl.qm \ - Resources/translations/Part_pl.ts \ - Resources/translations/Part_pt-BR.qm \ - Resources/translations/Part_pt-BR.ts \ - Resources/translations/Part_ru.qm \ - Resources/translations/Part_ru.ts \ - Resources/translations/Part_sv-SE.qm \ - Resources/translations/Part_sv-SE.ts \ - Resources/translations/Part_uk.qm \ - Resources/translations/Part_uk.ts \ - Resources/translations/Part_zh-CN.qm \ - Resources/translations/Part_zh-CN.ts \ - Resources/translations/Part_zh-TW.qm \ - Resources/translations/Part_zh-TW.ts \ - Resources/translations/Part_ro.qm \ - Resources/translations/Part_ro.ts \ - Resources/translations/Part_ja.qm \ - Resources/translations/Part_ja.ts \ - Resources/translations/Part_hu.qm \ - Resources/translations/Part_hu.ts \ - Resources/translations/Part_cs.qm \ - Resources/translations/Part_cs.ts \ - Resources/translations/Part_sk.qm \ - Resources/translations/Part_sk.ts \ - Resources/translations/Part_tr.qm \ - Resources/translations/Part_tr.ts \ - CMakeLists.txt diff --git a/src/Mod/Part/Makefile.am b/src/Mod/Part/Makefile.am deleted file mode 100644 index 081f3c2a1cc4..000000000000 --- a/src/Mod/Part/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -SUBDIRS=App Gui - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Part - -data_DATA = Init.py InitGui.py TestPartApp.py TestPartGui.py MakeBottle.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt \ - part.dox diff --git a/src/Mod/PartDesign/App/Makefile.am b/src/Mod/PartDesign/App/Makefile.am deleted file mode 100644 index cade8f97c56e..000000000000 --- a/src/Mod/PartDesign/App/Makefile.am +++ /dev/null @@ -1,106 +0,0 @@ - -lib_LTLIBRARIES=libPartDesign.la PartDesign.la - -libPartDesign_la_SOURCES=\ - AppPartDesignPy.cpp \ - Feature.cpp \ - Feature.h \ - FeatureFace.cpp \ - FeatureFace.h \ - FeatureFillet.cpp \ - FeatureFillet.h \ - FeaturePad.cpp \ - FeaturePad.h \ - FeaturePocket.cpp \ - FeaturePocket.h \ - FeatureChamfer.cpp \ - FeatureChamfer.h \ - FeatureDraft.cpp \ - FeatureDraft.h \ - FeatureDressUp.cpp \ - FeatureDressUp.h \ - FeatureGroove.cpp \ - FeatureGroove.h \ - Body.cpp \ - Body.h \ - FeatureLinearPattern.cpp \ - FeatureLinearPattern.h \ - FeatureMirrored.cpp \ - FeatureMirrored.h \ - FeatureMultiTransform.cpp \ - FeatureMultiTransform.h \ - FeaturePolarPattern.cpp \ - FeaturePolarPattern.h \ - FeatureScaled.cpp \ - FeatureScaled.h \ - FeatureSketchBased.cpp \ - FeatureSketchBased.h \ - FeatureRevolution.cpp \ - FeatureRevolution.h \ - FeatureAdditive.cpp \ - FeatureAdditive.h \ - FeatureSubtractive.cpp \ - FeatureSubtractive.h \ - FeatureHole.cpp \ - FeatureHole.h \ - FeatureTransformed.cpp \ - FeatureTransformed.h \ - PreCompiled.cpp \ - PreCompiled.h - - -# the library search path. -libPartDesign_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Mod/Part/App \ - -L$(OCC_LIB) $(all_libraries) -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libPartDesign_la_CPPFLAGS = -DPartDesignAppExport= - -libPartDesign_la_LIBADD = \ - @BOOST_REGEX_LIB@ @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lPart \ - -lTKernel \ - -lTKG2d \ - -lTKG3d \ - -lTKMath \ - -lTKXSBase \ - -lTKBRep \ - -lTKGeomAlgo \ - -lTKGeomBase \ - -lTKOffset \ - -lTKPrim \ - -lTKFeat \ - -lTKFillet \ - -lTKShHealing \ - -lTKBool \ - -lTKBO \ - -lTKTopAlgo - -#-------------------------------------------------------------------------------------- -# Loader of libPartDesign - -PartDesign_la_SOURCES=\ - AppPartDesign.cpp - -# the library search path. -PartDesign_la_LDFLAGS = $(libPartDesign_la_LDFLAGS) -module -avoid-version -PartDesign_la_CPPFLAGS = $(libPartDesign_la_CPPFLAGS) - -PartDesign_la_LIBADD = \ - $(libPartDesign_la_LIBADD) \ - -lPartDesign - -PartDesign_la_DEPENDENCIES = libPartDesign.la - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -AM_CXXFLAGS = -I$(OCC_INC) -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) - - -libdir = $(prefix)/Mod/PartDesign - -EXTRA_DIST = \ - CMakeLists.txt diff --git a/src/Mod/PartDesign/Gui/Makefile.am b/src/Mod/PartDesign/Gui/Makefile.am deleted file mode 100644 index 6f84728ad464..000000000000 --- a/src/Mod/PartDesign/Gui/Makefile.am +++ /dev/null @@ -1,205 +0,0 @@ -SUBDIRS=Resources - -lib_LTLIBRARIES=libPartDesignGui.la PartDesignGui.la - -BUILT_SOURCES=\ - moc_FeaturePickDialog.cpp \ - moc_TaskPadParameters.cpp \ - moc_TaskPocketParameters.cpp \ - moc_TaskChamferParameters.cpp \ - moc_TaskFilletParameters.cpp \ - moc_TaskDraftParameters.cpp \ - moc_TaskGrooveParameters.cpp \ - moc_TaskHoleParameters.cpp \ - moc_TaskLinearPatternParameters.cpp \ - moc_TaskMirroredParameters.cpp \ - moc_TaskMultiTransformParameters.cpp \ - moc_TaskPolarPatternParameters.cpp \ - moc_TaskRevolutionParameters.cpp \ - moc_TaskScaledParameters.cpp \ - moc_TaskTransformedMessages.cpp \ - moc_TaskTransformedParameters.cpp \ - ui_FeaturePickDialog.h \ - ui_TaskGrooveParameters.h \ - ui_TaskPadParameters.h \ - ui_TaskPocketParameters.h \ - ui_TaskChamferParameters.h \ - ui_TaskFilletParameters.h \ - ui_TaskDraftParameters.h \ - ui_TaskHoleParameters.h \ - ui_TaskLinearPatternParameters.h \ - ui_TaskMirroredParameters.h \ - ui_TaskMultiTransformParameters.h \ - ui_TaskPolarPatternParameters.h \ - ui_TaskRevolutionParameters.h \ - ui_TaskScaledParameters.h \ - ui_TaskTransformedMessages.h - -libPartDesignGui_la_UI=\ - FeaturePickDialog.ui \ - TaskGrooveParameters.ui \ - TaskPadParameters.ui \ - TaskPocketParameters.ui \ - TaskChamferParameters.ui \ - TaskDraftParameters.ui \ - TaskFilletParameters.ui \ - TaskFilletParameters.ui \ - TaskHoleParameters.ui \ - TaskLinearPatternParameters.ui \ - TaskMirroredParameters.ui \ - TaskMultiTransformParameters.ui \ - TaskPolarPatternParameters.ui \ - TaskRevolutionParameters.ui \ - TaskScaledParameters.ui \ - TaskTransformedMessages.ui - -libPartDesignGui_la_SOURCES=\ - AppPartDesignGuiPy.cpp \ - Command.cpp \ - PreCompiled.cpp \ - PreCompiled.h \ - FeaturePickDialog.cpp \ - FeaturePickDialog.h \ - ReferenceSelection.cpp \ - ReferenceSelection.h \ - TaskGrooveParameters.cpp \ - TaskGrooveParameters.h \ - TaskPadParameters.cpp \ - TaskPadParameters.h \ - TaskPocketParameters.cpp \ - TaskPocketParameters.h \ - TaskChamferParameters.cpp \ - TaskChamferParameters.h \ - TaskFilletParameters.cpp \ - TaskFilletParameters.h \ - TaskDraftParameters.cpp \ - TaskDraftParameters.h \ - TaskLinearPatternParameters.cpp \ - TaskLinearPatternParameters.h \ - TaskMirroredParameters.cpp \ - TaskMirroredParameters.h \ - TaskMultiTransformParameters.cpp \ - TaskMultiTransformParameters.h \ - TaskPolarPatternParameters.cpp \ - TaskPolarPatternParameters.h \ - TaskRevolutionParameters.cpp \ - TaskRevolutionParameters.h \ - TaskHoleParameters.cpp \ - TaskHoleParameters.h \ - TaskScaledParameters.cpp \ - TaskScaledParameters.h \ - TaskTransformedParameters.cpp \ - TaskTransformedParameters.h \ - TaskTransformedMessages.cpp \ - TaskTransformedMessages.h \ - ViewProvider.cpp \ - ViewProvider.h \ - ViewProviderHole.cpp \ - ViewProviderHole.h \ - ViewProviderLinearPattern.cpp \ - ViewProviderLinearPattern.h \ - ViewProviderMirrored.cpp \ - ViewProviderMirrored.h \ - ViewProviderMultiTransform.cpp \ - ViewProviderMultiTransform.h \ - ViewProviderPad.cpp \ - ViewProviderPad.h \ - ViewProviderPocket.cpp \ - ViewProviderPocket.h \ - ViewProviderPolarPattern.cpp \ - ViewProviderPolarPattern.h \ - ViewProviderChamfer.cpp \ - ViewProviderChamfer.h \ - ViewProviderFillet.cpp \ - ViewProviderFillet.h \ - ViewProviderDraft.cpp \ - ViewProviderDraft.h \ - ViewProviderGroove.cpp \ - ViewProviderGroove.h \ - ViewProviderRevolution.cpp \ - ViewProviderRevolution.h \ - ViewProviderScaled.cpp \ - ViewProviderScaled.h \ - ViewProviderTransformed.cpp \ - ViewProviderTransformed.h \ - Workbench.cpp \ - Workbench.h - -# the library search path. -libPartDesignGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui \ - -L../../Part/App -L../../Part/Gui -L../App \ - -L$(OCC_LIB) $(QT_LIBS) $(GL_LIBS) $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ - -libPartDesignGui_la_CPPFLAGS = -DPartDesignAppExport= -DPartDesignGuiExport= - -libPartDesignGui_la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - @BOOST_SIGNALS_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui \ - -lPart \ - -lPartGui \ - -lTKernel \ - -lTKMath \ - -lTKXSBase \ - -lTKBRep \ - -lTKTopAlgo \ - -lTKG2d \ - -lTKG3d \ - -lTKGeomAlgo \ - -lTKGeomBase \ - -lPartDesign - -#-------------------------------------------------------------------------------------- -# Loader of libPartDesignGui - -PartDesignGui_la_SOURCES=\ - AppPartDesignGui.cpp - -# the library search path. -PartDesignGui_la_LDFLAGS = $(libPartDesignGui_la_LDFLAGS) -module -avoid-version -PartDesignGui_la_CPPFLAGS = $(libPartDesignGui_la_CPPFLAGS) - -PartDesignGui_la_LIBADD = \ - $(libPartDesignGui_la_LIBADD) \ - Resources/libResources.la \ - -lPartDesignGui - -PartDesignGui_la_DEPENDENCIES = libPartDesignGui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(srcdir)/.. \ - $(all_includes) $(QT_CXXFLAGS) -I$(OCC_INC) \ - -I$(sim_ac_coin_includedir) -I$(sim_ac_soqt_includedir) - - -libdir = $(prefix)/Mod/PartDesign - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - $(libPartDesignGui_la_UI) \ - CMakeLists.txt - diff --git a/src/Mod/PartDesign/Gui/Resources/Makefile.am b/src/Mod/PartDesign/Gui/Resources/Makefile.am deleted file mode 100644 index 3f83e8ba6ddb..000000000000 --- a/src/Mod/PartDesign/Gui/Resources/Makefile.am +++ /dev/null @@ -1,86 +0,0 @@ -noinst_LTLIBRARIES=libResources.la - -BUILT_SOURCES=\ - qrc_PartDesign.cpp - -nodist_libResources_la_SOURCES=\ - qrc_PartDesign.cpp - -EXTRA_DIST = \ - translations/PartDesign_af.qm \ - translations/PartDesign_af.ts \ - translations/PartDesign_de.qm \ - translations/PartDesign_de.ts \ - translations/PartDesign_es-ES.qm \ - translations/PartDesign_es-ES.ts \ - translations/PartDesign_fi.qm \ - translations/PartDesign_fi.ts \ - translations/PartDesign_fr.qm \ - translations/PartDesign_fr.ts \ - translations/PartDesign_hr.qm \ - translations/PartDesign_hr.ts \ - translations/PartDesign_it.qm \ - translations/PartDesign_it.ts \ - translations/PartDesign_nl.qm \ - translations/PartDesign_nl.ts \ - translations/PartDesign_no.qm \ - translations/PartDesign_no.ts \ - translations/PartDesign_pl.qm \ - translations/PartDesign_pl.ts \ - translations/PartDesign_pt-BR.qm \ - translations/PartDesign_pt-BR.ts \ - translations/PartDesign_ru.qm \ - translations/PartDesign_ru.ts \ - translations/PartDesign_sv-SE.qm \ - translations/PartDesign_sv-SE.ts \ - translations/PartDesign_uk.qm \ - translations/PartDesign_uk.ts \ - translations/PartDesign_zh-CN.qm \ - translations/PartDesign_zh-CN.ts \ - translations/PartDesign_zh-TW.qm \ - translations/PartDesign_zh-TW.ts \ - translations/PartDesign_ja.qm \ - translations/PartDesign_ja.ts \ - translations/PartDesign_ro.qm \ - translations/PartDesign_ro.ts \ - translations/PartDesign_hu.qm \ - translations/PartDesign_hu.ts \ - translations/PartDesign_cs.qm \ - translations/PartDesign_cs.ts \ - translations/PartDesign_sk.qm \ - translations/PartDesign_sk.ts \ - translations/PartDesign_tr.qm \ - translations/PartDesign_tr.ts \ - icons/PartDesign_Chamfer.svg \ - icons/PartDesign_Fillet.svg \ - icons/PartDesign_Draft.svg \ - icons/PartDesign_Groove.svg \ - icons/PartDesign_Pad.svg \ - icons/PartDesign_Pocket.svg \ - icons/PartDesign_Revolution.svg \ - icons/PartDesign_Mirrored.svg \ - icons/PartDesign_LinearPattern.svg \ - icons/PartDesign_PolarPattern.svg \ - icons/PartDesign_Scaled.svg \ - icons/PartDesign_MultiTransform.svg \ - PartDesign.qrc - - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(srcdir)/.. \ - $(all_includes) $(QT_CXXFLAGS) -I$(OCC_INC) - -CLEANFILES = $(BUILT_SOURCES) diff --git a/src/Mod/PartDesign/Makefile.am b/src/Mod/PartDesign/Makefile.am deleted file mode 100644 index 40994a114874..000000000000 --- a/src/Mod/PartDesign/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -SUBDIRS=App Gui Scripts - -# Create the file __init__.py so that we can import as -# from PartDesign.Scripts import ... -#install-exec-hook: -# echo "import PartDesign" > $(DESTDIR)$(datadir)/__init__.py -# -#uninstall-hook: -# rm -f $(DESTDIR)$(datadir)/__init__.py - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/PartDesign - -data_DATA = Init.py InitGui.py TestPartDesignGui.py TestPartDesignApp.py __init__.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt \ - partdesign.dox - diff --git a/src/Mod/PartDesign/Scripts/Makefile.am b/src/Mod/PartDesign/Scripts/Makefile.am deleted file mode 100644 index 453d38b2e37d..000000000000 --- a/src/Mod/PartDesign/Scripts/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -# Change data dir from default $(datadir) to $(prefix)/Mod/PartDesign/Scripts -datadir = $(prefix)/Mod/PartDesign/Scripts -data_DATA = \ - __init__.py \ - DistanceBolt.py \ - Epitrochoid.py \ - FilletArc.py \ - Gear.py \ - Parallelepiped.py \ - RadialCopy.py \ - Spring.py - -EXTRA_DIST = \ - $(data_DATA) - diff --git a/src/Mod/Plot/Makefile.am b/src/Mod/Plot/Makefile.am deleted file mode 100644 index d1bbe46b4554..000000000000 --- a/src/Mod/Plot/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -# Change data dir from default ($(prefix)/share) to actual dir -datadir = $(prefix)/Mod/Plot - -data_DATA = \ - Plot.py \ - InitGui.py \ - PlotGui.py \ - Plot_rc.py - -nobase_data_DATA = \ - plotAxes/__init__.py \ - plotAxes/TaskPanel.py \ - plotAxes/TaskPanel.ui \ - plotLabels/__init__.py \ - plotLabels/TaskPanel.py \ - plotLabels/TaskPanel.ui \ - plotPositions/__init__.py \ - plotPositions/TaskPanel.py \ - plotPositions/TaskPanel.ui \ - plotSave/__init__.py \ - plotSave/TaskPanel.py \ - plotSave/TaskPanel.ui \ - plotSeries/__init__.py \ - plotSeries/TaskPanel.py \ - plotSeries/TaskPanel.ui \ - plotUtils/__init__.py \ - plotUtils/Paths.py - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - $(data_DATA) \ - $(nobase_data_DATA) \ - CMakeLists.txt \ - README \ - plot.dox - diff --git a/src/Mod/Points/App/Makefile.am b/src/Mod/Points/App/Makefile.am deleted file mode 100644 index 3136b4f412c4..000000000000 --- a/src/Mod/Points/App/Makefile.am +++ /dev/null @@ -1,79 +0,0 @@ - -lib_LTLIBRARIES=libPoints.la Points.la - -BUILT_SOURCES=\ - PointsPy.cpp - -libPoints_la_BUILT=\ - PointsPy.h - -libPoints_la_SOURCES=\ - AppPointsPy.cpp \ - FeaturePointsImportAscii.cpp \ - Points.cpp \ - PointsPyImp.cpp \ - PointsAlgos.cpp \ - PointsFeature.cpp \ - PointsGrid.cpp \ - Properties.cpp \ - PropertyPointKernel.cpp \ - PreCompiled.cpp \ - PreCompiled.h - -nodist_include_HEADERS=\ - $(libPoints_la_BUILT) - -include_HEADERS=\ - FeaturePointsImportAscii.h \ - Points.h \ - PointsAlgos.h \ - PointsFeature.h \ - PointsGrid.h \ - Properties.h \ - PropertyPointKernel.h - -%.cpp: %.xml $(top_srcdir)/src/Tools/generateTemplates/templateClassPyExport.py - $(PYTHON) $(top_srcdir)/src/Tools/generate.py --outputPath $(@D) $< - - -# the library search path. -libPoints_la_LDFLAGS = -L../../../Base -L../../../App $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libPoints_la_CPPFLAGS = -DPointsAppExport= - -libPoints_la_LIBADD = \ - @BOOST_REGEX_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp - -#-------------------------------------------------------------------------------------- -# Loader of libPoints - -Points_la_SOURCES=\ - AppPoints.cpp - -# the library search path. -Points_la_LDFLAGS = $(libPoints_la_LDFLAGS) -module -avoid-version -Points_la_CPPFLAGS = $(libPoints_la_CPPFLAGS) - -Points_la_LIBADD = \ - $(libPoints_la_LIBADD) \ - -lPoints - -Points_la_DEPENDENCIES = libPoints.la - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) - -includedir = @includedir@/Mod/Points/App -libdir = $(prefix)/Mod/Points - -CLEANFILES = $(BUILT_SOURCES) $(libPoints_la_BUILT) - -EXTRA_DIST = \ - PointsPy.xml \ - CMakeLists.txt diff --git a/src/Mod/Points/Gui/Makefile.am b/src/Mod/Points/Gui/Makefile.am deleted file mode 100644 index fe0657ed9e91..000000000000 --- a/src/Mod/Points/Gui/Makefile.am +++ /dev/null @@ -1,129 +0,0 @@ - -lib_LTLIBRARIES=libPointsGui.la PointsGui.la - -BUILT_SOURCES=\ - ui_DlgPointsRead.h \ - moc_DlgPointsReadImp.cpp \ - qrc_Points.cpp - -libPointsGui_la_SOURCES=\ - Command.cpp \ - DlgPointsReadImp.cpp \ - DlgPointsReadImp.h \ - PreCompiled.cpp \ - PreCompiled.h \ - ViewProvider.cpp \ - Workbench.cpp - -includedir = @includedir@/Mod/Points/Gui - -include_HEADERS=\ - ViewProvider.h \ - Workbench.h - -# the library search path. -libPointsGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui -L../App $(QT_LIBS) \ - $(sim_ac_coin_libs) $(sim_ac_soqt_libs) $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libPointsGui_la_CPPFLAGS = -DPointsAppExport= -DPointsGuiExport= - -libPointsGui_la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui \ - -lPoints - -#-------------------------------------------------------------------------------------- -# Loader of libPointsGui - -PointsGui_la_SOURCES=\ - AppPointsGui.cpp - -# the library search path. -PointsGui_la_LDFLAGS = $(libPointsGui_la_LDFLAGS) -module -avoid-version -PointsGui_la_CPPFLAGS = $(libPointsGui_la_CPPFLAGS) - -PointsGui_la_LIBADD = \ - $(libPointsGui_la_LIBADD) \ - -lPointsGui - -PointsGui_la_DEPENDENCIES = libPointsGui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: Resources/%.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) $(QT_CXXFLAGS) \ - -I$(sim_ac_coin_includedir) -I$(sim_ac_soqt_includedir) - -libdir = $(prefix)/Mod/Points - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - DlgPointsRead.ui \ - CMakeLists.txt \ - Resources/Points.qrc \ - Resources/translations/Points_af.qm \ - Resources/translations/Points_af.ts \ - Resources/translations/Points_de.qm \ - Resources/translations/Points_de.ts \ - Resources/translations/Points_es-ES.qm \ - Resources/translations/Points_es-ES.ts \ - Resources/translations/Points_fi.qm \ - Resources/translations/Points_fi.ts \ - Resources/translations/Points_fr.qm \ - Resources/translations/Points_fr.ts \ - Resources/translations/Points_hr.qm \ - Resources/translations/Points_hr.ts \ - Resources/translations/Points_it.qm \ - Resources/translations/Points_it.ts \ - Resources/translations/Points_nl.qm \ - Resources/translations/Points_nl.ts \ - Resources/translations/Points_no.qm \ - Resources/translations/Points_no.ts \ - Resources/translations/Points_pl.qm \ - Resources/translations/Points_pl.ts \ - Resources/translations/Points_pt-BR.qm \ - Resources/translations/Points_pt-BR.ts \ - Resources/translations/Points_ru.qm \ - Resources/translations/Points_ru.ts \ - Resources/translations/Points_sv-SE.qm \ - Resources/translations/Points_sv-SE.ts \ - Resources/translations/Points_uk.qm \ - Resources/translations/Points_uk.ts \ - Resources/translations/Points_zh-TW.qm \ - Resources/translations/Points_zh-TW.ts \ - Resources/translations/Points_ro.qm \ - Resources/translations/Points_ro.ts \ - Resources/translations/Points_ja.qm \ - Resources/translations/Points_ja.ts \ - Resources/translations/Points_tr.qm \ - Resources/translations/Points_tr.ts \ - Resources/translations/Points_cs.qm \ - Resources/translations/Points_cs.ts \ - Resources/translations/Points_sk.qm \ - Resources/translations/Points_sk.ts \ - Resources/translations/Points_hu.qm \ - Resources/translations/Points_hu.ts \ - Resources/translations/Points_zh-CN.qm \ - Resources/translations/Points_zh-CN.ts - diff --git a/src/Mod/Points/Makefile.am b/src/Mod/Points/Makefile.am deleted file mode 100644 index aaa888e49d5a..000000000000 --- a/src/Mod/Points/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -SUBDIRS=App Gui - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Points - -data_DATA = Init.py InitGui.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt \ - points.dox diff --git a/src/Mod/Raytracing/App/Makefile.am b/src/Mod/Raytracing/App/Makefile.am deleted file mode 100644 index 7214b320f337..000000000000 --- a/src/Mod/Raytracing/App/Makefile.am +++ /dev/null @@ -1,79 +0,0 @@ - -lib_LTLIBRARIES=libRaytracing.la Raytracing.la - -BUILT_SOURCES=\ - FreeCADpov.h - -libRaytracing_la_SOURCES=\ - AppRaytracingPy.cpp \ - PovTools.cpp \ - PovTools.h \ - PreCompiled.cpp \ - PreCompiled.h \ - RayFeature.cpp \ - RayFeature.h \ - RayProject.cpp \ - RayProject.h \ - RaySegment.cpp \ - RaySegment.h - - -FreeCADpov.h: FreeCADpov - $(PYTHON) $(top_srcdir)/src/Tools/PythonToCPP.py $< $@ - - -# the library search path. -libRaytracing_la_LDFLAGS = -L../../../Base -L../../../App -L../../Part/App -L/usr/X11R6/lib \ - -L$(OCC_LIB) $(all_libraries) -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libRaytracing_la_CPPFLAGS = -DAppPartExport= -DAppRaytracingExport= -DFeatureRayExportPov= - -libRaytracing_la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lTKernel \ - -lTKG2d \ - -lTKG3d \ - -lTKMath \ - -lTKBool \ - -lTKBRep \ - -lTKGeomAlgo \ - -lTKGeomBase \ - -lTKMesh \ - -lPart - -#-------------------------------------------------------------------------------------- -# Loader of libRaytracing - -Raytracing_la_SOURCES=\ - AppRaytracing.cpp - -# the library search path. -Raytracing_la_LDFLAGS = $(libRaytracing_la_LDFLAGS) -module -avoid-version -Raytracing_la_CPPFLAGS = $(libRaytracing_la_CPPFLAGS) - -Raytracing_la_LIBADD = \ - $(libRaytracing_la_LIBADD) \ - -lRaytracing - -Raytracing_la_DEPENDENCIES = libRaytracing.la - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) -I$(OCC_INC) - - -libdir = $(prefix)/Mod/Raytracing - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - resources/FCAnimation.inc \ - resources/FCAnimation.ini \ - resources/FCAnimation.pov \ - resources/FCSimple.pov \ - CMakeLists.txt \ - FreeCADpov diff --git a/src/Mod/Raytracing/Gui/Makefile.am b/src/Mod/Raytracing/Gui/Makefile.am deleted file mode 100644 index f68ab3d8090f..000000000000 --- a/src/Mod/Raytracing/Gui/Makefile.am +++ /dev/null @@ -1,147 +0,0 @@ - -lib_LTLIBRARIES=libRaytracingGui.la RaytracingGui.la - -BUILT_SOURCES=\ - ui_DlgSettingsRay.h \ - moc_DlgSettingsRayImp.cpp \ - FreeCADpov.h \ - qrc_Raytracing.cpp - -libRaytracingGui_la_SOURCES=\ - AppRaytracingGuiPy.cpp \ - Command.cpp \ - DlgSettingsRayImp.cpp \ - DlgSettingsRayImp.h \ - PovrayHighlighter.cpp \ - PovrayHighlighter.h \ - PreCompiled.cpp \ - PreCompiled.h \ - Workbench.cpp \ - Workbench.h - -# the library search path. -libRaytracingGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui -L../../Part/App -L../App -L$(OCC_LIB) \ - $(QT_LIBS) $(sim_ac_coin_ldflags) $(sim_ac_coin_libs) $(sim_ac_soqt_ldflags) $(sim_ac_soqt_libs) \ - $(all_libraries) -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libRaytracingGui_la_CPPFLAGS = -DAppPartExport= -DAppRaytracingGuiExport= -DFeatureRayExportPov= - -libRaytracingGui_la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui \ - -lTKernel \ - -lTKG2d \ - -lTKG3d \ - -lTKMath \ - -lTKBool \ - -lTKBRep \ - -lTKGeomAlgo \ - -lTKGeomBase \ - -lPart \ - -lRaytracing - -#-------------------------------------------------------------------------------------- -# Loader of libRaytracingGui - -RaytracingGui_la_SOURCES=\ - AppRaytracingGui.cpp - -# the library search path. -RaytracingGui_la_LDFLAGS = $(libRaytracingGui_la_LDFLAGS) -module -avoid-version -RaytracingGui_la_CPPFLAGS = $(libRaytracingGui_la_CPPFLAGS) - -RaytracingGui_la_LIBADD = \ - $(libRaytracingGui_la_LIBADD) \ - -lRaytracingGui - -RaytracingGui_la_DEPENDENCIES = libRaytracingGui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: Resources/%.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -FreeCADpov.h: FreeCADpov - $(PYTHON) $(top_srcdir)/src/Tools/PythonToCPP.py $< $@ - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) $(QT_CXXFLAGS) -I$(OCC_INC) \ - -I$(sim_ac_coin_includedir) -I$(sim_ac_soqt_includedir) - - -libdir = $(prefix)/Mod/Raytracing - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - Resources/icons/preferences-raytracing.svg \ - Resources/icons/Raytrace_Camera.svg \ - Resources/icons/Raytrace_Export.svg \ - Resources/icons/Raytrace_ExportProject.svg \ - Resources/icons/Raytrace_New.svg \ - Resources/icons/Raytrace_Part.svg \ - Resources/icons/Raytrace_NewPartSegment.svg \ - DlgSettingsRay.ui \ - FreeCADpov \ - Resources/Raytracing.qrc \ - Resources/translations/Raytracing_af.qm \ - Resources/translations/Raytracing_af.ts \ - Resources/translations/Raytracing_de.qm \ - Resources/translations/Raytracing_de.ts \ - Resources/translations/Raytracing_es-ES.qm \ - Resources/translations/Raytracing_es-ES.ts \ - Resources/translations/Raytracing_fi.qm \ - Resources/translations/Raytracing_fi.ts \ - Resources/translations/Raytracing_fr.qm \ - Resources/translations/Raytracing_fr.ts \ - Resources/translations/Raytracing_hr.qm \ - Resources/translations/Raytracing_hr.ts \ - Resources/translations/Raytracing_it.qm \ - Resources/translations/Raytracing_it.ts \ - Resources/translations/Raytracing_nl.qm \ - Resources/translations/Raytracing_nl.ts \ - Resources/translations/Raytracing_no.qm \ - Resources/translations/Raytracing_no.ts \ - Resources/translations/Raytracing_pl.qm \ - Resources/translations/Raytracing_pl.ts \ - Resources/translations/Raytracing_pt-BR.qm \ - Resources/translations/Raytracing_pt-BR.ts \ - Resources/translations/Raytracing_ru.qm \ - Resources/translations/Raytracing_ru.ts \ - Resources/translations/Raytracing_sv-SE.qm \ - Resources/translations/Raytracing_sv-SE.ts \ - Resources/translations/Raytracing_uk.qm \ - Resources/translations/Raytracing_uk.ts \ - Resources/translations/Raytracing_hu.qm \ - Resources/translations/Raytracing_hu.ts \ - Resources/translations/Raytracing_sk.qm \ - Resources/translations/Raytracing_sk.ts \ - Resources/translations/Raytracing_cs.qm \ - Resources/translations/Raytracing_cs.ts \ - Resources/translations/Raytracing_ro.qm \ - Resources/translations/Raytracing_ro.ts \ - Resources/translations/Raytracing_tr.qm \ - Resources/translations/Raytracing_tr.ts \ - Resources/translations/Raytracing_ja.qm \ - Resources/translations/Raytracing_ja.ts \ - Resources/translations/Raytracing_zh-TW.qm \ - Resources/translations/Raytracing_zh-TW.ts \ - Resources/translations/Raytracing_zh-CN.qm \ - Resources/translations/Raytracing_zh-CN.ts \ - CMakeLists.txt diff --git a/src/Mod/Raytracing/Makefile.am b/src/Mod/Raytracing/Makefile.am deleted file mode 100644 index 900b32e1e686..000000000000 --- a/src/Mod/Raytracing/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -SUBDIRS=App Gui Templates - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Raytracing - -data_DATA = Init.py InitGui.py RaytracingExample.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt \ - raytracing.dox diff --git a/src/Mod/Raytracing/Templates/Makefile.am b/src/Mod/Raytracing/Templates/Makefile.am deleted file mode 100644 index 182f3d7425ef..000000000000 --- a/src/Mod/Raytracing/Templates/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -# Change data dir from default $(datadir) to $(datadir)/Mod/Raytracing/Templates -datadir = @datadir@/Mod/Raytracing/Templates -data_DATA = \ - ProjectStd.pov - -EXTRA_DIST = \ - $(data_DATA) diff --git a/src/Mod/ReverseEngineering/App/Makefile.am b/src/Mod/ReverseEngineering/App/Makefile.am deleted file mode 100644 index 9b8b981cd1a8..000000000000 --- a/src/Mod/ReverseEngineering/App/Makefile.am +++ /dev/null @@ -1,74 +0,0 @@ - -lib_LTLIBRARIES=libReverseEngineering.la ReverseEngineering.la - -libReverseEngineering_la_SOURCES=\ - AppReverseEngineeringPy.cpp \ - ApproxSurface.cpp \ - PreCompiled.cpp \ - PreCompiled.h - - -include_HEADERS=\ - ApproxSurface.h - -# the library search path. -libReverseEngineering_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Mod/Part/App \ - -L../../../Mod/Mesh/App -L$(OCC_LIB) $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ - -libReverseEngineering_la_CPPFLAGS = -DReenExport= - -libReverseEngineering_la_LIBADD = \ - @BOOST_REGEX_LIB@ @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lPart \ - -lMesh \ - -lTKernel \ - -lTKG2d \ - -lTKG3d \ - -lTKMath \ - -lTKSTEP \ - -lTKIGES \ - -lTKSTL \ - -lTKShHealing \ - -lTKXSBase \ - -lTKBool \ - -lTKBO \ - -lTKBRep \ - -lTKTopAlgo \ - -lTKGeomAlgo \ - -lTKGeomBase \ - -lTKOffset \ - -lTKPrim \ - -lTKHLR - -#-------------------------------------------------------------------------------------- -# Loader of libReverseEngineering - -ReverseEngineering_la_SOURCES=\ - AppReverseEngineering.cpp - -# the library search path. -ReverseEngineering_la_LDFLAGS = $(libReverseEngineering_la_LDFLAGS) -module -avoid-version -ReverseEngineering_la_CPPFLAGS = $(libReverseEngineering_la_CPPFLAGS) - -ReverseEngineering_la_LIBADD = \ - $(libReverseEngineering_la_LIBADD) \ - -lReverseEngineering - -ReverseEngineering_la_DEPENDENCIES = libReverseEngineering.la - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(OCC_INC) $(all_includes) - - -includedir = @includedir@/Mod/ReverseEngineering/App -libdir = $(prefix)/Mod/ReverseEngineering - -EXTRA_DIST = \ - CMakeLists.txt diff --git a/src/Mod/ReverseEngineering/Gui/Makefile.am b/src/Mod/ReverseEngineering/Gui/Makefile.am deleted file mode 100644 index 5ced0dd7483a..000000000000 --- a/src/Mod/ReverseEngineering/Gui/Makefile.am +++ /dev/null @@ -1,77 +0,0 @@ -SUBDIRS=Resources - -lib_LTLIBRARIES=libReverseEngineeringGui.la ReverseEngineeringGui.la - -BUILT_SOURCES= - -libReverseEngineeringGui_la_SOURCES=\ - AppReverseEngineeringGuiPy.cpp \ - Command.cpp \ - PreCompiled.cpp \ - PreCompiled.h \ - Workbench.cpp \ - Workbench.h - -# the library search path. -libReverseEngineeringGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui \ - -L../../../Mod/Mesh/App -L../App -L$(OCC_LIB) $(QT_LIBS) $(GL_LIBS) \ - $(all_libraries) -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ - -libReverseEngineeringGui_la_CPPFLAGS = -DReenExport= -DReenGuiExport= - -libReverseEngineeringGui_la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui \ - -lMesh \ - -lReverseEngineering - -#-------------------------------------------------------------------------------------- -# Loader of libReverseEngineeringGui - -ReverseEngineeringGui_la_SOURCES=\ - AppReverseEngineeringGui.cpp - -# the library search path. -ReverseEngineeringGui_la_LDFLAGS = $(libReverseEngineeringGui_la_LDFLAGS) -module -avoid-version -ReverseEngineeringGui_la_CPPFLAGS = $(libReverseEngineeringGui_la_CPPFLAGS) - -ReverseEngineeringGui_la_LIBADD = \ - $(libReverseEngineeringGui_la_LIBADD) \ - Resources/libResources.la \ - -lReverseEngineeringGui - -ReverseEngineeringGui_la_DEPENDENCIES = libReverseEngineeringGui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(OCC_INC) $(QT_CXXFLAGS) $(all_includes) - - -libdir = $(prefix)/Mod/ReverseEngineering - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - CMakeLists.txt - diff --git a/src/Mod/ReverseEngineering/Gui/Resources/Makefile.am b/src/Mod/ReverseEngineering/Gui/Resources/Makefile.am deleted file mode 100644 index a14b26f1e425..000000000000 --- a/src/Mod/ReverseEngineering/Gui/Resources/Makefile.am +++ /dev/null @@ -1,75 +0,0 @@ -noinst_LTLIBRARIES=libResources.la - -BUILT_SOURCES=\ - qrc_ReverseEngineering.cpp - -nodist_libResources_la_SOURCES=\ - qrc_ReverseEngineering.cpp - -EXTRA_DIST = \ - icons/actions/FitSurface.svg \ - translations/ReverseEngineering_af.qm \ - translations/ReverseEngineering_af.ts \ - translations/ReverseEngineering_de.qm \ - translations/ReverseEngineering_de.ts \ - translations/ReverseEngineering_es-ES.qm \ - translations/ReverseEngineering_es-ES.ts \ - translations/ReverseEngineering_fi.qm \ - translations/ReverseEngineering_fi.ts \ - translations/ReverseEngineering_fr.qm \ - translations/ReverseEngineering_fr.ts \ - translations/ReverseEngineering_hr.qm \ - translations/ReverseEngineering_hr.ts \ - translations/ReverseEngineering_it.qm \ - translations/ReverseEngineering_it.ts \ - translations/ReverseEngineering_nl.qm \ - translations/ReverseEngineering_nl.ts \ - translations/ReverseEngineering_no.qm \ - translations/ReverseEngineering_no.ts \ - translations/ReverseEngineering_pl.qm \ - translations/ReverseEngineering_pl.ts \ - translations/ReverseEngineering_pt-BR.qm \ - translations/ReverseEngineering_pt-BR.ts \ - translations/ReverseEngineering_ru.qm \ - translations/ReverseEngineering_ru.ts \ - translations/ReverseEngineering_sv-SE.qm \ - translations/ReverseEngineering_sv-SE.ts \ - translations/ReverseEngineering_uk.qm \ - translations/ReverseEngineering_uk.ts \ - translations/ReverseEngineering_hu.qm \ - translations/ReverseEngineering_hu.ts \ - translations/ReverseEngineering_cs.qm \ - translations/ReverseEngineering_cs.ts \ - translations/ReverseEngineering_sk.qm \ - translations/ReverseEngineering_sk.ts \ - translations/ReverseEngineering_tr.qm \ - translations/ReverseEngineering_tr.ts \ - translations/ReverseEngineering_ro.qm \ - translations/ReverseEngineering_ro.ts \ - translations/ReverseEngineering_ja.qm \ - translations/ReverseEngineering_ja.ts \ - translations/ReverseEngineering_zh-TW.qm \ - translations/ReverseEngineering_zh-TW.ts \ - translations/ReverseEngineering_zh-CN.qm \ - translations/ReverseEngineering_zh-CN.ts \ - ReverseEngineering.qrc \ - UpdateResources.bat - - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(srcdir)/.. $(all_includes) $(QT_CXXFLAGS) - -CLEANFILES = $(BUILT_SOURCES) diff --git a/src/Mod/ReverseEngineering/Makefile.am b/src/Mod/ReverseEngineering/Makefile.am deleted file mode 100644 index 35945f5567db..000000000000 --- a/src/Mod/ReverseEngineering/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -SUBDIRS=App Gui - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/ReverseEngineering - -data_DATA = Init.py InitGui.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt \ - reverseengineering.dox diff --git a/src/Mod/Robot/App/Makefile.am b/src/Mod/Robot/App/Makefile.am deleted file mode 100644 index d26c3c52b919..000000000000 --- a/src/Mod/Robot/App/Makefile.am +++ /dev/null @@ -1,257 +0,0 @@ - -lib_LTLIBRARIES=libRobot.la Robot.la -noinst_LTLIBRARIES=libkdl.la - -BUILT_SOURCES=\ - Robot6AxisPy.cpp \ - RobotObjectPy.cpp \ - TrajectoryPy.cpp \ - WaypointPy.cpp - -libRobot_la_BUILT=\ - Robot6AxisPy.h \ - RobotObjectPy.h \ - TrajectoryPy.h \ - WaypointPy.h - -libkdl_la_SOURCES=\ - kdl_cp/utilities/error.h \ - kdl_cp/utilities/error_stack.cxx \ - kdl_cp/utilities/error_stack.h \ - kdl_cp/utilities/kdl-config.h \ - kdl_cp/utilities/rall1d.h \ - kdl_cp/utilities/rall1d_io.h \ - kdl_cp/utilities/rall2d.h \ - kdl_cp/utilities/rall2d_io.h \ - kdl_cp/utilities/rallNd.h \ - kdl_cp/utilities/svd_eigen_HH.cpp \ - kdl_cp/utilities/svd_eigen_HH.hpp \ - kdl_cp/utilities/svd_eigen_Macie.hpp \ - kdl_cp/utilities/svd_HH.cpp \ - kdl_cp/utilities/svd_HH.hpp \ - kdl_cp/utilities/traits.h \ - kdl_cp/utilities/utility.cxx \ - kdl_cp/utilities/utility.h \ - kdl_cp/utilities/utility_io.cxx \ - kdl_cp/utilities/utility_io.h \ - kdl_cp/articulatedbodyinertia.cpp \ - kdl_cp/articulatedbodyinertia.hpp \ - kdl_cp/chain.cpp \ - kdl_cp/chain.hpp \ - kdl_cp/chaindynparam.cpp \ - kdl_cp/chaindynparam.hpp \ - kdl_cp/chainfksolver.hpp \ - kdl_cp/chainfksolverpos_recursive.cpp \ - kdl_cp/chainfksolverpos_recursive.hpp \ - kdl_cp/chainfksolvervel_recursive.cpp \ - kdl_cp/chainfksolvervel_recursive.hpp \ - kdl_cp/chainidsolver.hpp \ - kdl_cp/chainidsolver_recursive_newton_euler.cpp \ - kdl_cp/chainidsolver_recursive_newton_euler.hpp \ - kdl_cp/chainiksolver.hpp \ - kdl_cp/chainiksolverpos_nr.cpp \ - kdl_cp/chainiksolverpos_nr.hpp \ - kdl_cp/chainiksolverpos_nr_jl.cpp \ - kdl_cp/chainiksolverpos_nr_jl.hpp \ - kdl_cp/chainiksolvervel_pinv.cpp \ - kdl_cp/chainiksolvervel_pinv_givens.cpp \ - kdl_cp/chainiksolvervel_pinv_givens.hpp \ - kdl_cp/chainiksolvervel_pinv.hpp \ - kdl_cp/chainiksolvervel_pinv_nso.cpp \ - kdl_cp/chainiksolvervel_pinv_nso.hpp \ - kdl_cp/chainiksolvervel_wdls.cpp \ - kdl_cp/chainiksolvervel_wdls.hpp \ - kdl_cp/chainjnttojacsolver.cpp \ - kdl_cp/chainjnttojacsolver.hpp \ - kdl_cp/frameacc.cpp \ - kdl_cp/frameacc.hpp \ - kdl_cp/frameacc.inl \ - kdl_cp/frameacc_io.hpp \ - kdl_cp/frames.cpp \ - kdl_cp/frames.hpp \ - kdl_cp/frames.inl \ - kdl_cp/frames_io.cpp \ - kdl_cp/frames_io.hpp \ - kdl_cp/framevel.cpp \ - kdl_cp/framevel.hpp \ - kdl_cp/framevel.inl \ - kdl_cp/framevel_io.hpp \ - kdl_cp/jacobian.cpp \ - kdl_cp/jacobian.hpp \ - kdl_cp/jntarrayacc.cpp \ - kdl_cp/jntarrayacc.hpp \ - kdl_cp/jntarray.cpp \ - kdl_cp/jntarray.hpp \ - kdl_cp/jntarrayvel.cpp \ - kdl_cp/jntarrayvel.hpp \ - kdl_cp/jntspaceinertiamatrix.cpp \ - kdl_cp/jntspaceinertiamatrix.hpp \ - kdl_cp/joint.cpp \ - kdl_cp/joint.hpp \ - kdl_cp/kdl.hpp \ - kdl_cp/kinfam.hpp \ - kdl_cp/kinfam_io.cpp \ - kdl_cp/kinfam_io.hpp \ - kdl_cp/motion.hpp \ - kdl_cp/path_circle.cpp \ - kdl_cp/path_circle.hpp \ - kdl_cp/path_composite.cpp \ - kdl_cp/path_composite.hpp \ - kdl_cp/path.cpp \ - kdl_cp/path_cyclic_closed.cpp \ - kdl_cp/path_cyclic_closed.hpp \ - kdl_cp/path.hpp \ - kdl_cp/path_line.cpp \ - kdl_cp/path_line.hpp \ - kdl_cp/path_point.cpp \ - kdl_cp/path_point.hpp \ - kdl_cp/path_roundedcomposite.cpp \ - kdl_cp/path_roundedcomposite.hpp \ - kdl_cp/rigidbodyinertia.cpp \ - kdl_cp/rigidbodyinertia.hpp \ - kdl_cp/rotationalinertia.cpp \ - kdl_cp/rotationalinertia.hpp \ - kdl_cp/rotational_interpolation.cpp \ - kdl_cp/rotational_interpolation.hpp \ - kdl_cp/rotational_interpolation_sa.cpp \ - kdl_cp/rotational_interpolation_sa.hpp \ - kdl_cp/segment.cpp \ - kdl_cp/segment.hpp \ - kdl_cp/stiffness.hpp \ - kdl_cp/trajectory_composite.cpp \ - kdl_cp/trajectory_composite.hpp \ - kdl_cp/trajectory.cpp \ - kdl_cp/trajectory.hpp \ - kdl_cp/trajectory_segment.cpp \ - kdl_cp/trajectory_segment.hpp \ - kdl_cp/trajectory_stationary.cpp \ - kdl_cp/trajectory_stationary.hpp \ - kdl_cp/tree.cpp \ - kdl_cp/treefksolver.hpp \ - kdl_cp/treefksolverpos_recursive.cpp \ - kdl_cp/treefksolverpos_recursive.hpp \ - kdl_cp/tree.hpp \ - kdl_cp/treeiksolver.hpp \ - kdl_cp/treeiksolverpos_nr_jl.cpp \ - kdl_cp/treeiksolverpos_nr_jl.hpp \ - kdl_cp/treeiksolvervel_wdls.cpp \ - kdl_cp/treeiksolvervel_wdls.hpp \ - kdl_cp/treejnttojacsolver.cpp \ - kdl_cp/treejnttojacsolver.hpp \ - kdl_cp/velocityprofile.cpp \ - kdl_cp/velocityprofile_dirac.cpp \ - kdl_cp/velocityprofile_dirac.hpp \ - kdl_cp/velocityprofile.hpp \ - kdl_cp/velocityprofile_rect.cpp \ - kdl_cp/velocityprofile_rect.hpp \ - kdl_cp/velocityprofile_trap.cpp \ - kdl_cp/velocityprofile_traphalf.cpp \ - kdl_cp/velocityprofile_traphalf.hpp \ - kdl_cp/velocityprofile_trap.hpp - -libRobot_la_SOURCES=\ - AppRobotPy.cpp \ - Edge2TracObject.cpp \ - Edge2TracObject.h \ - TrajectoryDressUpObject.cpp \ - TrajectoryDressUpObject.h \ - TrajectoryCompound.cpp \ - TrajectoryCompound.h \ - PreCompiled.cpp \ - PreCompiled.h \ - PropertyTrajectory.cpp \ - PropertyTrajectory.h \ - Robot6Axis.cpp \ - Robot6Axis.h \ - Robot6AxisPyImp.cpp \ - RobotAlgos.cpp \ - RobotAlgos.h \ - RobotObject.cpp \ - RobotObject.h \ - RobotObjectPyImp.cpp \ - Simulation.cpp \ - Simulation.h \ - Trajectory.cpp \ - Trajectory.h \ - TrajectoryObject.cpp \ - TrajectoryObject.h \ - TrajectoryPyImp.cpp \ - Waypoint.cpp \ - Waypoint.h \ - WaypointPyImp.cpp - -%.cpp: %.xml $(top_srcdir)/src/Tools/generateTemplates/templateClassPyExport.py - $(PYTHON) $(top_srcdir)/src/Tools/generate.py --outputPath $(@D) $< - -# the library search path. -libRobot_la_LDFLAGS = -L../../../Base -L../../../App -L../../Part/App \ - -L$(OCC_LIB) $(QT4_CORE_LIBS) $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libRobot_la_CPPFLAGS = -DRobotAppExport= -DEIGEN2_SUPPORT -libkdl_la_CPPFLAGS = -DEIGEN2_SUPPORT -#libkdl_la_CPPFLAGS += -Wno-sign-compare -Wno-reorder - -libRobot_la_LIBADD = \ - @BOOST_REGEX_LIB@ @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lkdl \ - -lTKBRep \ - -lTKernel \ - -lTKFillet \ - -lTKG2d \ - -lTKG3d \ - -lTKMath \ - -lTKMesh \ - -lTKSTEP \ - -lTKSTEPAttr \ - -lTKSTEPBase \ - -lTKXSBase \ - -lTKTopAlgo \ - -lTKGeomAlgo \ - -lTKGeomBase \ - -lTKOffset \ - -lTKPrim \ - -lPart \ - -lFreeCADBase \ - -lFreeCADApp - -#-------------------------------------------------------------------------------------- -# Loader of libRobot - -Robot_la_SOURCES=\ - AppRobot.cpp - -# the library search path. -Robot_la_LDFLAGS = $(libRobot_la_LDFLAGS) -module -avoid-version -Robot_la_CPPFLAGS = $(libRobot_la_CPPFLAGS) - -Robot_la_LIBADD = \ - $(libRobot_la_LIBADD) \ - -lRobot - -libRobot_la_DEPENDENCIES = libkdl.la -Robot_la_DEPENDENCIES = libRobot.la - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/src/Mod/Robot/App \ - $(all_includes) -I$(EIGEN3_INC) $(QT4_CORE_CXXFLAGS) -I$(OCC_INC) - - -libdir = $(prefix)/Mod/Robot - -CLEANFILES = $(BUILT_SOURCES) $(libRobot_la_BUILT) - -EXTRA_DIST = \ - kdl_cp/utilities/header.txt \ - kdl_cp/CMakeLists.txt \ - kdl_cp/README.txt \ - kdl_cp/TODO.txt \ - Robot6AxisPy.xml \ - RobotObjectPy.xml \ - TrajectoryPy.xml \ - WaypointPy.xml \ - CMakeLists.txt - diff --git a/src/Mod/Robot/Gui/Makefile.am b/src/Mod/Robot/Gui/Makefile.am deleted file mode 100644 index f2f41d4d3e8a..000000000000 --- a/src/Mod/Robot/Gui/Makefile.am +++ /dev/null @@ -1,143 +0,0 @@ -SUBDIRS=Resources - -lib_LTLIBRARIES=libRobotGui.la RobotGui.la - -BUILT_SOURCES=\ - moc_TaskDlgEdge2Trac.cpp \ - moc_TaskDlgSimulate.cpp \ - moc_TaskEdge2TracParameter.cpp \ - moc_TaskRobot6Axis.cpp \ - moc_TaskRobotControl.cpp \ - moc_TaskRobotMessages.cpp \ - moc_TaskTrajectory.cpp \ - moc_TrajectorySimulate.cpp \ - moc_TaskWatcher.cpp \ - moc_TaskDlgTrajectoryDressUp.cpp \ - moc_TaskDlgTrajectoryCompound.cpp \ - moc_TaskTrajectoryDressUpParameter.cpp \ - ui_TaskEdge2TracParameter.h \ - ui_TaskRobot6Axis.h \ - ui_TaskTrajectoryDressUpParameter.h \ - ui_TaskRobotControl.h \ - ui_TaskRobotMessages.h \ - ui_TaskTrajectory.h \ - ui_TrajectorySimulate.h - - -libRobotGui_la_UI=\ - TaskEdge2TracParameter.ui \ - TaskRobot6Axis.ui \ - TaskRobotControl.ui \ - TaskRobotMessages.ui \ - TaskTrajectory.ui \ - TaskTrajectoryDressUpParameter.ui \ - TrajectorySimulate.ui - -libRobotGui_la_SOURCES=\ - AppRobotGuiPy.cpp \ - Command.cpp \ - CommandExport.cpp \ - CommandInsertRobot.cpp \ - CommandTrajectory.cpp \ - PreCompiled.cpp \ - PreCompiled.h \ - TaskDlgEdge2Trac.cpp \ - TaskDlgEdge2Trac.h \ - TaskDlgSimulate.cpp \ - TaskDlgSimulate.h \ - TaskEdge2TracParameter.cpp \ - TaskEdge2TracParameter.h \ - TaskRobot6Axis.cpp \ - TaskRobot6Axis.h \ - TaskRobotControl.cpp \ - TaskRobotControl.h \ - TaskRobotMessages.cpp \ - TaskRobotMessages.h \ - TaskTrajectory.cpp \ - TaskTrajectory.h \ - TaskTrajectoryDressUpParameter.cpp \ - TaskTrajectoryDressUpParameter.h \ - TaskDlgTrajectoryCompound.cpp \ - TaskDlgTrajectoryCompound.h \ - TaskDlgTrajectoryDressUp.cpp \ - TaskDlgTrajectoryDressUp.h \ - TrajectorySimulate.cpp \ - TrajectorySimulate.h \ - ViewProviderEdge2TracObject.cpp \ - ViewProviderEdge2TracObject.h \ - ViewProviderTrajectoryDressUp.cpp \ - ViewProviderTrajectoryDressUp.h \ - ViewProviderTrajectoryCompound.cpp \ - ViewProviderTrajectoryCompound.h \ - ViewProviderRobotObject.cpp \ - ViewProviderRobotObject.h \ - ViewProviderTrajectory.cpp \ - ViewProviderTrajectory.h \ - TaskWatcher.cpp \ - TaskWatcher.h \ - Workbench.cpp \ - Workbench.h - -# the library search path. -libRobotGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui -L../../Part/App -L../App \ - $(sim_ac_coin_ldflags) $(sim_ac_coin_libs) $(sim_ac_soqt_ldflags) $(sim_ac_soqt_libs) \ - $(QT_LIBS) $(GL_LIBS) $(all_libraries) -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libRobotGui_la_CPPFLAGS = -DRobotAppExport= -DRobotGuiExport= -DEIGEN2_SUPPORT - -libRobotGui_la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui \ - -lPart \ - -lRobot - -#-------------------------------------------------------------------------------------- -# Loader of libRobotGui - -RobotGui_la_SOURCES=\ - AppRobotGui.cpp - -# the library search path. -RobotGui_la_LDFLAGS = $(libRobotGui_la_LDFLAGS) -module -avoid-version -RobotGui_la_CPPFLAGS = $(libRobotGui_la_CPPFLAGS) - -RobotGui_la_LIBADD = \ - $(libRobotGui_la_LIBADD) \ - Resources/libResources.la \ - -lRobotGui - -RobotGui_la_DEPENDENCIES = libRobotGui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(QT_CXXFLAGS) $(all_includes) -I$(OCC_INC) -I$(EIGEN3_INC) \ - -I$(sim_ac_coin_includedir) -I$(sim_ac_soqt_includedir) - -libdir = $(prefix)/Mod/Robot - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - $(libRobotGui_la_UI) \ - CMakeLists.txt - diff --git a/src/Mod/Robot/Gui/Resources/Makefile.am b/src/Mod/Robot/Gui/Resources/Makefile.am deleted file mode 100644 index cac7367cd6ea..000000000000 --- a/src/Mod/Robot/Gui/Resources/Makefile.am +++ /dev/null @@ -1,88 +0,0 @@ -noinst_LTLIBRARIES=libResources.la - -BUILT_SOURCES=\ - qrc_Robot.cpp - -nodist_libResources_la_SOURCES=\ - qrc_Robot.cpp - -EXTRA_DIST = \ - icons/Robot_CreateRobot.svg \ - icons/Robot_CreateTrajectory.svg \ - icons/Robot_Edge2Trac.svg \ - icons/Robot_Export.svg \ - icons/Robot_InsertWaypoint.svg \ - icons/Robot_InsertWaypointPre.svg \ - icons/Robot_RestoreHomePos.svg \ - icons/Robot_SetDefaultOrientation.svg \ - icons/Robot_SetDefaultValues.svg \ - icons/Robot_SetHomePos.svg \ - icons/Robot_Simulate.svg \ - icons/Robot_TrajectoryCompound.svg \ - icons/Robot_TrajectoryDressUp.svg \ - translations/Robot_af.qm \ - translations/Robot_af.ts \ - translations/Robot_de.qm \ - translations/Robot_de.ts \ - translations/Robot_es-ES.qm \ - translations/Robot_es-ES.ts \ - translations/Robot_fi.qm \ - translations/Robot_fi.ts \ - translations/Robot_fr.qm \ - translations/Robot_fr.ts \ - translations/Robot_hr.qm \ - translations/Robot_hr.ts \ - translations/Robot_it.qm \ - translations/Robot_it.ts \ - translations/Robot_nl.qm \ - translations/Robot_nl.ts \ - translations/Robot_no.qm \ - translations/Robot_no.ts \ - translations/Robot_pl.qm \ - translations/Robot_pl.ts \ - translations/Robot_pt-BR.qm \ - translations/Robot_pt-BR.ts \ - translations/Robot_ru.qm \ - translations/Robot_ru.ts \ - translations/Robot_sv-SE.qm \ - translations/Robot_sv-SE.ts \ - translations/Robot_uk.qm \ - translations/Robot_uk.ts \ - translations/Robot_zh-CN.qm \ - translations/Robot_zh-CN.ts \ - translations/Robot_zh-TW.qm \ - translations/Robot_zh-TW.ts \ - translations/Robot_cs.qm \ - translations/Robot_cs.ts \ - translations/Robot_ro.qm \ - translations/Robot_ro.ts \ - translations/Robot_ja.qm \ - translations/Robot_ja.ts \ - translations/Robot_hu.qm \ - translations/Robot_hu.ts \ - translations/Robot_sk.qm \ - translations/Robot_sk.ts \ - translations/Robot_tr.qm \ - translations/Robot_tr.ts \ - Robot.qrc \ - UpdateResources.bat - - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(srcdir)/.. $(all_includes) $(QT_CXXFLAGS) - -CLEANFILES = $(BUILT_SOURCES) - diff --git a/src/Mod/Robot/Lib/Makefile.am b/src/Mod/Robot/Lib/Makefile.am deleted file mode 100644 index 3fd1937a2cb3..000000000000 --- a/src/Mod/Robot/Lib/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -# Change data dir from default $(datadir) to $(datadir)/Mod/Robot/Lib -datadir = @datadir@/Mod/Robot/Lib/Kuka - -# For Debian based system we mustn't pick up these files -if MAKE_NO_DFSG_PACKAGE - -data_DATA = \ - Kuka/kr16.wrl \ - Kuka/kr125_3.wrl \ - Kuka/kr210.WRL \ - Kuka/kr500_1.csv \ - Kuka/kr500_1.wrl \ - Kuka/kr_16.csv \ - Kuka/kr_125.csv \ - Kuka/kr_210_2.csv \ - Kuka/testprog.dat \ - Kuka/testprog.src - -doc_DATA = \ - Kuka/kr_16.pdf \ - Kuka/kr125_2.pdf \ - Kuka/kr_210_2.pdf \ - Kuka/kr_500_2.pdf - -EXTRA_DIST = \ - $(data_DATA) \ - $(doc_DATA) -endif - diff --git a/src/Mod/Robot/Makefile.am b/src/Mod/Robot/Makefile.am deleted file mode 100644 index 7472def170cb..000000000000 --- a/src/Mod/Robot/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -SUBDIRS=App Gui Lib - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Robot - -data_DATA = Init.py InitGui.py \ - MovieTool.py \ - KukaExporter.py \ - RobotExample.py \ - RobotExampleTrajectoryOutOfShapes.py - -EXTRA_DIST = \ - $(data_DATA) \ - robot.dox \ - CMakeLists.txt diff --git a/src/Mod/Sandbox/App/Makefile.am b/src/Mod/Sandbox/App/Makefile.am deleted file mode 100644 index f9ec80fa8bf5..000000000000 --- a/src/Mod/Sandbox/App/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ - -lib_LTLIBRARIES=libSandbox.la Sandbox.la - -libSandbox_la_SOURCES=\ - DocumentProtector.cpp \ - DocumentProtector.h \ - DocumentProtectorPy.cpp \ - DocumentProtectorPy.h \ - DocumentThread.cpp \ - DocumentThread.h \ - PreCompiled.cpp \ - PreCompiled.h - - -# the library search path. -libSandbox_la_LDFLAGS = -L../../../Base -L../../../App -L../../Mesh/App \ - $(all_libraries) -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libSandbox_la_CPPFLAGS = -DSandboxAppExport= - -libSandbox_la_LIBADD = \ - -l@PYTHON_LIB@ \ - @BOOST_SYSTEM_LIB@ \ - -lxerces-c \ - -lQtCore \ - -lFreeCADBase \ - -lFreeCADApp \ - -lMesh - -#-------------------------------------------------------------------------------------- -# Loader of libSandbox - -Sandbox_la_SOURCES=\ - AppSandbox.cpp - -# the library search path. -Sandbox_la_LDFLAGS = $(libSandbox_la_LDFLAGS) -module -avoid-version -Sandbox_la_CPPFLAGS = $(libSandbox_la_CPPFLAGS) - -Sandbox_la_LIBADD = \ - $(libSandbox_la_LIBADD) \ - -lSandbox - -Sandbox_la_DEPENDENCIES = libSandbox.la - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) $(QT_CXXFLAGS) - -libdir = $(prefix)/Mod/Sandbox - -EXTRA_DIST = \ - CMakeLists.txt diff --git a/src/Mod/Sandbox/Gui/Makefile.am b/src/Mod/Sandbox/Gui/Makefile.am deleted file mode 100644 index c936b9cc303f..000000000000 --- a/src/Mod/Sandbox/Gui/Makefile.am +++ /dev/null @@ -1,71 +0,0 @@ - -lib_LTLIBRARIES=libSandboxGui.la SandboxGui.la - -libSandboxGui_la_SOURCES=\ - Command.cpp \ - PreCompiled.cpp \ - PreCompiled.h \ - Workbench.cpp \ - Workbench.h - -# the library search path. -libSandboxGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui -L../../Mesh/App -L../../Part/App -L../App \ - $(sim_ac_coin_ldflags) $(sim_ac_coin_libs) $(sim_ac_soqt_ldflags) $(sim_ac_soqt_libs) \ - $(QT_LIBS) $(all_libraries) -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ - -libSandboxGui_la_CPPFLAGS = $(sim_ac_coin_cppflags) -DSandboxAppExport= -DSandboxGuiExport= - -libSandboxGui_la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui \ - -lMesh \ - -lPart \ - -lSandbox - -#-------------------------------------------------------------------------------------- -# Loader of libSandboxGui - -SandboxGui_la_SOURCES=\ - AppSandboxGui.cpp - -# the library search path. -SandboxGui_la_LDFLAGS = $(libSandboxGui_la_LDFLAGS) -module -avoid-version -SandboxGui_la_CPPFLAGS = $(libSandboxGui_la_CPPFLAGS) - -SandboxGui_la_LIBADD = \ - $(libSandboxGui_la_LIBADD) \ - -lSandboxGui - -SandboxGui_la_DEPENDENCIES = libSandboxGui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) $(QT_CXXFLAGS) -I$(OCC_INC) - -libdir = $(prefix)/Mod/Sandbox - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - CMakeLists.txt diff --git a/src/Mod/Sandbox/Makefile.am b/src/Mod/Sandbox/Makefile.am deleted file mode 100644 index 12547d0b637b..000000000000 --- a/src/Mod/Sandbox/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -SUBDIRS=App Gui - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Sandbox -data_DATA = Init.py InitGui.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt \ - sandbox.dox diff --git a/src/Mod/Ship/Makefile.am b/src/Mod/Ship/Makefile.am deleted file mode 100644 index 9fe7aad38107..000000000000 --- a/src/Mod/Ship/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -# Change data dir from default ($(prefix)/share) to actual dir -datadir = $(prefix)/Mod/Ship - -data_DATA = \ - InitGui.py \ - ShipGui.py \ - Instance.py \ - Ship_rc.py - -nobase_data_DATA = \ - resources/examples/s60.fcstd \ - resources/examples/s60_katamaran.fcstd \ - resources/examples/wigley.fcstd \ - resources/examples/wigley_katamaran.fcstd \ - shipLoadExample/__init__.py \ - shipLoadExample/TaskPanel.py \ - shipLoadExample/TaskPanel.ui \ - shipCreateShip/__init__.py \ - shipCreateShip/Preview.py \ - shipCreateShip/TaskPanel.py \ - shipCreateShip/TaskPanel.ui \ - shipOutlineDraw/__init__.py \ - shipOutlineDraw/Preview.py \ - shipOutlineDraw/TaskPanel.py \ - shipOutlineDraw/TaskPanel.ui \ - shipAreasCurve/__init__.py \ - shipAreasCurve/PlotAux.py \ - shipAreasCurve/Preview.py \ - shipAreasCurve/TaskPanel.py \ - shipAreasCurve/TaskPanel.ui \ - shipHydrostatics/__init__.py \ - shipHydrostatics/PlotAux.py \ - shipHydrostatics/TaskPanel.py \ - shipHydrostatics/TaskPanel.ui \ - shipHydrostatics/Tools.py \ - shipUtils/__init__.py \ - shipUtils/Math.py \ - shipUtils/Paths.py \ - shipUtils/Units.py - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - $(data_DATA) \ - $(nobase_data_DATA) \ - CMakeLists.txt \ - README \ - ship.dox - diff --git a/src/Mod/Sketcher/App/Makefile.am b/src/Mod/Sketcher/App/Makefile.am deleted file mode 100644 index 30641a625c44..000000000000 --- a/src/Mod/Sketcher/App/Makefile.am +++ /dev/null @@ -1,108 +0,0 @@ -SUBDIRS=freegcs - -lib_LTLIBRARIES=libSketcher.la Sketcher.la - -BUILT_SOURCES=\ - ConstraintPy.cpp \ - SketchPy.cpp \ - SketchObjectPy.cpp \ - SketchObjectSFPy.cpp - -libSketcher_la_BUILT=\ - ConstraintPy.h \ - SketchPy.h \ - SketchObjectPy.h \ - SketchObjectSFPy.h - -libSketcher_la_SOURCES = \ - AppSketcherPy.cpp \ - Constraint.cpp \ - Constraint.h \ - ConstraintPyImp.cpp \ - PropertyConstraintList.cpp \ - PropertyConstraintList.h \ - SketchObject.cpp \ - SketchObject.h \ - SketchObjectPyImp.cpp \ - SketchObjectSF.cpp \ - SketchObjectSF.h \ - SketchObjectSFPyImp.cpp \ - Sketch.cpp \ - Sketch.h \ - SketchPyImp.cpp \ - PreCompiled.cpp \ - PreCompiled.h - - -# the library search path. -libSketcher_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Mod/Part/App \ - -L$(OCC_LIB) $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libSketcher_la_CPPFLAGS = -DSketcherAppExport= - -libSketcher_la_LIBADD = \ - freegcs/libfreegcs.la \ - @BOOST_REGEX_LIB@ @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lPart \ - -lTKernel \ - -lTKG2d \ - -lTKG3d \ - -lTKMath \ - -lTKSTEP \ - -lTKIGES \ - -lTKSTL \ - -lTKShHealing \ - -lTKXSBase \ - -lTKBool \ - -lTKBO \ - -lTKBRep \ - -lTKTopAlgo \ - -lTKGeomAlgo \ - -lTKGeomBase \ - -lTKOffset \ - -lTKPrim \ - -lTKHLR - -%.cpp: %.xml $(top_srcdir)/src/Tools/generateTemplates/templateClassPyExport.py - $(PYTHON) $(top_srcdir)/src/Tools/generate.py --outputPath $(@D) $< - -#-------------------------------------------------------------------------------------- -# Loader of libSketcher - -Sketcher_la_SOURCES=\ - AppSketcher.cpp - -# the library search path. -Sketcher_la_LDFLAGS = $(libSketcher_la_LDFLAGS) -module -avoid-version -Sketcher_la_CPPFLAGS = $(libSketcher_la_CPPFLAGS) - -Sketcher_la_LIBADD = \ - $(libSketcher_la_LIBADD) \ - -lSketcher - -Sketcher_la_DEPENDENCIES = libSketcher.la - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -AM_CXXFLAGS = -I$(OCC_INC) -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) \ - -I$(EIGEN3_INC) - - -libdir = $(prefix)/Mod/Sketcher -datadir = $(prefix)/Mod/Sketcher - -CLEANFILES = $(BUILT_SOURCES) $(libSketcher_la_BUILT) - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt \ - ConstraintPy.xml \ - SketchPy.xml \ - SketchObjectPy.xml \ - SketchObjectSFPy.xml - diff --git a/src/Mod/Sketcher/App/freegcs/Makefile.am b/src/Mod/Sketcher/App/freegcs/Makefile.am deleted file mode 100644 index 023cad83b838..000000000000 --- a/src/Mod/Sketcher/App/freegcs/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -noinst_LTLIBRARIES=libfreegcs.la - -libfreegcs_la_SOURCES = \ - GCS.cpp \ - GCS.h \ - Util.h \ - Geo.h \ - Constraints.cpp \ - Constraints.h \ - SubSystem.cpp \ - SubSystem.h \ - qp_eq.cpp \ - qp_eq.h - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/Mod/Sketcher/App \ - -I$(top_builddir)/src -I$(top_builddir)/src/Mod/Sketcher/App $(all_includes) \ - -I$(EIGEN3_INC) diff --git a/src/Mod/Sketcher/Gui/Makefile.am b/src/Mod/Sketcher/Gui/Makefile.am deleted file mode 100644 index 2eebddb69e22..000000000000 --- a/src/Mod/Sketcher/Gui/Makefile.am +++ /dev/null @@ -1,152 +0,0 @@ -SUBDIRS=Resources - -lib_LTLIBRARIES=libSketcherGui.la SketcherGui.la - -BUILT_SOURCES=\ - moc_SketchOrientationDialog.cpp \ - moc_TaskSketcherConstrains.cpp \ - moc_TaskSketcherElements.cpp \ - moc_TaskSketcherCreateCommands.cpp \ - moc_TaskSketcherGeneral.cpp \ - moc_TaskSketcherMessages.cpp \ - moc_TaskDlgEditSketch.cpp \ - ui_InsertDatum.h \ - ui_SketchOrientationDialog.h \ - ui_TaskSketcherConstrains.h \ - ui_TaskSketcherElements.h \ - ui_TaskSketcherGeneral.h \ - ui_TaskSketcherMessages.h - -libSketcherGui_la_UI=\ - InsertDatum.ui \ - SketchOrientationDialog.ui \ - TaskSketcherConstrains.ui \ - TaskSketcherElements.ui \ - TaskSketcherGeneral.ui \ - TaskSketcherMessages.ui - -libSketcherGui_la_SOURCES=\ - AppSketcherGuiPy.cpp \ - Command.cpp \ - CommandCreateGeo.cpp \ - CommandConstraints.cpp \ - CommandAlterGeometry.cpp \ - PreCompiled.cpp \ - PreCompiled.h \ - SoDatumLabel.cpp \ - SoDatumLabel.h \ - SoZoomTranslation.cpp \ - SoZoomTranslation.h \ - TaskSketcherConstrains.cpp \ - TaskSketcherConstrains.h \ - TaskSketcherElements.cpp \ - TaskSketcherElements.h \ - TaskSketcherCreateCommands.cpp \ - TaskSketcherCreateCommands.h \ - TaskSketcherGeneral.cpp \ - TaskSketcherGeneral.h \ - TaskSketcherMessages.cpp \ - TaskSketcherMessages.h \ - ViewProviderSketch.cpp \ - ViewProviderSketch.h \ - DrawSketchHandler.cpp \ - DrawSketchHandler.h \ - Workbench.cpp \ - Workbench.h \ - EditDatumDialog.cpp \ - EditDatumDialog.h \ - SketchOrientationDialog.cpp \ - SketchOrientationDialog.h \ - TaskDlgEditSketch.cpp \ - TaskDlgEditSketch.h \ - ViewProviderPython.cpp \ - ViewProviderPython.h - -# the library search path. -libSketcherGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui \ - -L../../Part/App -L../../Part/Gui -L../App -L$(OCC_LIB) \ - $(sim_ac_coin_ldflags) $(sim_ac_coin_libs) \ - $(sim_ac_soqt_ldflags) $(sim_ac_soqt_libs) \ - $(QT_LIBS) $(GL_LIBS) $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ - -libSketcherGui_la_CPPFLAGS = -DSketcherAppExport= -DSketcherGuiExport= - -libSketcherGui_la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - @BOOST_SIGNALS_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lTKernel \ - -lTKG2d \ - -lTKG3d \ - -lTKMath \ - -lTKMesh \ - -lTKSTEP \ - -lTKIGES \ - -lTKSTL \ - -lTKShHealing \ - -lTKXSBase \ - -lTKBool \ - -lTKBO \ - -lTKBRep \ - -lTKTopAlgo \ - -lTKGeomAlgo \ - -lTKGeomBase \ - -lTKOffset \ - -lTKPrim \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui \ - -lPart \ - -lPartGui \ - -lSketcher - -#-------------------------------------------------------------------------------------- -# Loader of libSketcherGui - -SketcherGui_la_SOURCES=\ - AppSketcherGui.cpp - -# the library search path. -SketcherGui_la_LDFLAGS = $(libSketcherGui_la_LDFLAGS) -module -avoid-version -SketcherGui_la_CPPFLAGS = $(libSketcherGui_la_CPPFLAGS) - -SketcherGui_la_LIBADD = \ - $(libSketcherGui_la_LIBADD) \ - Resources/libResources.la \ - -lSketcherGui - -SketcherGui_la_DEPENDENCIES = libSketcherGui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) $(QT_CXXFLAGS) -I$(OCC_INC) \ - -I$(sim_ac_coin_includedir) -I$(sim_ac_soqt_includedir) -I$(EIGEN3_INC) - - -libdir = $(prefix)/Mod/Sketcher - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - $(libSketcherGui_la_UI) \ - CMakeLists.txt - diff --git a/src/Mod/Sketcher/Gui/Resources/Makefile.am b/src/Mod/Sketcher/Gui/Resources/Makefile.am deleted file mode 100644 index dad78c9b4692..000000000000 --- a/src/Mod/Sketcher/Gui/Resources/Makefile.am +++ /dev/null @@ -1,153 +0,0 @@ -noinst_LTLIBRARIES=libResources.la - -BUILT_SOURCES=\ - qrc_Sketcher.cpp - -nodist_libResources_la_SOURCES=\ - qrc_Sketcher.cpp - -EXTRA_DIST = \ -icons/Constraint_PointOnObject.svg \ - icons/small/Constraint_TangentToStart_sm.xpm \ - icons/small/Constraint_Length_sm.xpm \ - icons/small/Constraint_Concentric_sm.xpm \ - icons/small/Constraint_TangentToEnd_sm.xpm \ - icons/small/Constraint_PointOnMidPoint_sm.xpm \ - icons/small/Constraint_PointOnStart_sm.xpm \ - icons/small/Constraint_Vertical_sm.xpm \ - icons/small/Constraint_PointOnEnd_sm.xpm \ - icons/small/Constraint_PointOnObject_sm.xpm \ - icons/small/Constraint_PointToObject_sm.xpm \ - icons/small/Constraint_InternalAngle_sm.xpm \ - icons/small/Constraint_Radius_sm.xpm \ - icons/small/Constraint_Horizontal_sm.xpm \ - icons/small/Constraint_ExternalAngle_sm.xpm \ - icons/small/Constraint_Parallel_sm.xpm \ - icons/small/Constraint_Perpendicular_sm.xpm \ - icons/small/Constraint_PointOnPoint_sm.xpm \ - icons/small/Constraint_Tangent_sm.xpm \ - icons/small/Constraint_EqualLength_sm.xpm \ - icons/small/Constraint_HorizontalDistance_sm.xpm \ - icons/small/Constraint_VerticalDistance_sm.xpm \ - icons/small/Constraint_Symmetric_sm.xpm \ - icons/Constraint_PointOnObject.svg \ - icons/Constraint_TangentToStart.svg \ - icons/Constraint_Length.svg \ - icons/Constraint_Concentric.svg \ - icons/Constraint_TangentToEnd.svg \ - icons/Constraint_PointOnMidPoint.svg \ - icons/Sketcher_ConstrainDistance.svg \ - icons/Sketcher_ConstrainParallel.svg \ - icons/Constraint_PointOnStart.svg \ - icons/Constraint_Vertical.svg \ - icons/Constraint_PointOnEnd.svg \ - icons/Constraint_PointToObject.svg \ - icons/Constraint_InternalAngle.svg \ - icons/Constraint_Radius.svg \ - icons/Constraint_Horizontal.svg \ - icons/Constraint_ExternalAngle.svg \ - icons/Constraint_Parallel.svg \ - icons/Constraint_Perpendicular.svg \ - icons/Constraint_PointOnPoint.svg \ - icons/Constraint_Tangent.svg \ - icons/Constraint_EqualLength.svg \ - icons/Constraint_HorizontalDistance.svg \ - icons/Constraint_VerticalDistance.svg \ - icons/Constraint_Symmetric.svg \ - icons/Sketcher_AlterConstruction.svg \ - icons/Sketcher_AlterFillet.svg \ - icons/Sketcher_ConstrainCoincident.svg \ - icons/Sketcher_ConstrainHorizontal.svg \ - icons/Sketcher_ConstrainLock.svg \ - icons/Sketcher_ConstrainVertical.svg \ - icons/Sketcher_CreateArc.svg \ - icons/Sketcher_Create3PointArc.svg \ - icons/Sketcher_CreateCircle.svg \ - icons/Sketcher_Create3PointCircle.svg \ - icons/Sketcher_CreateLine.svg \ - icons/Sketcher_CreatePoint.svg \ - icons/Sketcher_CreatePolyline.svg \ - icons/Sketcher_CreateRectangle.svg \ - icons/Sketcher_CreateFillet.svg \ - icons/Sketcher_CreateText.svg \ - icons/Sketcher_DraftLine.svg \ - icons/Sketcher_Trimming.svg \ - icons/Sketcher_External.svg \ - icons/Sketcher_LeaveSketch.svg \ - icons/Sketcher_MapSketch.svg \ - icons/Sketcher_NewSketch.svg \ - icons/Sketcher_ViewSketch.svg \ - icons/Sketcher_Sketch.svg \ - icons/Sketcher_Element_EndPoint.svg \ - icons/Sketcher_Element_Line.svg \ - icons/Sketcher_Element_MidPoint.svg \ - icons/Sketcher_Element_StartingPoint.svg \ - icons/small/Sketcher_Element_EndPoint_sm.xpm \ - icons/small/Sketcher_Element_Line_sm.xpm \ - icons/small/Sketcher_Element_MidPoint_sm.xpm \ - icons/small/Sketcher_Element_StartingPoint_sm.xpm \ - translations/Sketcher_af.qm \ - translations/Sketcher_af.ts \ - translations/Sketcher_de.qm \ - translations/Sketcher_de.ts \ - translations/Sketcher_es-ES.qm \ - translations/Sketcher_es-ES.ts \ - translations/Sketcher_fi.qm \ - translations/Sketcher_fi.ts \ - translations/Sketcher_fr.qm \ - translations/Sketcher_fr.ts \ - translations/Sketcher_hr.qm \ - translations/Sketcher_hr.ts \ - translations/Sketcher_it.qm \ - translations/Sketcher_it.ts \ - translations/Sketcher_nl.qm \ - translations/Sketcher_nl.ts \ - translations/Sketcher_no.qm \ - translations/Sketcher_no.ts \ - translations/Sketcher_pl.qm \ - translations/Sketcher_pl.ts \ - translations/Sketcher_pt-BR.qm \ - translations/Sketcher_pt-BR.ts \ - translations/Sketcher_ru.qm \ - translations/Sketcher_ru.ts \ - translations/Sketcher_sv-SE.qm \ - translations/Sketcher_sv-SE.ts \ - translations/Sketcher_uk.qm \ - translations/Sketcher_uk.ts \ - translations/Sketcher_zh-CN.qm \ - translations/Sketcher_zh-CN.ts \ - translations/Sketcher_zh-TW.qm \ - translations/Sketcher_zh-TW.ts \ - translations/Sketcher_cs.qm \ - translations/Sketcher_cs.ts \ - translations/Sketcher_sk.qm \ - translations/Sketcher_sk.ts \ - translations/Sketcher_hu.qm \ - translations/Sketcher_hu.ts \ - translations/Sketcher_ro.qm \ - translations/Sketcher_ro.ts \ - translations/Sketcher_tr.qm \ - translations/Sketcher_tr.ts \ - translations/Sketcher_ja.qm \ - translations/Sketcher_ja.ts \ - Sketcher.qrc - - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(srcdir)/.. \ - $(all_includes) $(QT_CXXFLAGS) -I$(OCC_INC) - -CLEANFILES = $(BUILT_SOURCES) diff --git a/src/Mod/Sketcher/Makefile.am b/src/Mod/Sketcher/Makefile.am deleted file mode 100644 index af4b5c036e98..000000000000 --- a/src/Mod/Sketcher/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -SUBDIRS=App Gui Templates - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Sketcher - -data_DATA = Init.py InitGui.py SketcherExample.py TestSketcherApp.py TestSketcherGui.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt \ - sketcher.dox diff --git a/src/Mod/Sketcher/Templates/Makefile.am b/src/Mod/Sketcher/Templates/Makefile.am deleted file mode 100644 index 6a5c6113a9dc..000000000000 --- a/src/Mod/Sketcher/Templates/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -# Change data dir from default $(datadir) to $(datadir)/Mod/Sketcher/Templates -datadir = @datadir@/Mod/Sketcher/Templates -data_DATA = \ - Sketch.skf - -EXTRA_DIST = \ - $(data_DATA) diff --git a/src/Mod/Start/App/Makefile.am b/src/Mod/Start/App/Makefile.am deleted file mode 100644 index 23d969f0cadf..000000000000 --- a/src/Mod/Start/App/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -lib_LTLIBRARIES=libStart.la Start.la - -libStart_la_SOURCES=\ - AppStartPy.cpp \ - StartConfiguration.h \ - PreCompiled.cpp \ - PreCompiled.h - - -# the library search path. -libStart_la_LDFLAGS = -L../../../Base -L../../../App $(all_libraries) -version-info \ - @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libStart_la_CPPFLAGS = -DStartAppExport= - -libStart_la_LIBADD = \ - @BOOST_REGEX_LIB@ @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp - -#-------------------------------------------------------------------------------------- -# Loader of libStart - -Start_la_SOURCES=\ - AppStart.cpp - -# the library search path. -Start_la_LDFLAGS = $(libStart_la_LDFLAGS) -module -avoid-version -Start_la_CPPFLAGS = $(libStart_la_CPPFLAGS) - -Start_la_LIBADD = \ - $(libStart_la_LIBADD) \ - -lStart - -Start_la_DEPENDENCIES = libStart.la - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) - -libdir = $(prefix)/Mod/Start - -EXTRA_DIST = \ - CMakeLists.txt diff --git a/src/Mod/Start/Gui/Makefile.am b/src/Mod/Start/Gui/Makefile.am deleted file mode 100644 index 3b26643e6880..000000000000 --- a/src/Mod/Start/Gui/Makefile.am +++ /dev/null @@ -1,71 +0,0 @@ -SUBDIRS=Resources - -lib_LTLIBRARIES=libStartGui.la StartGui.la - -libStartGui_la_SOURCES=\ - AppStartGuiPy.cpp \ - Command.cpp \ - PreCompiled.cpp \ - PreCompiled.h \ - Workbench.cpp \ - Workbench.h - -# the library search path. -libStartGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui -L../App $(QT_LIBS) $(GL_LIBS) \ - $(all_libraries) -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libStartGui_la_CPPFLAGS = -DStartAppExport= -DStartGuiExport= - -libStartGui_la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui \ - -lStart - -#-------------------------------------------------------------------------------------- -# Loader of libStartGui - -StartGui_la_SOURCES=\ - AppStartGui.cpp - -# the library search path. -StartGui_la_LDFLAGS = $(libStartGui_la_LDFLAGS) -module -avoid-version -StartGui_la_CPPFLAGS = $(libStartGui_la_CPPFLAGS) - -StartGui_la_LIBADD = \ - $(libStartGui_la_LIBADD) \ - Resources/libResources.la \ - -lStartGui - -StartGui_la_DEPENDENCIES = libStartGui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(QT_CXXFLAGS) $(all_includes) - -libdir = $(prefix)/Mod/Start - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - CMakeLists.txt - diff --git a/src/Mod/Start/Gui/Resources/Makefile.am b/src/Mod/Start/Gui/Resources/Makefile.am deleted file mode 100644 index 50d8515cfb0f..000000000000 --- a/src/Mod/Start/Gui/Resources/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -noinst_LTLIBRARIES=libResources.la - -BUILT_SOURCES=\ - qrc_Start.cpp - -nodist_libResources_la_SOURCES=\ - qrc_Start.cpp - -EXTRA_DIST = \ - translations/StartPage_af.qm \ - translations/StartPage_af.ts \ - translations/StartPage_de.qm \ - translations/StartPage_de.ts \ - translations/StartPage_es-ES.qm \ - translations/StartPage_es-ES.ts \ - translations/StartPage_fi.qm \ - translations/StartPage_fi.ts \ - translations/StartPage_fr.qm \ - translations/StartPage_fr.ts \ - translations/StartPage_hr.qm \ - translations/StartPage_hr.ts \ - translations/StartPage_hu.qm \ - translations/StartPage_hu.ts \ - translations/StartPage_it.qm \ - translations/StartPage_it.ts \ - translations/StartPage_ja.qm \ - translations/StartPage_ja.ts \ - translations/StartPage_nl.qm \ - translations/StartPage_nl.ts \ - translations/StartPage_no.qm \ - translations/StartPage_no.ts \ - translations/StartPage_pl.qm \ - translations/StartPage_pl.ts \ - translations/StartPage_pt-BR.qm \ - translations/StartPage_pt-BR.ts \ - translations/StartPage_ru.qm \ - translations/StartPage_ru.ts \ - translations/StartPage_sv-SE.qm \ - translations/StartPage_sv-SE.ts \ - translations/StartPage_uk.qm \ - translations/StartPage_uk.ts \ - translations/StartPage_zh-CN.qm \ - translations/StartPage_zh-CN.ts \ - translations/StartPage_zh-TW.qm \ - translations/StartPage_zh-TW.ts \ - translations/StartPage_cs.qm \ - translations/StartPage_cs.ts \ - translations/StartPage_sk.qm \ - translations/StartPage_sk.ts \ - translations/StartPage_tr.qm \ - translations/StartPage_tr.ts \ - translations/StartPage_hu.qm \ - translations/StartPage_hu.ts \ - translations/StartPage_ro.qm \ - translations/StartPage_ro.ts \ - translations/StartPage_ja.qm \ - translations/StartPage_ja.ts \ - Start.qrc \ - UpdateResources.bat - - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(srcdir)/.. $(QT_CXXFLAGS) $(all_includes) - -CLEANFILES = $(BUILT_SOURCES) diff --git a/src/Mod/Start/Makefile.am b/src/Mod/Start/Makefile.am deleted file mode 100644 index db8210638491..000000000000 --- a/src/Mod/Start/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -SUBDIRS=App Gui StartPage - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Start - -data_DATA = Init.py InitGui.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt \ - start.dox diff --git a/src/Mod/Start/StartPage/Makefile.am b/src/Mod/Start/StartPage/Makefile.am deleted file mode 100644 index 0f6151dcb067..000000000000 --- a/src/Mod/Start/StartPage/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ - -# Change data dir from default ($(prefix)/share) to $(prefix) -pythondir = $(prefix)/Mod/Start/StartPage -datadir = @datadir@/Mod/Start/StartPage - -# Only these two scripts must be here! -python_DATA = \ - StartPage.py \ - __init__.py - -data_DATA = \ - ArchDesign.py \ - DefaultWorkbench.py \ - LoadDrawingExample.py \ - LoadPartDesignExample.py \ - LoadRobotExample.py \ - LoadSchenkel.py \ - LoadMRU0.py \ - LoadMRU1.py \ - LoadMRU2.py \ - LoadArchExample.py \ - Mesh.py \ - PartDesign.py \ - Background.jpg \ - FreeCAD.png \ - PartDesign.png \ - ArchDesign.png \ - Mesh.png \ - Complete.png \ - PartDesignExample.png \ - ArchExample.png \ - web.png \ - blank.png \ - complete.jpg \ - Ship.py \ - Ship.png \ - ShipExample.png - -EXTRA_DIST = \ - $(data_DATA) $(python_DATA) - diff --git a/src/Mod/TemplatePyMod/Makefile.am b/src/Mod/TemplatePyMod/Makefile.am deleted file mode 100644 index 1a52fb638ec3..000000000000 --- a/src/Mod/TemplatePyMod/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/TemplatePyMod -data_DATA = \ - Init.py \ - InitGui.py \ - Commands.py \ - FeaturePython.py \ - DocumentObject.py \ - Mesh2Shape.py \ - PythonQt.py \ - Tests.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt diff --git a/src/Mod/Test/Gui/Makefile.am b/src/Mod/Test/Gui/Makefile.am deleted file mode 100644 index 10bd2084db0c..000000000000 --- a/src/Mod/Test/Gui/Makefile.am +++ /dev/null @@ -1,124 +0,0 @@ - -lib_LTLIBRARIES=libQtUnitGui.la QtUnitGui.la - -BUILT_SOURCES=\ - ui_UnitTest.h \ - moc_UnitTestImp.cpp \ - qrc_Test.cpp - -libQtUnitGui_la_SOURCES=\ - PreCompiled.cpp \ - PreCompiled.h \ - UnitTestImp.cpp \ - UnitTestImp.h \ - UnitTestPy.cpp \ - UnitTestPy.h - -# the library search path. -libQtUnitGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui $(QT_LIBS) $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libQtUnitGui_la_CPPFLAGS = -DQtUnitAppExport= -DQtUnitGuiExport= - -libQtUnitGui_la_LIBADD = \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui - -#-------------------------------------------------------------------------------------- -# Loader of libQtUnitGui - -QtUnitGui_la_SOURCES=\ - AppTestGui.cpp - -# the library search path. -QtUnitGui_la_LDFLAGS = $(libQtUnitGui_la_LDFLAGS) -module -avoid-version -QtUnitGui_la_CPPFLAGS = $(libQtUnitGui_la_CPPFLAGS) - -QtUnitGui_la_LIBADD = \ - $(libQtUnitGui_la_LIBADD) \ - -lQtUnitGui - -QtUnitGui_la_DEPENDENCIES = libQtUnitGui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: Resources/%.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) $(QT_CXXFLAGS) - -libdir = $(prefix)/Mod/Test - -CLEANFILES = $(BUILT_SOURCES) - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Test -data_DATA = \ - qtunittest.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt \ - UnitTest.ui \ - Resources/Test.qrc \ - Resources/translations/Test_af.qm \ - Resources/translations/Test_af.ts \ - Resources/translations/Test_de.qm \ - Resources/translations/Test_de.ts \ - Resources/translations/Test_es-ES.qm \ - Resources/translations/Test_es-ES.ts \ - Resources/translations/Test_fi.qm \ - Resources/translations/Test_fi.ts \ - Resources/translations/Test_fr.qm \ - Resources/translations/Test_fr.ts \ - Resources/translations/Test_hr.qm \ - Resources/translations/Test_hr.ts \ - Resources/translations/Test_hu.qm \ - Resources/translations/Test_hu.ts \ - Resources/translations/Test_it.qm \ - Resources/translations/Test_it.ts \ - Resources/translations/Test_ja.qm \ - Resources/translations/Test_ja.ts \ - Resources/translations/Test_nl.qm \ - Resources/translations/Test_nl.ts \ - Resources/translations/Test_no.qm \ - Resources/translations/Test_no.ts \ - Resources/translations/Test_pl.qm \ - Resources/translations/Test_pl.ts \ - Resources/translations/Test_pt-BR.qm \ - Resources/translations/Test_pt-BR.ts \ - Resources/translations/Test_ru.qm \ - Resources/translations/Test_ru.ts \ - Resources/translations/Test_sv-SE.qm \ - Resources/translations/Test_sv-SE.ts \ - Resources/translations/Test_uk.qm \ - Resources/translations/Test_uk.ts \ - Resources/translations/Test_zh-CN.qm \ - Resources/translations/Test_zh-CN.ts \ - Resources/translations/Test_zh-TW.qm \ - Resources/translations/Test_zh-TW.ts \ - Resources/translations/Test_ro.qm \ - Resources/translations/Test_ro.ts \ - Resources/translations/Test_cs.qm \ - Resources/translations/Test_cs.ts \ - Resources/translations/Test_sk.qm \ - Resources/translations/Test_sk.ts \ - Resources/translations/Test_tr.qm \ - Resources/translations/Test_tr.ts \ - qtunittest.py diff --git a/src/Mod/Test/Makefile.am b/src/Mod/Test/Makefile.am deleted file mode 100644 index bd8915b9a403..000000000000 --- a/src/Mod/Test/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -SUBDIRS=Gui - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Test -data_DATA = \ - BaseTests.py \ - Document.py \ - Init.py \ - InitGui.py \ - Menu.py \ - TestApp.py \ - TestGui.py \ - UnicodeTests.py \ - UnitTests.py \ - Workbench.py - -EXTRA_DIST = \ - $(data_DATA) \ - unittestgui.py \ - CMakeLists.txt \ - test.dox diff --git a/src/Mod/Web/Gui/Makefile.am b/src/Mod/Web/Gui/Makefile.am deleted file mode 100644 index 0a130340a90b..000000000000 --- a/src/Mod/Web/Gui/Makefile.am +++ /dev/null @@ -1,74 +0,0 @@ -SUBDIRS=Resources - -lib_LTLIBRARIES=libWebGui.la WebGui.la - -BUILT_SOURCES=\ - moc_BrowserView.cpp - -libWebGui_la_SOURCES=\ - AppWebGuiPy.cpp \ - Command.cpp \ - PreCompiled.cpp \ - PreCompiled.h \ - BrowserView.cpp \ - BrowserView.h \ - Workbench.cpp \ - Workbench.h - -# the library search path. -libWebGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui $(QT_LIBS) $(GL_LIBS) \ - $(all_libraries) -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -libWebGui_la_CPPFLAGS = -DWebAppExport= -DWebGuiExport= - -libWebGui_la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui - -#-------------------------------------------------------------------------------------- -# Loader of libWebGui - -WebGui_la_SOURCES=\ - AppWebGui.cpp - -# the library search path. -WebGui_la_LDFLAGS = $(libWebGui_la_LDFLAGS) -module -avoid-version -WebGui_la_CPPFLAGS = $(libWebGui_la_CPPFLAGS) - -WebGui_la_LIBADD = \ - $(libWebGui_la_LIBADD) \ - Resources/libResources.la \ - -lWebGui - -WebGui_la_DEPENDENCIES = libWebGui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(QT_CXXFLAGS) $(all_includes) - -libdir = $(prefix)/Mod/Web - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - CMakeLists.txt - diff --git a/src/Mod/Web/Gui/Resources/Makefile.am b/src/Mod/Web/Gui/Resources/Makefile.am deleted file mode 100644 index eec6e663bcd9..000000000000 --- a/src/Mod/Web/Gui/Resources/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -noinst_LTLIBRARIES=libResources.la - -BUILT_SOURCES=\ - qrc_Web.cpp - -nodist_libResources_la_SOURCES=\ - qrc_Web.cpp - -EXTRA_DIST = \ - icons/actions/web-browser.svg \ - icons/actions/web-home.svg \ - icons/actions/web-next.svg \ - icons/actions/web-previous.svg \ - icons/actions/web-refresh.svg \ - icons/actions/web-stop.svg \ - icons/actions/web-zoom-in.svg \ - icons/actions/web-zoom-out.svg \ - Web.qrc \ - UpdateResources.bat - - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: %.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(srcdir)/.. $(QT_CXXFLAGS) $(all_includes) - -CLEANFILES = $(BUILT_SOURCES) diff --git a/src/Mod/Web/Makefile.am b/src/Mod/Web/Makefile.am deleted file mode 100644 index 29855addd8c2..000000000000 --- a/src/Mod/Web/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -SUBDIRS=Gui - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/Web - -data_DATA = Init.py InitGui.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt \ - web.dox diff --git a/src/Tools/Makefile.am b/src/Tools/Makefile.am deleted file mode 100644 index f7e2c226edcc..000000000000 --- a/src/Tools/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -if BUILD_TEMPLATE -SUBDIRS=_TEMPLATE_ -endif - -EXTRA_DIST = \ - fcbt/__init__.py \ - fcbt/CreateModule.py \ - fcbt/DistBin.py \ - fcbt/DistSetup.py \ - fcbt/DistSrc.py \ - fcbt/DistTools.py \ - fcbt/FileTools.py \ - fcbt/NextBuildNumber.py \ - generate.py \ - generateBase/generateModel_ModuleTest.xml \ - generateBase/generateMetaModel_Module.xsd \ - generateBase/__init__.py \ - generateBase/generateModel_Module.py \ - generateBase/generateDS.py \ - generateBase/generateTools.py \ - generateTemplates/__init__.py \ - generateTemplates/template.py \ - generateTemplates/templateClassPyExport.py \ - generateTemplates/templateCMakeFile.py \ - generateTemplates/templateCPPFile.py \ - generateTemplates/templateHeaderFile.py \ - generateTemplates/templateInitPy.py \ - generateTemplates/templateInitGuiPy.py \ - generateTemplates/templateModule.py \ - generateTemplates/templateModuleApp.py \ - generateTemplates/templateModuleGui.py \ - generateTemplates/templateModuleAppFeature.py \ - generateTemplates/templateModuleAppMain.py \ - plugins/widget/customwidgets.cpp \ - plugins/widget/customwidgets.h \ - plugins/widget/plugin.cpp \ - plugins/widget/plugin.h \ - plugins/widget/plugin.pro \ - dir2qrc.py \ - DistTools.py \ - doctools.py \ - fcbt.py \ - FCFileTools.py \ - InstallMsg.txt \ - MakeApp.py \ - MakeAppTools.py \ - MakeNewBuildNbr.py \ - MemoryLeaks.py \ - PythonToCPP.py \ - pythondoc.py \ - SubWCRev.py \ - wiki2qhelp.py diff --git a/src/Tools/_TEMPLATE_/App/Makefile.am b/src/Tools/_TEMPLATE_/App/Makefile.am deleted file mode 100644 index 3741b296600f..000000000000 --- a/src/Tools/_TEMPLATE_/App/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ - -lib_LTLIBRARIES=lib_TEMPLATE_.la _TEMPLATE_.la - -lib_TEMPLATE__la_SOURCES=\ - App_TEMPLATE_Py.cpp \ - PreCompiled.cpp \ - PreCompiled.h - -includedir = @includedir@/Mod/_TEMPLATE_/App - -# the library search path. -lib_TEMPLATE__la_LDFLAGS = -L../../../Base -L../../../App $(all_libraries) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -lib_TEMPLATE__la_CPPFLAGS = -D_TEMPLATE_AppExport= - -lib_TEMPLATE__la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp - -#-------------------------------------------------------------------------------------- -# Loader of lib_TEMPLATE_ - -_TEMPLATE__la_SOURCES=\ - App_TEMPLATE_.cpp - -# the library search path. -_TEMPLATE__la_LDFLAGS = $(lib_TEMPLATE__la_LDFLAGS) -module -avoid-version -_TEMPLATE__la_CPPFLAGS = $(lib_TEMPLATE__la_CPPFLAGS) - -_TEMPLATE__la_LIBADD = \ - $(lib_TEMPLATE__la_LIBADD) \ - -l_TEMPLATE_ - -_TEMPLATE__la_DEPENDENCIES = lib_TEMPLATE_.la - -#-------------------------------------------------------------------------------------- - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) - -libdir = $(prefix)/Mod/_TEMPLATE_ - -EXTRA_DIST = \ - CMakeLists.txt diff --git a/src/Tools/_TEMPLATE_/Gui/Makefile.am b/src/Tools/_TEMPLATE_/Gui/Makefile.am deleted file mode 100644 index 04f4925d5b58..000000000000 --- a/src/Tools/_TEMPLATE_/Gui/Makefile.am +++ /dev/null @@ -1,79 +0,0 @@ - -lib_LTLIBRARIES=lib_TEMPLATE_Gui.la _TEMPLATE_Gui.la - -BUILT_SOURCES= - -lib_TEMPLATE_Gui_la_SOURCES=\ - App_TEMPLATE_GuiPy.cpp \ - Command.cpp \ - PreCompiled.cpp \ - PreCompiled.h \ - Workbench.cpp \ - Workbench.h - -includedir = @includedir@/Mod/_TEMPLATE_/Gui - -# the library search path. -lib_TEMPLATE_Gui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui -L../App \ - $(QT_LIBS) $(all_libraries) \ - $(sim_ac_coin_ldflags) $(sim_ac_coin_libs) \ - $(sim_ac_soqt_ldflags) $(sim_ac_soqt_libs) \ - -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ - -lib_TEMPLATE_Gui_la_CPPFLAGS = -D_TEMPLATE_AppExport= -D_TEMPLATE_GuiExport= - -lib_TEMPLATE_Gui_la_LIBADD = \ - @BOOST_SYSTEM_LIB@ \ - -l@PYTHON_LIB@ \ - -lxerces-c \ - -lFreeCADBase \ - -lFreeCADApp \ - -lFreeCADGui \ - -l_TEMPLATE_ - -#-------------------------------------------------------------------------------------- -# Loader of lib_TEMPLATE_Gui - -_TEMPLATE_Gui_la_SOURCES=\ - App_TEMPLATE_Gui.cpp - -# the library search path. -_TEMPLATE_Gui_la_LDFLAGS = $(lib_TEMPLATE_Gui_la_LDFLAGS) -module -avoid-version -_TEMPLATE_Gui_la_CPPFLAGS = $(lib_TEMPLATE_Gui_la_CPPFLAGS) - -_TEMPLATE_Gui_la_LIBADD = \ - $(lib_TEMPLATE_Gui_la_LIBADD) \ - -l_TEMPLATE_Gui - -_TEMPLATE_Gui_la_DEPENDENCIES = lib_TEMPLATE_Gui.la - -#-------------------------------------------------------------------------------------- - -# rule for Qt MetaObject Compiler: -moc_%.cpp: %.h - $(QT_MOC) $< -o $(@F) - -# rule for Qt MetaObject Compiler: -%.moc: %.h - $(QT_MOC) $< -o $(@F) - -# rules for Qt User Interface Compiler: -ui_%.h: %.ui - $(QT_UIC) $< -o $(@F) - -# rules for Qt Resource Compiler: -qrc_%.cpp: Resources/%.qrc - $(QT_RCC) -name $(*F) $< -o $(@F) - -# set the include path found by configure -AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) $(QT_CXXFLAGS) \ - -I$(sim_ac_coin_includedir) -I$(sim_ac_soqt_includedir) - -libdir = $(prefix)/Mod/_TEMPLATE_ - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - CMakeLists.txt \ - Resources/_TEMPLATE_.qrc - diff --git a/src/Tools/_TEMPLATE_/Makefile.am b/src/Tools/_TEMPLATE_/Makefile.am deleted file mode 100644 index b654d39e283e..000000000000 --- a/src/Tools/_TEMPLATE_/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -SUBDIRS=App Gui - -# Change data dir from default ($(prefix)/share) to $(prefix) -datadir = $(prefix)/Mod/_TEMPLATE_ -data_DATA = Init.py InitGui.py - -EXTRA_DIST = \ - $(data_DATA) \ - CMakeLists.txt \ - _TEMPLATE_.dox From e3e2667252c7f079d8e842a54814457421d877d2 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 26 Nov 2014 13:03:59 +0100 Subject: [PATCH 07/12] + remove some more autotools files --- acinclude.m4 | 503 ---------------------- autogen.sh | 69 --- build.sh | 8 - configure.ac | 1113 ------------------------------------------------- mkinstalldirs | 111 ----- 5 files changed, 1804 deletions(-) delete mode 100644 acinclude.m4 delete mode 100755 autogen.sh delete mode 100755 build.sh delete mode 100644 configure.ac delete mode 100644 mkinstalldirs diff --git a/acinclude.m4 b/acinclude.m4 deleted file mode 100644 index fa3d0aa410a0..000000000000 --- a/acinclude.m4 +++ /dev/null @@ -1,503 +0,0 @@ -dnl @synopsis AC_CXX_HAVE_STL -dnl -dnl If the compiler supports the Standard Template Library, define HAVE_STL. -dnl -dnl @version $Id: acinclude.m4,v 1.2 2006/02/24 00:09:19 wmayer Exp $ -dnl @author Luc Maisonobe -dnl -AC_DEFUN([AC_CXX_HAVE_STL], -[AC_CACHE_CHECK(whether the compiler supports Standard Template Library, -ac_cv_cxx_have_stl, -[AC_REQUIRE([AC_CXX_NAMESPACES]) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include -#include -#ifdef HAVE_NAMESPACES -using namespace std; -#endif],[list x; x.push_back(5); -list::iterator iter = x.begin(); if (iter != x.end()) ++iter; return 0;], - ac_cv_cxx_have_stl=yes, ac_cv_cxx_have_stl=no) - AC_LANG_RESTORE -]) -if test "$ac_cv_cxx_have_stl" = yes; then - AC_DEFINE(HAVE_STL,,[define if the compiler supports Standard Template Library]) -fi -]) -dnl @synopsis AC_CXX_HAVE_STD -dnl -dnl If the compiler supports ISO C++ standard library (i.e., can include the -dnl files iostream, map, iomanip and cmath}), define HAVE_STD. -dnl -dnl @version $Id: acinclude.m4,v 1.2 2006/02/24 00:09:19 wmayer Exp $ -dnl @author Luc Maisonobe -dnl -AC_DEFUN([AC_CXX_HAVE_STD], -[AC_CACHE_CHECK(whether the compiler supports ISO C++ standard library, -ac_cv_cxx_have_std, -[AC_REQUIRE([AC_CXX_NAMESPACES]) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include -#include -#include -#include -#ifdef HAVE_NAMESPACES -using namespace std; -#endif],[return 0;], - ac_cv_cxx_have_std=yes, ac_cv_cxx_have_std=no) - AC_LANG_RESTORE -]) -if test "$ac_cv_cxx_have_std" = yes; then - AC_DEFINE(HAVE_STD,,[define if the compiler supports ISO C++ standard library]) -fi -]) -dnl @synopsis AC_CXX_NAMESPACES -dnl -dnl If the compiler can prevent names clashes using namespaces, define -dnl HAVE_NAMESPACES. -dnl -dnl @version $Id: acinclude.m4,v 1.2 2006/02/24 00:09:19 wmayer Exp $ -dnl @author Luc Maisonobe -dnl -AC_DEFUN([AC_CXX_NAMESPACES], -[AC_CACHE_CHECK(whether the compiler implements namespaces, -ac_cv_cxx_namespaces, -[AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([namespace Outer { namespace Inner { int i = 0; }}], - [using namespace Outer::Inner; return i;], - ac_cv_cxx_namespaces=yes, ac_cv_cxx_namespaces=no) - AC_LANG_RESTORE -]) -if test "$ac_cv_cxx_namespaces" = yes; then - AC_DEFINE(HAVE_NAMESPACES,,[define if the compiler implements namespaces]) -fi -]) -dnl @synopsis AC_CXX_HAVE_SSTREAM -dnl -dnl If sstream (part of Standard C++ Library) exists -dnl define HAVE_SSTREAM. -dnl -dnl @version ac_cxx_have_std.m4 Tue Mar 28 18:20:26 CEST 2000 -dnl @author Thomas Sondergaard thomass@deltadata.dk -dnl -AC_DEFUN([AC_CXX_HAVE_SSTREAM], -[AC_CACHE_CHECK(for sstream, -ac_cv_cxx_have_sstream, -[AC_REQUIRE([AC_CXX_NAMESPACES]) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([#include -#ifdef HAVE_NAMESPACES -using namespace std; -#endif],[return 0;], - ac_cv_cxx_have_sstream=yes, ac_cv_cxx_have_sstream=no) - AC_LANG_RESTORE -]) -if test "$ac_cv_cxx_have_sstream" = yes; then - AC_DEFINE(HAVE_SSTREAM,1,[define if the compiler supports sstream]) -fi -]) -dnl @synopsis AC_CXX_HAVE_STD_IOSTREAM -dnl -dnl If std iostream (part of Standard C++ Library) exists -dnl define HAVE_STD_IOSTREAM. -dnl -dnl @version ac_cxx_have_std.m4 Tue Mar 28 18:20:26 CEST 2000 -dnl @author Thomas Sondergaard thomass@deltadata.dk -dnl -AC_DEFUN([AC_CXX_HAVE_STD_IOSTREAM], -[AC_CACHE_CHECK(for std iostream, -ac_cv_cxx_have_std_iostream, -[AC_REQUIRE([AC_CXX_NAMESPACES]) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([ -#include -#include -#include -#ifdef HAVE_NAMESPACES -using namespace std; -#endif -],[return 0;], - ac_cv_cxx_have_std_iostream=yes, ac_cv_cxx_have_std_iostream=no) - AC_LANG_RESTORE -]) -if test "$ac_cv_cxx_have_std_iostream" = yes; then - AC_DEFINE(HAVE_STD_IOSTREAM,,[define if the compiler has std compliant iostream library]) -fi -]) -dnl @synopsis FREECAD_AC_HAVE_QT(MINIMUM_VERSION) -dnl -dnl @summary Search for Trolltech's Qt GUI framework. -dnl -dnl Checks for the Qt4 library and its tools uic, moc and rcc. -dnl -dnl The following variables are exported: -dnl -dnl QT_DIR -dnl QT_CXXFLAGS -dnl QT_LIBS -dnl QT_MOC -dnl QT_UIC -dnl QT_RCC -dnl -AC_DEFUN([FREECAD_AC_HAVE_QT], -[ - -AC_ARG_WITH([qt4-dir], - AC_HELP_STRING([--with-qt4-dir=DIR], [give prefix location of Qt4]), - [fc_qt4_dir="$withval"], - [fc_qt4_dir="/usr/share/qt4"]) - -AC_ARG_WITH([qt4-include], - AC_HELP_STRING([--with-qt4-include=DIR], [give include prefix of Qt4]), - [fc_qt4_include="$withval"], - [fc_qt4_include="$fc_qt4_dir/include"]) - -AC_ARG_WITH([qt4-lib], - AC_HELP_STRING([--with-qt4-lib=DIR], [give library path to Qt4]), - [fc_qt4_lib="$withval"], - [fc_qt4_lib="$fc_qt4_dir/lib"]) - -AC_ARG_WITH([qt4-bin], - AC_HELP_STRING([--with-qt4-bin=DIR], [give path to Qt4 utilities (moc, uic, rcc)]), - [fc_qt4_bin="$withval"], - [fc_qt4_bin="$fc_qt4_dir/bin"]) - -AC_ARG_WITH([qt4-framework], - AC_HELP_STRING([--with-qt4-framework], - [give prefix path to the Qt4 framework on Mac OS X]), - [fc_qt4_frm="$withval"], - [fc_qt4_frm=""]) - -AC_MSG_CHECKING(for host) -AC_MSG_RESULT($host_os) -case $host_os in - mingw32*) - fc_qt4_lib_core="-L$fc_qt4_lib -lQtCore" - QT_LIBS="-L$fc_qt4_lib -lopengl32 -lglu32 -lgdi32 -luser32 -lmingw32 -mthreads -Wl,-enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc -Wl,-s -Wl,-s -Wl,-subsystem,windows" - QT_CXXFLAGS="-I$fc_qt4_include -I$fc_qt4_include/QtCore -I$fc_qt4_include/QtGui -I$fc_qt4_include/QtOpenGL -I$fc_qt4_include/QtSvg -DUNICODE -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -DQT_NEEDS_QMAIN -frtti -fexceptions" - ;; - darwin*) - AC_PATH_XTRA - if test -d $fc_qt4_frm/QtCore.framework; then - ac_save_ldflags_fw=$LDFLAGS - LDFLAGS="$LDFLAGS -F$fc_qt4_frm -framework QtCore" - AC_CACHE_CHECK( - [whether Qt is installed as framework], - ac_cv_have_qt_framework, - [AC_TRY_LINK([#include - #include ], - [printf("%s\n", qVersion());], - [ac_cv_have_qt_framework=yes], - [ac_cv_have_qt_framework=no]) - ]) - LDFLAGS=$ac_save_ldflags_fw - else - ac_cv_have_qt_framework=no - fi - if test "$ac_cv_have_qt_framework" = yes; then - # Qt as framework installed - fc_qt4_lib_core="-Wl,-F$fc_qt4_frm -Wl,-framework,QtCore" - QT_LIBS="-Wl,-F$fc_qt4_frm" - #QT_LIBS="$QT_LIBS -Wl,-framework,Qt3Support" - QT_LIBS="$QT_LIBS -Wl,-framework,QtGui" - QT_LIBS="$QT_LIBS -Wl,-framework,QtOpenGL" - QT_LIBS="$QT_LIBS -Wl,-framework,QtCore" - QT_LIBS="$QT_LIBS -Wl,-framework,QtNetwork" - QT_LIBS="$QT_LIBS -Wl,-framework,QtXml" - QT_LIBS="$QT_LIBS -Wl,-framework,QtSql" - QT_LIBS="$QT_LIBS -Wl,-framework,QtSvg" - # Separated libs - QT4_CORE_LIBS="-Wl,-F$fc_qt4_frm -Wl,-framework,QtCore" - - QT_CXXFLAGS="-F$fc_qt4_frm -I$fc_qt4_frm/Qt3Support.framework/Headers" - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtGui.framework/Headers" - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtCore.framework/Headers" - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtOpenGL.framework/Headers" - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtNetwork.framework/Headers" - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtSvg.framework/Headers" - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtXml.framework/Headers" - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtUiTools.framework/Headers" - # Separated flags - QT4_CORE_CXXFLAGS="-F$fc_qt4_frm -I$fc_qt4_frm/QtCore.framework/Headers" - # QtUiTools doesn't seem to be available as framework - #QT_CXXFLAGS="$QT_CXXFLAGS -I/usr/include/QtUiTools" - # QtWebKit check - fc_ac_save_cppflags=$CPPFLAGS - CPPFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtWebKit.framework/Headers" - AC_MSG_CHECKING([whether QtWebKit is available]) - AC_TRY_COMPILE([#include ], [], - [ - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_frm/QtWebKit.framework/Headers" - QT_LIBS="$QT_LIBS -Wl,-framework,QtWebKit" - AC_MSG_RESULT(yes)], - AC_MSG_RESULT(no)) - CPPFLAGS=$fc_ac_save_cppflags - else - # Qt not as framework installed - fc_qt4_lib_core="-L$fc_qt4_lib -lQtCore" - QT_LIBS="-L$fc_qt4_lib -lQtCore -lQtGui -lQt3Support -lQtNetwork -lQtOpenGL -lQtSvg -lQtXml" - QT_CXXFLAGS="-I$fc_qt4_include -I$fc_qt4_include/Qt3Support" - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtGui" - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtCore" - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtOpenGL" - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtNetwork" - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtSvg" - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtXml" - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtUiTools" - # Separated flags and libs - QT4_CORE_CXXFLAGS="-I$fc_qt4_include -I$fc_qt4_include/QtCore" - QT4_CORE_LIBS="-L$fc_qt4_lib -lQtCore" - # QtWebKit check - fc_ac_save_cppflags=$CPPFLAGS - CPPFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtWebKit" - AC_MSG_CHECKING([whether QtWebKit is available]) - AC_TRY_COMPILE([#include ], [], - [ - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtWebKit" - QT_LIBS="$QT_LIBS -lQtWebKit" - AC_MSG_RESULT(yes)], - AC_MSG_RESULT(no)) - CPPFLAGS=$fc_ac_save_cppflags - fi - ;; - *) # UNIX/Linux based - AC_PATH_XTRA - fc_qt4_lib_core="-L$fc_qt4_lib -lQtCore" - QT_LIBS="-L$fc_qt4_lib -lQtCore -lQtGui -lQt3Support -lQtNetwork -lQtOpenGL -lQtSvg -lQtXml $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - QT_CXXFLAGS="-I$fc_qt4_include -I$fc_qt4_include/Qt3Support" - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtGui" - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtCore" - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtOpenGL" - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtNetwork" - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtSvg" - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtXml" - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtUiTools $X_CFLAGS" - # QtWebKit check - fc_ac_save_cppflags=$CPPFLAGS - CPPFLAGS="-I$fc_qt4_include -I$fc_qt4_include/QtWebKit" - AC_MSG_CHECKING([whether QtWebKit is available]) - AC_TRY_LINK([#include ], [], - [ - QT_CXXFLAGS="$QT_CXXFLAGS -I$fc_qt4_include/QtWebKit" - QT_LIBS="$QT_LIBS -lQtWebKit" - AC_MSG_RESULT(yes)], - AC_MSG_RESULT(no)) - CPPFLAGS=$fc_ac_save_cppflags - #QT4_CXXFLAGS="-I$fc_qt4_include" - #QT4_LIBS="-L$fc_qt4_lib $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" - # Separated flags and libs - QT4_CORE_CXXFLAGS="-I$fc_qt4_include -I$fc_qt4_include/QtCore" - QT4_CORE_LIBS="-L$fc_qt4_lib -lQtCore" - #QT4_GUI_CXXFLAGS="-I$fc_qt4_include/QtGui" - #QT4_GUI_LIBS="-lQtGui" - #QT4_NETWORK_CFLAGS="-I$fc_qt4_include/QtNetwork" - #QT4_NETWORK_LIBS="-lQtNetwork" - #QT4_XML_CFLAGS="-I$fc_qt4_include/QtXml" - #QT4_XML_LIBS="-lQtXml" - ;; -esac - -min_qt_version=ifelse([$1], ,4.0.0, $1) - -AC_MSG_CHECKING(for Qt >= $min_qt_version) -QT_MOC="$fc_qt4_bin/moc" -QT_UIC="$fc_qt4_bin/uic" -QT_RCC="$fc_qt4_bin/rcc" - -# Now we check whether we can actually build a Qt app. -cat > myqt.h << EOF -#include -class Test : public QObject -{ -Q_OBJECT -public: - Test() {} - ~Test() {} -public slots: - void receive() {} -signals: - void send(); -}; -EOF - -cat > myqt.cpp << EOF -#include "myqt.h" -#include -#include -#include -#include -#include -#include -int main( int argc, char **argv ) -{ - QCoreApplication app( argc, argv ); - Test t; - QObject::connect( &t, SIGNAL(send()), &t, SLOT(receive()) ); - - // major, minor, patch - QString version = "$min_qt_version"; - QStringList numbers = version.split('.'); - - int shift[[3]] = {16,8,0}; - int minversion = 0, i = 0; - for (QStringList::ConstIterator it = numbers.begin(); it != numbers.end(); ++it, ++i) { - bool ok; - int val = (*it).toInt(&ok); - if (ok) { - minversion = minversion + (val << shift[[i]]); - } - } - - exit(QT_VERSION < minversion); -} -EOF - -bnv_try_1="$QT_MOC myqt.h -o moc_myqt.cpp" -AC_TRY_EVAL(bnv_try_1) -if test x"$ac_status" != x0; then - AC_MSG_ERROR([Cannot find Qt meta object compiler (moc), bye...]) -fi - -bnv_try_2="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o moc_myqt.o moc_myqt.cpp" -AC_TRY_EVAL(bnv_try_2) -if test x"$ac_status" != x0; then - AC_MSG_ERROR([Failed to compile source file created by Qt meta object compiler (moc), bye...]) -fi - -bnv_try_3="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o myqt.o myqt.cpp" -AC_TRY_EVAL(bnv_try_3) -if test x"$ac_status" != x0; then - AC_MSG_ERROR([Failed to compile Qt test app, bye...]) -fi - -# Make sure not to link against X11 libs so that configure succeeds whithout xserver started -bnv_try_4="$CXX myqt.o moc_myqt.o $fc_qt4_lib_core $LIBS -o myqt" -AC_TRY_EVAL(bnv_try_4) -if test x"$ac_status" != x0; then - AC_MSG_ERROR([Failed to link with Qt, bye...]) -fi - -AS_IF([AM_RUN_LOG([./myqt])], - [AC_MSG_RESULT(yes)], - [AC_MSG_ERROR([Version of Qt4 found but < $min_qt_version]) -]) - -rm -f moc_myqt.cpp myqt.h myqt.cpp myqt.o myqt moc_myqt.o - -if test -d $fc_qt4_dir; then - QT_DIR="$fc_qt4_dir" -else - QT_DIR="" -fi - -AC_SUBST(QT_DIR) -AC_SUBST(QT_CXXFLAGS) -AC_SUBST(QT_LIBS) -AC_SUBST(QT4_CORE_CXXFLAGS) -AC_SUBST(QT4_CORE_LIBS) -AC_SUBST(QT_UIC) -AC_SUBST(QT_MOC) -AC_SUBST(QT_RCC) -]) -dnl @synopsis FREECAD_AC_HAVE_BOOST -dnl -dnl @summary Search for boost header and library files. -dnl -dnl -AC_DEFUN([FREECAD_AC_HAVE_BOOST], -[ -AC_MSG_CHECKING(for boost) - -AC_ARG_WITH(boost-include, - AC_HELP_STRING([--with-boost-include=DIR], [Path to the boost header files]), - [fc_boost_incs=$withval], [fc_boost_incs=/usr/include]) - -AC_ARG_WITH(boost-lib, - AC_HELP_STRING([--with-boost-lib=DIR], [Path to the boost library files]), - [fc_boost_libs=$withval], [fc_boost_libs=/usr/lib]) - -fc_boost_ac_save_cppflags=$CPPFLAGS -fc_boost_ac_save_ldflags=$LDFLAGS -fc_boost_ac_save_libs=$LIBS -CPPFLAGS="$CPPFLAGS -I$fc_boost_incs" -LDFLAGS="$LDFLAGS -L$fc_boost_libs" -LIBS="-lboost_program_options-mt" - -AC_TRY_LINK([#include ], - [namespace po = boost::program_options; - po::options_description generic("Generic options"); - generic.add_options() - ("version,v", "print version string") - ("help", "produce help message"); - ], - [AC_MSG_RESULT(yes)], - [AC_MSG_ERROR(failed)]) - - - -AC_MSG_CHECKING(for boost >= 1.35.0) - -cat > boost.cpp << EOF -#include -#include -#include - -int main(int argc, char **argv) -{ - exit(BOOST_VERSION >= 103500); -} -EOF - -# Depending on boost version decide if boost_system is required -boost_try="$CXX boost.cpp $CPPFLAGS -o boost" -AC_TRY_EVAL(boost_try) -if test x"$ac_status" != x0; then - AC_MSG_ERROR([Failed to get version of boost, bye...]) -fi - -AS_IF([AM_RUN_LOG([./boost])], - [ac_cv_boost_system=no], - [ac_cv_boost_system=yes -]) -AC_MSG_RESULT($ac_cv_boost_system) -rm -f boost.cpp boost - -BOOST_FILESYSTEM_LIB="-lboost_filesystem-mt" -BOOST_PROGOPTIONS_LIB="-lboost_program_options-mt" -BOOST_SIGNALS_LIB="-lboost_signals-mt" -BOOST_SYSTEM_LIB="" -BOOST_REGEX_LIB="-lboost_regex-mt" -if test x"$ac_cv_boost_system" = xyes; then - LIBS="-lboost_system-mt" - AC_MSG_CHECKING(for boost system library) - AC_TRY_LINK([#include ], - [ boost::system::error_code error_code; std::string message(error_code.message()); return 0; ], - [BOOST_SYSTEM_LIB="-lboost_system-mt"], - [BOOST_SYSTEM_LIB=""]) - - if test "x$BOOST_SYSTEM_LIB" = "x"; then - AC_MSG_RESULT(no) - AC_MSG_ERROR(Unable to link with the boost::system library) - else - AC_MSG_RESULT(yes) - fi -fi - -AC_SUBST(BOOST_FILESYSTEM_LIB) -AC_SUBST(BOOST_PROGOPTIONS_LIB) -AC_SUBST(BOOST_SIGNALS_LIB) -AC_SUBST(BOOST_SYSTEM_LIB) -AC_SUBST(BOOST_REGEX_LIB) - - -CPPFLAGS=$fc_boost_ac_save_cppflags -LDFLAGS=$fc_boost_ac_save_ldflags -LIBS=$fc_boost_ac_save_libs - -all_includes="$all_includes -I$fc_boost_incs" -all_libraries="$all_libraries -L$fc_boost_libs" -]) diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 6c410b02f205..000000000000 --- a/autogen.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash -# autogen.sh -# Run this script to generate all initial makefiles. - -# Get version and revision number -MAJ=0 -MIN=13 -REV=0 - -#if svn --xml info >/dev/null 2>&1; then -# REV=`svn --xml info | tr -d '\r\n' | sed -e 's/.*.*/\1/'` -#elif svn --version --quiet >/dev/null 2>&1; then -# REV=`svn info | grep "^Revision:" | cut -d" " -f2` -#fi -# count all lines that don't match this string -REV=`git rev-list HEAD | grep -cv "*"` - -# if revision.m4 does not exist, create it -REV_FILE=revision.m4 -#if [ -f $REV_FILE ]; then -# echo "$REV_FILE found" -#else -# echo "m4_define([FREECAD_MAJOR], $MAJ)" > $REV_FILE -# echo "m4_define([FREECAD_MINOR], $MIN)" >> $REV_FILE -# echo "m4_define([FREECAD_MICRO], $REV)" >> $REV_FILE -# echo "$REV_FILE created" -#fi -echo "m4_define([FREECAD_MAJOR], $MAJ)" > $REV_FILE -echo "m4_define([FREECAD_MINOR], $MIN)" >> $REV_FILE -echo "m4_define([FREECAD_MICRO], $REV)" >> $REV_FILE - -# create m4 subdirectory which fails for some older versions of autotools -[ -d m4 ] || mkdir m4 - -if which glibtoolize > /dev/null 2>&1; then - echo "calling glibtoolize" - glibtoolize --force --copy -elif which libtoolize > /dev/null 2>&1; then - echo "calling libtoolize" - libtoolize --force --copy -else - echo "can't find libtoolize or glibtoolize" - exit 1 -fi - -# http://www.gnu.org/software/hello/manual/automake/Macro-Search-Path.html -if [ -d /usr/local/share/aclocal ]; then - echo "calling aclocal -I /usr/local/share/aclocal" - aclocal -I /usr/local/share/aclocal -else - echo "calling aclocal" - aclocal -fi - -echo "calling autoheader" -autoheader - -echo "calling automake" -automake --add-missing --copy - -echo "calling autoconf" -autoconf - -echo "Done" -echo "Please run configure." - -# touch file to update Version.h -touch src/Build/Version.h.in - diff --git a/build.sh b/build.sh deleted file mode 100755 index e079ca5f2bdc..000000000000 --- a/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/sh - -# We almost need to specify the switches for the OpenCascade library to make -# configure running successfully. -# CASROOT=${CASROOT:-/opt/OpenCASCADE6.2.0/ros} -#./configure CXXFLAGS="-fno-strict-aliasing" LDFLAGS="-Wl,-z,defs" --with-occ-include=$CASROOT/inc --with-occ-lib=$CASROOT/Linux/lib -./configure CXXFLAGS="-fno-strict-aliasing -Wno-write-strings" LDFLAGS="-Wl,-z,defs" - diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 469e00ca7e1a..000000000000 --- a/configure.ac +++ /dev/null @@ -1,1113 +0,0 @@ -dnl -*- Autoconf -*- -dnl Process this file with autoconf to produce a configure script. -AC_PREREQ(2.50) - -dnl Init stuff -dnl ************************************************************************** -dnl release version number info -m4_include([revision.m4]) - -AC_INIT(FreeCAD,[FREECAD_MAJOR.FREECAD_MINOR.FREECAD_MICRO],[wmayer@users.sourceforge.net], FreeCAD) -AC_CONFIG_AUX_DIR([m4]) -AM_INIT_AUTOMAKE([tar-ustar foreign]) -AM_CONFIG_HEADER([config.h]) -AC_CONFIG_MACRO_DIR([m4]) -AC_LANG_CPLUSPLUS - -dnl Default install directory is your home directory -dnl ************************************************************************** -AC_PREFIX_DEFAULT($HOME/FreeCAD) - -dnl Version number -dnl ************************************************************************** -dnl Shared library versioning -dnl GENERIC_LIBRARY_VERSION=1:2:0 -dnl | | | -dnl +------+ | +---+ -dnl | | | -dnl current:revision:age -dnl | | | -dnl | | +- increment if interfaces have been added -dnl | | set to zero if interfaces have been removed -dnl | | or changed -dnl | +- increment if source code has changed -dnl | set to zero if current is incremented -dnl +- increment if interfaces have been added, removed or changed - -LIB_CURRENT=2 -LIB_REVISION=0 -LIB_AGE=0 -AC_SUBST(LIB_CURRENT) -AC_SUBST(LIB_REVISION) -AC_SUBST(LIB_AGE) - -dnl Required headers -dnl (mainly for OpenCASCADE 5.2, we need also config.h for cfg's) -dnl ************************************************************************** -AC_LANG([C++]) -AC_MSG_CHECKING([ for C++ header files ]) -AC_CHECK_HEADERS(istream ostream istream fstream ios iomanip iostream) -AC_CHECK_HEADERS(iomanip.h limits.h values.h float.h) -AC_CHECK_HEADERS(siginfo.h bits/sigset.h bstring.h sys/types.h sys/select.h) -AC_CHECK_HEADERS(sys/filio.h sys/mman.h libc.h) -AC_CHECK_HEADERS([sstream],,[AC_MSG_ERROR([This header is needed. Bye.])]) - -AC_CXX_HAVE_STD_IOSTREAM - -dnl Checking for C/C++ compiler -dnl ************************************************************************** -AC_PROG_CXX -AC_PROG_CC -AC_ENABLE_SHARED(yes) -AC_ENABLE_STATIC(no) - -dnl Checking for Fortran compiler -dnl ************************************************************************** -AC_PROG_F77() -AC_FC_SRCEXT(f) -AC_FC_LIBRARY_LDFLAGS -AC_FC_WRAPPERS - -dnl Checking for programs -dnl ************************************************************************** -AC_LIBTOOL_DLOPEN -AC_PROG_LIBTOOL -AC_PROG_LN_S -#AC_PROG_YACC -#AM_PROG_LEX - - -AC_PATH_PROG(SWIG, swig, false) -if test "$SWIG" = false ; then - AC_MSG_WARN([Can't find SWIG installation]) - HAVE_SWIG=0 - AM_CONDITIONAL(HAVE_SWIG_FOUND, false) -else - HAVE_SWIG=1 - AM_CONDITIONAL(HAVE_SWIG_FOUND, true) -fi -AC_SUBST(HAVE_SWIG) - -dnl Defines in config.h -dnl ************************************************************************** -AC_DEFINE_UNQUOTED(HAVE_GETENVIRONMENTVARIABLE, 1, [Define to use GetEnvironmentVariable() instead of getenv()]) -AC_DEFINE_UNQUOTED(HAVE_GL_GL_H, 1, [define if the GL header should be included as GL/gl.h]) -AC_DEFINE_UNQUOTED(HAVE_QGLFORMAT_EQ_OP, 1, [Define this to 1 if operator==(QGLFormat&, QGLFormat&) is available]) -AC_DEFINE_UNQUOTED(HAVE_QGLFORMAT_SETOVERLAY, 1, [Define this to 1 if QGLFormat::setOverlay() is available]) -AC_DEFINE_UNQUOTED(HAVE_QGLWIDGET_SETAUTOBUFFERSWAP, 1, [Define this to 1 if QGLWidget::setAutoBufferSwap() is available]) -AC_DEFINE_UNQUOTED(HAVE_QT_KEYPAD_DEFINE, 1, [Define this if Qt::Keypad is available]) -AC_DEFINE_UNQUOTED(HAVE_QWIDGET_SHOWFULLSCREEN, 1, [Define this if QWidget::showFullScreen() is available]) -AC_DEFINE_UNQUOTED(HAVE_SYS_TYPES_H, 1, [Define to 1 if you have the header file.]) -AC_DEFINE_UNQUOTED(USE_STD_IOSTREAM, 1, [Define to 1 to build zipios++ sources with iostream.]) -AC_DEFINE_UNQUOTED(OCE_HAVE_CLIMITS, 1, [Define to 1 to build with OCE instead of OCC.]) -AC_DEFINE_UNQUOTED(OCE_HAVE_IOSTREAM, 1, [Define to 1 to build with OCE instead of OCC.]) -AC_DEFINE_UNQUOTED(OCE_HAVE_IOMANIP, 1, [Define to 1 to build with OCE instead of OCC.]) - -dnl Check if you want to use GUI, or not (currently disabled) -dnl ************************************************************************** -dnl -#AC_ARG_ENABLE([gui], -# AC_HELP_STRING([--enable-gui], [Enable GUI (you can disable this feature to use FreeCAD in server mode)]), -# [case $enableval in -# no | false) fc_set_gui=false ;; -# *) fc_set_gui=true ;; -# esac], -# [fc_set_gui=true]) -# -#if $fc_set_gui; then -# echo "not yet done" -#fi -# -#if test "x$use_glx" = "xyes"; then -# AM_CONDITIONAL(FREECAD_BUILD_GUI, true) -#else -# AM_CONDITIONAL(FREECAD_BUILD_GUI, false) -#fi -#if FREECAD_BUILD_GUI -# ... in Makefile.am -#endif - -## DEFAULT INCLUDE/LIB PATHS -#all_includes="$all_includes -I/usr/include -I/usr/local/include" -#all_libraries="$all_libraries -L/usr/lib -L/usr/local/lib" - -dnl ************************************************************************* -dnl -dnl Checking for libraries. -dnl -dnl ************************************************************************* - -dnl checking for zlib -dnl ************************************************************************** -AC_CHECK_LIB(z, inflate, [cv_libz=yes], [cv_libz=no]) - -if test "$cv_libz" != "yes"; then - AC_MSG_ERROR([ - **** Cannot find the zlib library. **** - ]) -fi - -dnl checking for Python -dnl ************************************************************************** -dnl AC_MSG_CHECKING([for Python]) -dnl fc_py_ver=`python -c "import sys; print sys.version[[:3]]"`; -dnl if test x$fc_py_ver = x; then -dnl AC_MSG_ERROR([ -dnl **** Cannot find Python interpreter. **** -dnl ]) -dnl fi; -dnl AC_MSG_RESULT([yes]) -dnl -dnl dnl Additional test to force version number of >= 2.5 -dnl AC_MSG_CHECKING([for Python version >= 2.5]) -dnl prog="import sys -dnl s=0x02050000 -dnl sys.exit(sys.hexversion < s)" -dnl AS_IF([AM_RUN_LOG([python -c "$prog"])], -dnl [AC_MSG_RESULT([yes])], -dnl [AC_MSG_ERROR([ -dnl **** Install Python version 2.5 or later **** -dnl ])]) - -AC_ARG_WITH(python-version, - AC_HELP_STRING([--with-python-version=VER], [Choose the required Python version]), - [fc_py_ver=$withval], - [fc_py_ver=2.5]) - -dnl At least version 2.5 required -AM_PATH_PYTHON($fc_py_ver) - - -AC_ARG_WITH(python-include, - AC_HELP_STRING([--with-python-include=DIR], [Path to the Python header files]), - [fc_py_incs=$withval], - [fc_py_incs=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_inc()"`]) - -AC_ARG_WITH(python-lib, - AC_HELP_STRING([--with-python-lib=DIR], [Path to the Python library files]), - [fc_py_libs=$withval], - [fc_py_libs=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBDIR')"`]) - -fc_py_ac_save_cppflags=$CPPFLAGS -fc_py_ac_save_ldflags=$LDFLAGS -fc_py_ac_save_libs=$LIBS -CPPFLAGS="$CPPFLAGS -I$fc_py_incs" -LDFLAGS="$LDFLAGS -L$fc_py_libs" -LIBS="-lpython$PYTHON_VERSION -lpthread -ldl -lutil -lm" - -dnl Small test program that only works with Python 2.5 and higher -fc_cv_lib_py_avail=no -AC_CHECK_HEADER(Python.h,[ -AC_MSG_CHECKING([for libpython$PYTHON_VERSION]) -AC_TRY_LINK([#include "Python.h"], - [Py_Initialize(); - const char* sys = "sys"; - PyImport_AddModule(sys); - Py_Finalize();], - [fc_cv_lib_py_avail=yes - AC_MSG_RESULT(yes)], - AC_MSG_RESULT(no))]) - -CPPFLAGS=$fc_py_ac_save_cppflags -LDFLAGS=$fc_py_ac_save_ldflags -LIBS=$fc_py_ac_save_libs - -if test x"$fc_cv_lib_py_avail" = xyes; then - all_includes="$all_includes -I$fc_py_incs" - all_libraries="$all_libraries -L$fc_py_libs" - - AC_SUBST([PYTHON_LIB], [python$PYTHON_VERSION]) -else - AC_MSG_ERROR([ - **** Cannot find Python$PYTHON_VERSION devel files. **** - ]) -fi - - -dnl checking for PyQt4 utilities -dnl ************************************************************************** -#AC_PATH_PROG(PYUIC4, pyuic4, false) -#if test "$PYUIC4" = false ; then -# AC_MSG_ERROR([Can't find pyuic4 utility]) -#fi -#AC_PATH_PROG(PYRCC4, pyrcc4, true) -#if test "$PYRCC4" = false ; then -# AC_MSG_ERROR([Can't find pyrcc4 utility]) -#fi -#AC_SUBST(PYUIC4) -#AC_SUBST(PYRCC4) - - -dnl checking for PyCXX & zipios++ -dnl ************************************************************************** -fc_make_no_dfsg_package=yes -AC_ARG_ENABLE(no-dfsg-tarball, - AC_HELP_STRING([--enable-no-dfsg-tarball], [Use local sources of PyCXX & zipios++ packages [[default=yes]]]), - [fc_make_no_dfsg_package=$enableval],[fc_make_no_dfsg_package=yes]) -# check if local versions of PyCXX & zipios++ are part of these sources -if test x"$fc_make_no_dfsg_package" = xyes; then - fc_py_ac_save_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$srcdir -I$srcdir/src" - AC_TRY_COMPILE([#include "src/CXX/Version.hxx"], [], - [], [fc_make_no_dfsg_package=no]) - CPPFLAGS=$fc_py_ac_save_cppflags -fi -AM_CONDITIONAL(MAKE_NO_DFSG_PACKAGE, test x"$fc_make_no_dfsg_package" = xyes) -AC_MSG_RESULT(Use local sources of PyCXX & zipios++... $fc_make_no_dfsg_package) - - -dnl checking for existence of (system-wide) PyCXX & zipios++ headers -dnl ************************************************************************** -ZIPIOS_LIB="" -if test x"$fc_make_no_dfsg_package" != xyes; then - fc_py_ac_save_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$fc_py_incs" - ZIPIOS_LIB="-lzipios" - AC_MSG_CHECKING(for PyCXX headers) - AC_TRY_COMPILE([#include ], [], - [AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no);AC_MSG_ERROR(Cannot find the PyCXX headers)]) - AC_MSG_CHECKING(for zipios++ headers) - AC_TRY_COMPILE([#include ], [], - [AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no);AC_MSG_ERROR(Cannot find the zipios++ headers)]) - CPPFLAGS=$fc_py_ac_save_cppflags -fi -AC_SUBST(ZIPIOS_LIB) - - -dnl checking for xerces-c -dnl ************************************************************************** -AC_MSG_CHECKING([for xerces-c]) -AC_ARG_WITH(xercesc-include, - AC_HELP_STRING([--with-xercesc-include=DIR], [Path to the xerces-c header files]), - [fc_xer_incs=$withval], - [fc_xer_incs=/usr/include]) - -AC_CHECK_FILE($fc_xer_incs/xercesc,, - [AC_CHECK_FILE(/usr/local/include/xercesc,[fc_xer_incs=/usr/local/include])]) - -AC_ARG_WITH(xercesc-lib, - AC_HELP_STRING([--with-xercesc-lib=DIR], [Path to the xerces-c library files]), - [fc_xer_libs=$withval], - [fc_xer_libs=/usr/lib]) - -fc_xer_ac_save_cppflags=$CPPFLAGS -fc_xer_ac_save_ldflags=$LDFLAGS -fc_xer_ac_save_libs=$LIBS -CPPFLAGS="$CPPFLAGS -I$fc_xer_incs" -LDFLAGS="$LDFLAGS -L$fc_xer_libs" -LIBS="-lxerces-c" - -fc_cv_lib_xer_avail=no -AC_CHECK_HEADER(xercesc/framework/XMLBuffer.hpp,[ -AC_MSG_CHECKING([whether xerces lib is available]) -AC_TRY_LINK([#include ], - [XERCES_CPP_NAMESPACE_USE - XMLBuffer buf;], - [fc_cv_lib_xer_avail=yes - AC_MSG_RESULT(yes)], - AC_MSG_RESULT(no))]) - -CPPFLAGS=$fc_xer_ac_save_cppflags -LDFLAGS=$fc_xer_ac_save_ldflags -LIBS=$fc_xer_ac_save_libs - -if test x"$fc_cv_lib_xer_avail" = xyes; then - all_includes="$all_includes -I$fc_xer_incs" - all_libraries="$all_libraries -L$fc_xer_libs" -else - AC_MSG_ERROR([ - **** Cannot find xerces devel files. **** - ]) -fi - - -dnl checking for ANN -dnl ************************************************************************** -dnl AC_MSG_CHECKING([for ANN]) -dnl AC_ARG_WITH(ann-include, -dnl AC_HELP_STRING([--with-ann-include=DIR], [Path to the ANN header files]), -dnl [fc_ann_incs=$withval], -dnl [fc_ann_incs=/usr/include]) -dnl -dnl AC_CHECK_FILE($fc_ann_incs/ANN,, -dnl [AC_CHECK_FILE(/usr/local/include/ANN,[fc_ann_incs=/usr/local/include])]) -dnl -dnl AC_ARG_WITH(ann-lib, -dnl AC_HELP_STRING([--with-ann-lib=DIR], [Path to the ANN library files]), -dnl [fc_ann_libs=$withval], -dnl [fc_ann_libs=/usr/lib]) -dnl -dnl fc_ann_ac_save_cppflags=$CPPFLAGS -dnl fc_ann_ac_save_ldflags=$LDFLAGS -dnl fc_ann_ac_save_libs=$LIBS -dnl CPPFLAGS="$CPPFLAGS -I$fc_ann_incs" -dnl LDFLAGS="$LDFLAGS -L$fc_ann_libs" -dnl LIBS="-lann" -dnl -dnl fc_cv_lib_ann_avail=no -dnl AC_CHECK_HEADER(ANN/ANN.h,[ -dnl AC_MSG_CHECKING([whether ANN lib is available]) -dnl AC_TRY_LINK([#include ], -dnl [ANNkd_tree ann;], -dnl [fc_cv_lib_ann_avail=yes -dnl AC_MSG_RESULT(yes)], -dnl AC_MSG_RESULT(no))]) -dnl -dnl CPPFLAGS=$fc_ann_ac_save_cppflags -dnl LDFLAGS=$fc_ann_ac_save_ldflags -dnl LIBS=$fc_ann_ac_save_libs -dnl -dnl if test x"$fc_cv_lib_ann_avail" = xyes; then -dnl all_includes="$all_includes -I$fc_ann_incs" -dnl all_libraries="$all_libraries -L$fc_ann_libs" -dnl else -dnl AC_MSG_ERROR([ -dnl **** Cannot find ANN devel files. **** -dnl ]) -dnl fi - - -dnl checking for eigen2 -dnl ************************************************************************** -dnl AC_MSG_CHECKING([for eigen2]) -dnl AC_ARG_WITH(eigen2-include, -dnl AC_HELP_STRING([--with-eigen2-include=DIR], [Path to the eigen2 header files]), -dnl [fc_eig_incs=$withval], -dnl [fc_eig_incs=/usr/include/eigen2]) -dnl -dnl AC_CHECK_FILE($fc_eig_incs/Eigen,, -dnl [AC_CHECK_FILE(/usr/local/include/eigen2,[fc_eig_incs=/usr/local/include/eigen2])]) -dnl -dnl fc_eig_ac_save_cppflags=$CPPFLAGS -dnl CPPFLAGS="$CPPFLAGS -I$fc_eig_incs" -dnl -dnl # Check a file which is present in Eigen2 but not in Eigen3 -dnl fc_cv_lib_eig_avail=no -dnl AC_CHECK_HEADER(Eigen/NewStdVector, -dnl fc_cv_lib_eig_avail=yes,) -dnl -dnl CPPFLAGS=$fc_eig_ac_save_cppflags -dnl -dnl if test x"$fc_cv_lib_eig_avail" = xyes; then -dnl AC_SUBST([EIGEN2_INC], [$fc_eig_incs]) -dnl else -dnl AC_MSG_WARN([ -dnl **** Cannot find eigen2 devel files. -dnl Modules that depend on this library cannot be built. **** -dnl ]) -dnl fi - -dnl AM_CONDITIONAL(HAVE_EIGEN2, test x"$fc_cv_lib_eig_avail" = xyes) - - -dnl checking for eigen3 -dnl ************************************************************************** -AC_MSG_CHECKING([for eigen3]) -AC_ARG_WITH(eigen3-include, - AC_HELP_STRING([--with-eigen3-include=DIR], [Path to the eigen3 header files]), - [fc_eig_incs=$withval], - [fc_eig_incs=/usr/include/eigen3]) - -AC_CHECK_FILE($fc_eig_incs/Eigen,, - [AC_CHECK_FILE(/usr/local/include/eigen3,[fc_eig_incs=/usr/local/include/eigen3])]) - -fc_eig_ac_save_cppflags=$CPPFLAGS -CPPFLAGS="$CPPFLAGS -I$fc_eig_incs" - -# Check a file which is present in Eigen3 but not in Eigen2 -fc_cv_lib_eig_avail=no -AC_CHECK_HEADER(Eigen/Eigenvalues, - fc_cv_lib_eig_avail=yes,) - -CPPFLAGS=$fc_eig_ac_save_cppflags - -if test x"$fc_cv_lib_eig_avail" = xyes; then - AC_SUBST([EIGEN3_INC], [$fc_eig_incs]) -else - AC_MSG_WARN([ - **** Cannot find eigen3 devel files. - Modules that depend on this library cannot be built. **** - ]) -fi - -AM_CONDITIONAL(HAVE_EIGEN3, test x"$fc_cv_lib_eig_avail" = xyes) - -dnl checking for boost -dnl ****************** - -FREECAD_AC_HAVE_BOOST - - -dnl checking for Qt -dnl *************** - -FREECAD_AC_HAVE_QT(4.3) - - -dnl checking for Coin -dnl ************************************************************************** - -SIM_AC_HAVE_COIN_IFELSE(,AC_MSG_ERROR([ - **** Cannot find Coin devel files. **** - ])) - -AC_SUBST([sim_ac_coin_includedir]) -AC_SUBST([sim_ac_coin_cppflags]) -AC_SUBST([sim_ac_coin_ldflags]) -AC_SUBST([sim_ac_coin_libs]) - -dnl checking for SoQt -dnl ************************************************************************** - -SIM_AC_HAVE_SOQT_IFELSE(,AC_MSG_ERROR([ - **** Cannot find SoQt devel files. **** - ])) - -AC_SUBST([sim_ac_soqt_includedir]) -AC_SUBST([sim_ac_soqt_cppflags]) -AC_SUBST([sim_ac_soqt_ldflags]) -AC_SUBST([sim_ac_soqt_libs]) - -dnl ************************************************************************** -dnl checking for optional libraies -dnl ************************************************************************** - -dnl checking for OpenGL libs -dnl ************************************************************************** -case $host_os in - mingw32*) - GL_LIBS="-lopengl32 -lglu32" - ;; - darwin*) - GL_LIBS="-Wl,-F/System/Library/Frameworks -Wl,-framework,OpenGL" - ;; - linux*|kfreebsd*-gnu*) - GL_LIBS="-lGL -lGLU" - ;; -esac -AC_SUBST(GL_LIBS) - -dnl checking for OpenCascade -dnl ************************************************************************** -dnl Check if CASROOT is set and estimate where the include and libs could be -if test x"$CASROOT" != x; then - fc_occ_incs_test="$CASROOT/inc" - fc_occ_libs_test="$CASROOT/Linux/lib" -else - fc_occ_incs_test=/usr/include/opencascade - fc_occ_libs_test=/usr/lib -fi - -AC_CHECKING([OpenCascade]) -AC_ARG_WITH(occ-include, - AC_HELP_STRING([--with-occ-include=DIR], [Path to the OpenCascade header files]), - [fc_occ_incs=$withval], - [fc_occ_incs=$fc_occ_incs_test]) - -AC_ARG_WITH(occ-lib, - AC_HELP_STRING([--with-occ-lib=DIR], [Path to the OpenCascade library files]), - [fc_occ_libs=$withval], - [fc_occ_libs=$fc_occ_libs_test]) - -fc_occ_ac_save_cppflags=$CPPFLAGS -fc_occ_ac_save_ldflags=$LDFLAGS -fc_occ_ac_save_libs=$LIBS -CPPFLAGS="$CPPFLAGS -I$fc_occ_incs" -LDFLAGS="$LDFLAGS -L$fc_occ_libs" -LIBS="-ldl -lTKernel" - -fc_cv_lib_occ_avail=no -AC_CHECK_HEADER(Standard.hxx,[ -AC_MSG_CHECKING([whether OCC libs are available]) -AC_TRY_LINK([#define HAVE_IOSTREAM 1 - #include ], - [gp_Pnt pt(0,0,0);], - [fc_cv_lib_occ_avail=yes - AC_MSG_RESULT(yes)], - AC_MSG_RESULT(no))]) - -# Checking for version >= 6.1 -LIBS="-ldl -lTKernel -lTKMesh -lTKG2d -lTKG3d -lTKTopAlgo -lTKMath -lTKBRep -lTKGeomBase -lTKGeomAlgo" -fc_cv_lib_occ_ver_6=no -if test x"$fc_cv_lib_occ_avail" = xyes; then - AC_CHECK_HEADER(Standard.hxx,[ - AC_MSG_CHECKING([whether OCC is >= 6.1]) - AC_TRY_LINK([#define HAVE_IOSTREAM 1 - #include ], - [gp_Pnt pt(0,0,0);], - [fc_cv_lib_occ_ver_6=yes - AC_MSG_RESULT(yes)], - AC_MSG_RESULT(no))]) -fi - -CPPFLAGS=$fc_occ_ac_save_cppflags -LDFLAGS=$fc_occ_ac_save_ldflags -LIBS=$fc_occ_ac_save_libs - -if test x"$fc_cv_lib_occ_avail" = xyes; then - AC_SUBST([OCC_INC], [$fc_occ_incs]) - AC_SUBST([OCC_LIB], [$fc_occ_libs]) -else - AC_MSG_WARN([ - **** Cannot find OpenCASCADE devel files. - Modules that depend on this library cannot be built. **** - ]) -fi - -AM_CONDITIONAL(HAVE_OPENCASCADE, test x"$fc_cv_lib_occ_avail" = xyes) -AM_CONDITIONAL(OCC_VERSION6, test x"$fc_cv_lib_occ_ver_6" = xyes) - - -dnl checking for Salome SMESH -dnl ************************************************************************** -#AC_MSG_CHECKING([for Salome SMESH]) -#AC_ARG_WITH(smesh-include, -# AC_HELP_STRING([--with-smesh-include=DIR], [Path to the Salome SMESH header files]), -# [fc_smesh_incs=$withval], -# [fc_smesh_incs=/usr/include]) -# -#AC_CHECK_FILE($fc_smesh_incs/SMESH_Gen.hxx,, -# [AC_CHECK_FILE(/usr/local/include/smesh,[fc_smesh_incs=/usr/local/include])]) -# -#AC_ARG_WITH(smesh-lib, -# AC_HELP_STRING([--with-smesh-lib=DIR], [Path to the Salome SMESH library files]), -# [fc_smesh_libs=$withval], -# [fc_smesh_libs=/usr/lib]) -# -#fc_smesh_ac_save_cppflags=$CPPFLAGS -#fc_smesh_ac_save_ldflags=$LDFLAGS -#fc_smesh_ac_save_libs=$LIBS -#CPPFLAGS="$CPPFLAGS -I$fc_smesh_incs -I$OCC_INC" -#LDFLAGS="$LDFLAGS -L$fc_smesh_libs" -#LIBS="-lSMESH" -# -#fc_cv_lib_smesh_avail=no -#AC_CHECK_HEADER(SMESH_Gen.hxx,[ -#AC_MSG_CHECKING([whether SMESH lib is available]) -#AC_TRY_LINK([#include ], -# [SMESH_Gen meshgen;], -# [fc_cv_lib_smesh_avail=yes -# AC_MSG_RESULT(yes)], -# AC_MSG_RESULT(no))]) -# -#CPPFLAGS=$fc_smesh_ac_save_cppflags -#LDFLAGS=$fc_smesh_ac_save_ldflags -#LIBS=$fc_smesh_ac_save_libs -# -#if test x"$fc_cv_lib_smesh_avail" = xyes; then -# AC_SUBST([SMESH_INCLUDE], [$fc_smesh_incs]) -# AC_SUBST([SMESH_LIBRARY], [$fc_smesh_libs]) -#else -# AC_MSG_WARN([ -# **** Cannot find Salome SMESH devel files. **** -# ]) -#fi -# -#AM_CONDITIONAL(HAVE_SALOMESMESH, test x"$fc_cv_lib_smesh_avail" = xyes) - -# check whether netgen support has to be enabled -AC_ARG_ENABLE(netgen,[--enable-netgen use netgen [default=no]],enable_netgen=$enableval,enable_netgen=no) -if test "$enable_netgen" = "yes"; then - AC_CHECK_HEADERS([nglib.h]) -fi -AM_CONDITIONAL(NETGEN, test "$enable_netgen" = "yes") - -AC_TRY_COMPILE( [], - [int array[((int)sizeof(void*))-6];], - [enable_stdmeshers_64bit="yes"], - [enable_stdmeshers_64bit="no"] ) -AM_CONDITIONAL(STDMESHERS64BIT, test "$enable_stdmeshers_64bit" = "yes") - - -dnl checking for spnav library (for 3d mouse support) -dnl ************************************************************************** -AC_MSG_CHECKING([for spnav]) -AC_ARG_WITH(spnav-include, - AC_HELP_STRING([--with-spnav-include=DIR], [Path to the spnav header files]), - [fc_spnav_incs=$withval], - [fc_spnav_incs=/usr/include]) - -fc_spnav_ac_save_cppflags=$CPPFLAGS -CPPFLAGS="$CPPFLAGS -I$fc_spnav_incs" - -fc_cv_lib_spnav_avail=no -AC_CHECK_HEADER(spnav.h, - fc_cv_lib_spnav_avail=yes,) - -CPPFLAGS=$fc_spnav_ac_save_cppflags - -if test x"$fc_cv_lib_spnav_avail" = xyes; then - AC_SUBST([SPNAV_INC], [$fc_spnav_incs]) -else - AC_MSG_WARN([ - **** Cannot find spnav devel files. - No support for 3D SpaceNavigator. **** - ]) -fi - -AM_CONDITIONAL(HAVE_SPNAV_FOUND, test x"$fc_cv_lib_spnav_avail" = xyes) - - -dnl checking for matplotlib -dnl ************************************************************************** -fc_matplotlib_avail=no -AC_MSG_CHECKING([for matplotlib]) -fc_matplotlib_ver=`python -c "import matplotlib as m; print m.__version__;"`; -if test x$fc_py_ver = x; then - AC_MSG_WARN([ - **** Cannot find matplotlib Python module. - Plot Module will not available until matplotlib is installed **** - ]) -else - fc_matplotlib_avail=yes -fi; -AC_MSG_RESULT([yes]) -AM_CONDITIONAL(HAVE_MATPLOTLIB, test x"$fc_matplotlib_avail" = xyes) - -#--------------------------------------------------------------------- -# -# Check if 64-bit platform -# -#--------------------------------------------------------------------- -AC_MSG_CHECKING([if platform is 64-bit (-D_OCC64)]) -AC_TRY_COMPILE( [], - [int array[((int)sizeof(void*))-6];], - [AC_MSG_RESULT([yes]); CPPFLAGS="$CPPFLAGS -D_OCC64"; case $platform in Linux*) CPPFLAGS="$CPPFLAGS -m64";; esac], - [AC_MSG_RESULT([no])] ) - -#AC_MSG_CHECKING([if platform is 64-bit (-D_OCC64)]) -#AC_TRY_COMPILE([],[int array[6-(int)sizeof(void*)];],[AC_MSG_RESULT(no)], -# [AC_MSG_RESULT(yes); OCC_INC_FLAG="$OCC_INC_FLAG -D_OCC64"]) - -dnl checking for WildMagic3 -dnl ************************************************************************** -dnl AC_CHECKING([WildMagic3]) -dnl AC_ARG_WITH(wm3-include, -dnl AC_HELP_STRING([--with-wm3-include=DIR], [Path to the WildMagic3 header files]), -dnl [fc_wm3_incs=$withval], -dnl [fc_wm3_incs=/usr/include/WildMagic3/Include]) -dnl -dnl AC_ARG_WITH(wm3-lib, -dnl AC_HELP_STRING([--with-wm3-lib=DIR], [Path to the WildMagic3 library files]), -dnl [fc_wm3_libs=$withval], -dnl [fc_wm3_libs=/usr/lib]) -dnl -dnl AC_CHECK_FILE($fc_wm3_incs/Wm3Query.h,fc_wm3_ver=340,fc_wm3_ver=330) -dnl -dnl Set the appropriate library name -dnl if test x"$fc_wm3_ver" = x"330"; then -dnl fc_wm3_lib="WildMagic3" -dnl fc_wm3_txt="Version <= 3.3.0" -dnl else -dnl fc_wm3_lib="Wm3Foundation" -dnl fc_wm3_txt="Version >= 3.4.0" -dnl fi -dnl -dnl fc_wm3_ac_save_cppflags=$CPPFLAGS -dnl fc_wm3_ac_save_ldflags=$LDFLAGS -dnl fc_wm3_ac_save_libs=$LIBS -dnl CPPFLAGS="$CPPFLAGS -I$fc_wm3_incs" -dnl LDFLAGS="$LDFLAGS -L$fc_wm3_libs" -dnl LIBS="-l$fc_wm3_lib" -dnl -dnl fc_cv_lib_wm3_avail=no -dnl AC_CHECK_HEADER(Wm3Math.h,[ -dnl AC_MSG_CHECKING([whether WildMagic lib is available]) -dnl AC_TRY_LINK([#include ], -dnl [double val = Wm3::Math::Cos(0.0);], -dnl [fc_cv_lib_wm3_avail=yes -dnl AC_MSG_RESULT(yes)], -dnl AC_MSG_RESULT(no))]) -dnl -dnl CPPFLAGS=$fc_wm3_ac_save_cppflags -dnl LDFLAGS=$fc_wm3_ac_save_ldflags -dnl LIBS=$fc_wm3_ac_save_libs -dnl -dnl if test x"$fc_cv_lib_wm3_avail" = xyes; then -dnl AC_SUBST([WM3_CFLAGS], [-I$fc_wm3_incs]) -dnl AC_SUBST([WM3_LDFLAGS], [-L$fc_wm3_libs]) -dnl AC_SUBST([WM3_LIBS], [-l$fc_wm3_lib]) -dnl AC_SUBST([WM3_VERSION], [$fc_wm3_ver]) -dnl else -dnl AC_MSG_WARN([ -dnl **** Cannot find WildMagic devel files. -dnl Modules that depend on this library cannot be built. **** -dnl ]) -dnl fi -dnl -dnl AM_CONDITIONAL(WM3_LIBRARY_FILES, test x"$fc_cv_lib_wm3_avail" = xyes) - -dnl checking for GTS -dnl ************************************************************************** -dnl -dnl AC_PATH_PROG(GTSCONFIG, gts-config, false, $PATH) -dnl if test x"$GTSCONFIG" != xfalse; then -dnl fc_gts_incs=`gts-config --cflags` -dnl fc_gts_libs=`gts-config --libs` -dnl -dnl AC_SUBST([GTS_CFLAGS], [$fc_gts_incs]) -dnl AC_SUBST([GTS_LIBS], [$fc_gts_libs]) -dnl else -dnl AC_MSG_WARN([ -dnl **** Cannot find GTS library files. -dnl Modules that depend on this library cannot be built. **** -dnl ]) -dnl fi -dnl -dnl AM_CONDITIONAL(HAVE_GTS, test x"$GTSCONFIG" != xfalse) - -dnl checking for OpenCV -dnl ************************************************************************** - -dnl HAVE_OPENCV=false -dnl PKG_CHECK_MODULES(opencv, opencv, [HAVE_OPENCV=true], [true]) -dnl if test x$HAVE_OPENCV = xfalse; then -dnl AC_MSG_WARN([ -dnl **** Cannot find OpenCV library files. -dnl Modules that depend on this library cannot be built. **** -dnl ]) -dnl fi -dnl -dnl AM_CONDITIONAL([HAVE_OPENCV], [test x$HAVE_OPENCV = xtrue]) - -dnl ************************************************************************** - -AC_SUBST(all_includes) -AC_SUBST(all_libraries) - -dnl Check if you want to have log info, or not -dnl ************************************************************************** - -AC_ARG_ENABLE([loginfo], - AC_HELP_STRING([--enable-loginfo], [Enable log information (disabled by default)]), - [case $enableval in - no | false) fc_set_loginfo=false ;; - *) fc_set_loginfo=true ;; - esac], - [fc_set_loginfo=false]) - -if $fc_set_loginfo; then - CPPFLAGS="$CPPFLAGS -DFC_DEBUG" -fi - -AC_ARG_ENABLE([template], - AC_HELP_STRING([--enable-template], [Enable the build of the _TEMPLATE_ module (disabled by default)]), - [case $enableval in - no | false) fc_set_template=false ;; - *) fc_set_template=true ;; - esac], - [fc_set_template=false]) - -AM_CONDITIONAL(BUILD_TEMPLATE, test x"$fc_set_template" = xtrue) - -AC_ARG_ENABLE([sandbox], - AC_HELP_STRING([--enable-sandbox], [Enable the build of the Sandbox module (disabled by default)]), - [case $enableval in - no | false) fc_set_sandbox=false ;; - *) fc_set_sandbox=true ;; - esac], - [fc_set_sandbox=false]) - -AM_CONDITIONAL(BUILD_SANDBOX, test x"$fc_set_sandbox" = xtrue) - -AC_ARG_ENABLE([assembly], - AC_HELP_STRING([--enable-assembly], [Enable the build of the Assembly module (disabled by default)]), - [case $enableval in - no | false) fc_set_assembly=false ;; - *) fc_set_assembly=true ;; - esac], - [fc_set_assembly=false]) - -AM_CONDITIONAL(BUILD_ASSEMBLY, test x"$fc_set_assembly" = xtrue) - -AC_ARG_ENABLE([cam], - AC_HELP_STRING([--enable-cam], [Enable the build of the Cam module (disabled by default)]), - [case $enableval in - no | false) fc_set_cam=false ;; - *) fc_set_cam=true ;; - esac], - [fc_set_cam=false]) - -AM_CONDITIONAL(BUILD_CAM, test x"$fc_set_cam" = xtrue) - -dnl Check if you want debug information enabled, or not -dnl ************************************************************************** - -AC_ARG_ENABLE([debug], - AC_HELP_STRING([--enable-debug], [Enable debug information (enabled by default)]), - [case $enableval in - no | false) fc_set_debug=false ;; - *) fc_set_debug=true ;; - esac], - [fc_set_debug=true]) -if $fc_set_debug; then - CPPFLAGS="$CPPFLAGS -g -D_DEBUG" -else - CPPFLAGS="$CPPFLAGS -O2 -DNDEBUG" -fi - -dnl Check if you want thread support, or not (currently disabled, thread support is forced) -dnl ************************************************************************** - -CPPFLAGS="$CPPFLAGS -D_REENTRANT" -LDFLAGS="$LDFLAGS -lpthread" -fc_set_thread=true - -#AC_ARG_ENABLE([thread], -# AC_HELP_STRING([--enable-thread], [Enable thread support]), -# [case $enableval in -# no | false) fc_set_thread=false ;; -# *) fc_set_thread=true ;; -# esac], -# [fc_set_thread=true]) -#if $fc_set_thread; then -# AC_CHECK_HEADER([pthread.h]) -# AC_CHECK_LIB([pthread],[pthread_create]) -# if test "$ac_cv_header_pthread_h" != yes -o \ -# "$ac_cv_lib_pthread_pthread_create" != yes; then -# AC_MSG_ERROR([POSIX threads (pthreads) not working. Bye.]) -# else -## this is apparently needed for some versions of autoconf/automake -## LIBS="-lpthread $LIBS" -## CXXFLAGS="$CXXFLAGS -D_REENTRANT" -# CPPFLAGS="$CPPFLAGS -D_REENTRANT" -# LDFLAGS="-lpthread" -# fi -#else -# CPPFLAGS="$CPPFLAGS -DNO_FC_THREAD" -#fi - -dnl Check if you want compiler warnings enabled, or not -dnl ************************************************************************** - -AC_ARG_ENABLE([warnings], - AC_HELP_STRING([--enable-warnings], [Enable compiler warnings (enabled by default)]), - [case $enableval in - no | false) fc_set_warn=false ;; - *) fc_set_warn=true ;; - esac], - [fc_set_warn=true]) -if $fc_set_warn; then -# CPPFLAGS="$CPPFLAGS -Wall -W" - CPPFLAGS="$CPPFLAGS -Wall" -else - CPPFLAGS="$CPPFLAGS -w" -fi - -dnl Check if you want precompiled headers (PCH) enabled, or not -dnl *********************************************************** -dnl -dnl enableval=no -dnl AC_MSG_CHECKING([whether to use precompiled headers]) -dnl AC_ARG_ENABLE(pch, -dnl AC_HELP_STRING([--enable-pch], -dnl [use precompiled headers, if available])) -dnl case "${enableval}" in -dnl yes) -dnl AC_MSG_RESULT(yes) -dnl COMP_FLAGS="$COMP_FLAGS -Winvalid-pch" -dnl ;; -dnl no) -dnl AC_MSG_RESULT(no) -dnl ;; -dnl *) -dnl AC_MSG_ERROR([bad value ${enableval} for --enable-pch, needs yes or no]) -dnl ;; -dnl esac -dnl AM_CONDITIONAL(USE_PRECOMPILED_HEADERS, test x"$enableval" = xyes) -dnl -dnl CFLAGS="$COMP_FLAGS $OPT_FLAGS" -dnl CXXFLAGS="$COMP_FLAGS $OPT_FLAGS" -dnl ************************************************************************** -dnl Use this Makefile.am -dnl if USE_PRECOMPILED_HEADERS -dnl PreCompiled.h.gch: PreCompiled.h -dnl $(CXXCOMPILE) -xc++-header -o $@ $< -dnl -dnl PRECOMPILED = PreCompiled.h.gch -dnl else -dnl PRECOMPILED = -dnl endif -dnl -dnl BUILT_SOURCES=\ -dnl $(PRECOMPILED) -dnl ************************************************************************** - -dnl Define DISTCHECK_CONFIGURE_FLAGS -dnl ************************************************************************** -DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS CXXFLAGS=\"-fno-strict-aliasing -Wno-write-strings\" LDFLAGS=\"-Wl,-z,defs\"" -AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) - -CXX=g++ -CXXFLAGS="$CXXFLAGS -Wno-deprecated -frtti" - -dnl doxygen -dnl ************************************************************************** -AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false) -AM_CONDITIONAL(HAVE_DOXYGEN,$HAVE_DOXYGEN) -if test $HAVE_DOXYGEN = "false"; then - AC_MSG_WARN([doxygen not found]) -fi - -DOXYGEN_OUTPUT_DIR="." -AC_SUBST(DOXYGEN_OUTPUT_DIR) - -DOXYGEN_INPUT_LIST="$srcdir/src/CXX $srcdir/src/zipios++ $srcdir/src/3rdParty $srcdir/src/Build $srcdir/src/Base $srcdir/src/App $srcdir/src/Gui $srcdir/src/Mod $srcdir/src/Main $srcdir/src/Doc" -AC_SUBST(DOXYGEN_INPUT_LIST) - -DOXYGEN_EXCLUDE_LIST="$srcdir/src/Tools $srcdir/src/3rdParty/CxImage $srcdir/src/3rdParty/Pivy $srcdir/src/3rdParty/Pivy-0.5" -AC_SUBST(DOXYGEN_EXCLUDE_LIST) - -DOXYGEN_IMAGE_PATH="$srcdir/src/Gui/Icons" -AC_SUBST(DOXYGEN_IMAGE_PATH) - -DOXYGEN_INCLUDE_PATH="$srcdir/src/Doc/doxygen-headers" -AC_SUBST(DOXYGEN_INCLUDE_PATH) - -#AC_CONFIG_FILES([src/Doc/doxygen-headers/Inventor/fields/SoSubField.h:$sim_ac_coin_includedir/Inventor/fields/SoSubField.h]) - -dnl ************************************************************************** - -AC_CONFIG_FILES([Makefile -data/Makefile -data/examples/Makefile -src/Makefile -src/Build/Makefile -src/3rdParty/Makefile -src/3rdParty/salomesmesh/Makefile -src/Base/Makefile -src/App/Makefile -src/Gui/Makefile -src/Gui/Icons/Makefile -src/Gui/Language/Makefile -src/Gui/propertyeditor/Makefile -src/Gui/iisTaskPanel/Makefile -src/Gui/TaskView/Makefile -src/Main/Makefile -src/Doc/Makefile -src/Doc/BuildDevDoc.cfg -src/Mod/Makefile -src/Mod/Assembly/App/Makefile -src/Mod/Assembly/Gui/Resources/Makefile -src/Mod/Assembly/Gui/Makefile -src/Mod/Assembly/Makefile -src/Mod/Cam/App/Makefile -src/Mod/Cam/Gui/Makefile -src/Mod/Cam/Makefile -src/Mod/Part/Makefile -src/Mod/Part/App/Makefile -src/Mod/Part/Gui/Makefile -src/Mod/Import/Makefile -src/Mod/Import/Gui/Makefile -src/Mod/Raytracing/Makefile -src/Mod/Raytracing/App/Makefile -src/Mod/Raytracing/Gui/Makefile -src/Mod/Raytracing/Templates/Makefile -src/Mod/Mesh/Makefile -src/Mod/Mesh/App/Makefile -src/Mod/Mesh/Gui/Makefile -src/Mod/MeshPart/Makefile -src/Mod/MeshPart/App/Makefile -src/Mod/MeshPart/Gui/Makefile -src/Mod/MeshPart/Gui/Resources/Makefile -src/Mod/Fem/Makefile -src/Mod/Fem/App/Makefile -src/Mod/Fem/Gui/Makefile -src/Mod/Fem/Gui/Resources/Makefile -src/Mod/PartDesign/Makefile -src/Mod/PartDesign/App/Makefile -src/Mod/PartDesign/Gui/Makefile -src/Mod/PartDesign/Gui/Resources/Makefile -src/Mod/PartDesign/Scripts/Makefile -src/Mod/Sketcher/Makefile -src/Mod/Sketcher/App/Makefile -src/Mod/Sketcher/App/freegcs/Makefile -src/Mod/Sketcher/Gui/Makefile -src/Mod/Sketcher/Gui/Resources/Makefile -src/Mod/Sketcher/Templates/Makefile -src/Mod/Points/Makefile -src/Mod/Points/App/Makefile -src/Mod/Points/Gui/Makefile -src/Mod/Image/Makefile -src/Mod/Image/App/Makefile -src/Mod/Image/Gui/Makefile -src/Mod/Drawing/Makefile -src/Mod/Drawing/App/Makefile -src/Mod/Drawing/Gui/Makefile -src/Mod/Drawing/Gui/Resources/Makefile -src/Mod/Drawing/Templates/Makefile -src/Mod/ReverseEngineering/Makefile -src/Mod/ReverseEngineering/App/Makefile -src/Mod/ReverseEngineering/Gui/Makefile -src/Mod/ReverseEngineering/Gui/Resources/Makefile -src/Mod/Inspection/Makefile -src/Mod/Inspection/App/Makefile -src/Mod/Inspection/Gui/Makefile -src/Mod/Robot/Makefile -src/Mod/Robot/App/Makefile -src/Mod/Robot/Gui/Makefile -src/Mod/Robot/Gui/Resources/Makefile -src/Mod/Robot/Lib/Makefile -src/Mod/Complete/Makefile -src/Mod/Complete/App/Makefile -src/Mod/Complete/Gui/Makefile -src/Mod/Complete/Gui/Resources/Makefile -src/Mod/Draft/Makefile -src/Mod/Arch/Makefile -src/Mod/Test/Makefile -src/Mod/Test/Gui/Makefile -src/Mod/Web/Makefile -src/Mod/Web/Gui/Makefile -src/Mod/Web/Gui/Resources/Makefile -src/Mod/Start/Makefile -src/Mod/Start/App/Makefile -src/Mod/Start/Gui/Makefile -src/Mod/Start/Gui/Resources/Makefile -src/Mod/Start/StartPage/Makefile -src/Mod/Idf/Makefile -src/Mod/TemplatePyMod/Makefile -src/Mod/Sandbox/Makefile -src/Mod/Sandbox/App/Makefile -src/Mod/Sandbox/Gui/Makefile -src/Mod/Ship/Makefile -src/Mod/OpenSCAD/Makefile -src/Mod/Plot/Makefile -src/Tools/Makefile -src/Tools/_TEMPLATE_/Makefile -src/Tools/_TEMPLATE_/App/Makefile -src/Tools/_TEMPLATE_/Gui/Makefile -]) -#src/3rdParty/Pivy/Makefile - -AC_OUTPUT - -dnl Show a configuration report -dnl ************************************************************************** - -AC_MSG_NOTICE([ - - ************************************************************************** - - FreeCAD configuration settings: - - C++ compiler: $CXX - Python version: $PYTHON_VERSION - Log info enabled: $fc_set_loginfo - Debug info enabled: $fc_set_debug - Thread enabled (forced): $fc_set_thread - RTTI enabled (forced): true - Compiler warnings enabled: $fc_set_warn - installation prefix: $prefix - enable-assembly: $fc_set_assembly - enable-cam: $fc_set_cam - enable-sandbox: $fc_set_sandbox - enable-template: $fc_set_template - Now, run 'make' to build FreeCAD. - - ************************************************************************** -]) - -dnl ************************************************************************** - diff --git a/mkinstalldirs b/mkinstalldirs deleted file mode 100644 index d2d5f21b6112..000000000000 --- a/mkinstalldirs +++ /dev/null @@ -1,111 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman -# Created: 1993-05-16 -# Public domain - -errstatus=0 -dirmode="" - -usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" 1>&2 - exit 0 - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -case $dirmode in - '') - if mkdir -p -- . 2>/dev/null; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - fi - ;; - *) - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - fi - ;; -esac - -for file -do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift - - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp="$pathcomp/" - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# End: -# mkinstalldirs ends here From 0f72bc68baa6e0dc5c3a8944fdc8c2e4d93bcaca Mon Sep 17 00:00:00 2001 From: Abdullah Tahiri Date: Sat, 15 Nov 2014 08:14:38 +0100 Subject: [PATCH 08/12] Sketcher Enhancement: Merge sketches - It copies the geometry and associated constraints of a plurality of sketches into a new sketch - The functionality is accessible from outside sketch edit mode, directly from the menu Sketch --- src/Mod/Sketcher/Gui/Command.cpp | 69 ++++++++++++++++++++++++++++++ src/Mod/Sketcher/Gui/Workbench.cpp | 3 +- 2 files changed, 71 insertions(+), 1 deletion(-) diff --git a/src/Mod/Sketcher/Gui/Command.cpp b/src/Mod/Sketcher/Gui/Command.cpp index 232d272b3cac..53214fbd180e 100644 --- a/src/Mod/Sketcher/Gui/Command.cpp +++ b/src/Mod/Sketcher/Gui/Command.cpp @@ -48,6 +48,7 @@ #include "SketchOrientationDialog.h" #include "ViewProviderSketch.h" #include "TaskSketcherValidation.h" +#include "../App/Constraint.h" using namespace std; using namespace SketcherGui; @@ -496,7 +497,74 @@ bool CmdSketcherValidateSketch::isActive(void) return (hasActiveDocument() && !Gui::Control().activeDialog()); } +DEF_STD_CMD_A(CmdSketcherMergeSketchs); +CmdSketcherMergeSketchs::CmdSketcherMergeSketchs() + : Command("Sketcher_MergeSketchs") +{ + sAppModule = "Sketcher"; + sGroup = QT_TR_NOOP("Sketcher"); + sMenuText = QT_TR_NOOP("Merge sketches"); + sToolTipText = QT_TR_NOOP("Merge sketches"); + sWhatsThis = "Sketcher_MergeSketches"; + sStatusTip = sToolTipText; + eType = 0; +} + +void CmdSketcherMergeSketchs::activated(int iMsg) +{ + std::vector selection = getSelection().getSelectionEx(0, Sketcher::SketchObject::getClassTypeId()); + if (selection.size() < 2) { + QMessageBox::warning(Gui::getMainWindow(), + qApp->translate("CmdSketcherMergeSketchs", "Wrong selection"), + qApp->translate("CmdSketcherMergeSketchs", "Select at least two sketches, please.")); + return; + } + + Sketcher::SketchObject* Obj1 = static_cast(selection[0].getObject()); + + App::Document* doc = App::GetApplication().getActiveDocument(); + + // create Sketch + std::string FeatName = getUniqueObjectName("Sketch"); + + openCommand("Create a merge Sketch"); + doCommand(Doc,"App.activeDocument().addObject('Sketcher::SketchObject','%s')",FeatName.c_str()); + + Sketcher::SketchObject* mergesketch = static_cast(doc->getObject(FeatName.c_str())); + + int baseGeometry=0; + int baseConstraints=0; + + for (std::vector::const_iterator it=selection.begin(); it != selection.end(); ++it) { + const Sketcher::SketchObject* Obj = static_cast((*it).getObject()); + int addedGeometries=mergesketch->addGeometry(Obj->getInternalGeometry()); + + int addedConstraints=mergesketch->addConstraints(Obj->Constraints.getValues()); + + for(int i=0; i<=(addedConstraints-baseConstraints); i++){ + Sketcher::Constraint * constraint= mergesketch->Constraints.getValues()[i+baseConstraints]; + + if(constraint->First!=Sketcher::Constraint::GeoUndef || constraint->First==-1 || constraint->First==-2) // not x, y axes or origin + constraint->First+=baseGeometry; + if(constraint->Second!=Sketcher::Constraint::GeoUndef || constraint->Second==-1 || constraint->Second==-2) // not x, y axes or origin + constraint->Second+=baseGeometry; + if(constraint->Third!=Sketcher::Constraint::GeoUndef || constraint->Third==-1 || constraint->Third==-2) // not x, y axes or origin + constraint->Third+=baseGeometry; + } + + baseGeometry=addedGeometries+1; + baseConstraints=addedConstraints+1; + } + + doCommand(Gui,"App.activeDocument().recompute()"); + +} + +bool CmdSketcherMergeSketchs::isActive(void) +{ + return (hasActiveDocument() && !Gui::Control().activeDialog()); +} @@ -511,4 +579,5 @@ void CreateSketcherCommands(void) rcCmdMgr.addCommand(new CmdSketcherMapSketch()); rcCmdMgr.addCommand(new CmdSketcherViewSketch()); rcCmdMgr.addCommand(new CmdSketcherValidateSketch()); + rcCmdMgr.addCommand(new CmdSketcherMergeSketchs()); } diff --git a/src/Mod/Sketcher/Gui/Workbench.cpp b/src/Mod/Sketcher/Gui/Workbench.cpp index 2ee764826893..69a0aadad0cb 100644 --- a/src/Mod/Sketcher/Gui/Workbench.cpp +++ b/src/Mod/Sketcher/Gui/Workbench.cpp @@ -228,7 +228,8 @@ inline void SketcherAddWorkspaceSketchExtra(T& sketch){ template <> inline void SketcherAddWorkspaceSketchExtra(Gui::MenuItem& sketch){ sketch << "Sketcher_ReorientSketch" - << "Sketcher_ValidateSketch"; + << "Sketcher_ValidateSketch" + << "Sketcher_MergeSketchs"; } template From fe3beb89fddedfb88545c52b18321b138b758a0f Mon Sep 17 00:00:00 2001 From: Abdullah Tahiri Date: Mon, 17 Nov 2014 14:18:27 +0100 Subject: [PATCH 09/12] Sketcher Enhancement: Merge sketches : Art by Jim --- src/Mod/Sketcher/Gui/Command.cpp | 1 + src/Mod/Sketcher/Gui/Resources/Sketcher.qrc | 1 + .../Resources/icons/Sketcher_Merge_Sketch.svg | 351 ++++++++++++++++++ 3 files changed, 353 insertions(+) create mode 100644 src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Merge_Sketch.svg diff --git a/src/Mod/Sketcher/Gui/Command.cpp b/src/Mod/Sketcher/Gui/Command.cpp index 53214fbd180e..b2cdc023838a 100644 --- a/src/Mod/Sketcher/Gui/Command.cpp +++ b/src/Mod/Sketcher/Gui/Command.cpp @@ -509,6 +509,7 @@ CmdSketcherMergeSketchs::CmdSketcherMergeSketchs() sWhatsThis = "Sketcher_MergeSketches"; sStatusTip = sToolTipText; eType = 0; + sPixmap = "Sketcher_Merge_Sketch"; } void CmdSketcherMergeSketchs::activated(int iMsg) diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc index 38a9462fdfdb..a00a04608648 100644 --- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc +++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc @@ -65,6 +65,7 @@ icons/Sketcher_External.svg icons/Sketcher_LeaveSketch.svg icons/Sketcher_MapSketch.svg + icons/Sketcher_Merge_Sketch.svg icons/Sketcher_NewSketch.svg icons/Sketcher_ProfilesHexagon1.svg icons/Sketcher_SelectConflictingConstraints.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Merge_Sketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Merge_Sketch.svg new file mode 100644 index 000000000000..357d9cc6e124 --- /dev/null +++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Merge_Sketch.svg @@ -0,0 +1,351 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From c04c513b41ce3a8d3cc758b072e41e07a03fdb38 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 26 Nov 2014 14:36:11 +0100 Subject: [PATCH 10/12] + fix typo, consistent icon name --- src/Mod/Sketcher/Gui/Command.cpp | 18 +++++++++--------- src/Mod/Sketcher/Gui/Resources/Sketcher.qrc | 2 +- ...rge_Sketch.svg => Sketcher_MergeSketch.svg} | 0 src/Mod/Sketcher/Gui/Workbench.cpp | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) rename src/Mod/Sketcher/Gui/Resources/icons/{Sketcher_Merge_Sketch.svg => Sketcher_MergeSketch.svg} (100%) diff --git a/src/Mod/Sketcher/Gui/Command.cpp b/src/Mod/Sketcher/Gui/Command.cpp index b2cdc023838a..64a90c9897a5 100644 --- a/src/Mod/Sketcher/Gui/Command.cpp +++ b/src/Mod/Sketcher/Gui/Command.cpp @@ -497,10 +497,10 @@ bool CmdSketcherValidateSketch::isActive(void) return (hasActiveDocument() && !Gui::Control().activeDialog()); } -DEF_STD_CMD_A(CmdSketcherMergeSketchs); +DEF_STD_CMD_A(CmdSketcherMergeSketches); -CmdSketcherMergeSketchs::CmdSketcherMergeSketchs() - : Command("Sketcher_MergeSketchs") +CmdSketcherMergeSketches::CmdSketcherMergeSketches() + : Command("Sketcher_MergeSketches") { sAppModule = "Sketcher"; sGroup = QT_TR_NOOP("Sketcher"); @@ -509,16 +509,16 @@ CmdSketcherMergeSketchs::CmdSketcherMergeSketchs() sWhatsThis = "Sketcher_MergeSketches"; sStatusTip = sToolTipText; eType = 0; - sPixmap = "Sketcher_Merge_Sketch"; + sPixmap = "Sketcher_MergeSketch"; } -void CmdSketcherMergeSketchs::activated(int iMsg) +void CmdSketcherMergeSketches::activated(int iMsg) { std::vector selection = getSelection().getSelectionEx(0, Sketcher::SketchObject::getClassTypeId()); if (selection.size() < 2) { QMessageBox::warning(Gui::getMainWindow(), - qApp->translate("CmdSketcherMergeSketchs", "Wrong selection"), - qApp->translate("CmdSketcherMergeSketchs", "Select at least two sketches, please.")); + qApp->translate("CmdSketcherMergeSketches", "Wrong selection"), + qApp->translate("CmdSketcherMergeSketches", "Select at least two sketches, please.")); return; } @@ -562,7 +562,7 @@ void CmdSketcherMergeSketchs::activated(int iMsg) } -bool CmdSketcherMergeSketchs::isActive(void) +bool CmdSketcherMergeSketches::isActive(void) { return (hasActiveDocument() && !Gui::Control().activeDialog()); } @@ -580,5 +580,5 @@ void CreateSketcherCommands(void) rcCmdMgr.addCommand(new CmdSketcherMapSketch()); rcCmdMgr.addCommand(new CmdSketcherViewSketch()); rcCmdMgr.addCommand(new CmdSketcherValidateSketch()); - rcCmdMgr.addCommand(new CmdSketcherMergeSketchs()); + rcCmdMgr.addCommand(new CmdSketcherMergeSketches()); } diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc index a00a04608648..892fc88b2a3f 100644 --- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc +++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc @@ -65,7 +65,7 @@ icons/Sketcher_External.svg icons/Sketcher_LeaveSketch.svg icons/Sketcher_MapSketch.svg - icons/Sketcher_Merge_Sketch.svg + icons/Sketcher_MergeSketch.svg icons/Sketcher_NewSketch.svg icons/Sketcher_ProfilesHexagon1.svg icons/Sketcher_SelectConflictingConstraints.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Merge_Sketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MergeSketch.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Merge_Sketch.svg rename to src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MergeSketch.svg diff --git a/src/Mod/Sketcher/Gui/Workbench.cpp b/src/Mod/Sketcher/Gui/Workbench.cpp index 69a0aadad0cb..c0cd8c3c0e98 100644 --- a/src/Mod/Sketcher/Gui/Workbench.cpp +++ b/src/Mod/Sketcher/Gui/Workbench.cpp @@ -229,7 +229,7 @@ template <> inline void SketcherAddWorkspaceSketchExtra(Gui::MenuItem& sketch){ sketch << "Sketcher_ReorientSketch" << "Sketcher_ValidateSketch" - << "Sketcher_MergeSketchs"; + << "Sketcher_MergeSketches"; } template From 55884f373cf14996b2a0e7641843bc4066a9cc67 Mon Sep 17 00:00:00 2001 From: Michael Georg Hansen Date: Tue, 25 Nov 2014 20:33:17 +0100 Subject: [PATCH 11/12] Print an error message if PySideTools are not found. --- cMake/FindPySideTools.cmake | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/cMake/FindPySideTools.cmake b/cMake/FindPySideTools.cmake index 466880d3d8ce..4c4bfd280a84 100644 --- a/cMake/FindPySideTools.cmake +++ b/cMake/FindPySideTools.cmake @@ -74,8 +74,16 @@ IF(EXISTS ${PYSIDEUIC4BINARY} AND EXISTS ${PYSIDERCC4BINARY}) set(PYSIDE_TOOLS_FOUND TRUE) ENDIF(EXISTS ${PYSIDEUIC4BINARY} AND EXISTS ${PYSIDERCC4BINARY}) -if(PYSIDE_TOOLS_FOUND) - if(NOT PYSIDE_TOOLS_FOUND_QUIETLY) - message(STATUS "Found PySide Tools: ${PYSIDEUIC4BINARY}, ${PYSIDERCC4BINARY}") - endif(NOT PYSIDE_TOOLS_FOUND_QUIETLY) -endif(PYSIDE_TOOLS_FOUND) +if(PYSIDERCC4BINARY AND PYSIDEUIC4BINARY) + if (NOT PySideTools_FIND_QUIETLY) + message(STATUS "Found PySide Tools: ${PYSIDEUIC4BINARY}, ${PYSIDERCC4BINARY}") + endif (NOT PySideTools_FIND_QUIETLY) +else(PYSIDERCC4BINARY AND PYSIDEUIC4BINARY) + if(PySideTools_FIND_REQUIRED) + message(FATAL_ERROR "PySideTools could not be not found, but are required.") + else(PySideTools_FIND_REQUIRED) + if (NOT PySideTools_FIND_QUIETLY) + message(STATUS "PySideTools: not found.") + endif (NOT PySideTools_FIND_QUIETLY) + endif(PySideTools_FIND_REQUIRED) +endif(PYSIDERCC4BINARY AND PYSIDEUIC4BINARY) From 2896372a756e9e8dd220900af37369d41038daed Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 29 Nov 2014 15:17:58 +0100 Subject: [PATCH 12/12] + fix mesh unit tests --- src/Mod/Mesh/App/MeshTestsApp.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Mod/Mesh/App/MeshTestsApp.py b/src/Mod/Mesh/App/MeshTestsApp.py index 1799136ee5a9..e798c111ec66 100644 --- a/src/Mod/Mesh/App/MeshTestsApp.py +++ b/src/Mod/Mesh/App/MeshTestsApp.py @@ -88,8 +88,7 @@ def testRayPick(self): self.planarMesh.append( [-16.064457,-29.904951,16.090832] ) planarMeshObject = Mesh.Mesh(self.planarMesh) - from pivy import coin, sogui; import FreeCADGui - if not sys.modules.has_key("pivy.gui.soqt"): from pivy.gui import soqt + from pivy import coin; import FreeCADGui Mesh.show(planarMeshObject) view=FreeCADGui.ActiveDocument.ActiveView.getViewer() rp=coin.SoRayPickAction(view.getSoRenderManager().getViewportRegion()) @@ -113,8 +112,7 @@ def testPrimitiveCount(self): self.planarMesh.append( [-16.064457,-29.904951,16.090832] ) planarMeshObject = Mesh.Mesh(self.planarMesh) - from pivy import coin, sogui; import FreeCADGui - if not sys.modules.has_key("pivy.gui.soqt"): from pivy.gui import soqt + from pivy import coin; import FreeCADGui Mesh.show(planarMeshObject) view=FreeCADGui.ActiveDocument.ActiveView pc=coin.SoGetPrimitiveCountAction()