Imported Jamfiles for subprojects.

It compiles everything, except few programs who uses old fltk2 api.

Jamfile

@@ -1,9 +1,37 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2000-2007 EDE Authors.
+#
+# This program is licenced under terms of the 
+# GNU General Public Licence version 2 or newer.
+# See COPYING for details.
+
 SubDir TOP ;
 
 # We must first build edelib
-SubInclude TOP edelib2 ;
+SubInclude TOP $(EDELIBDIR) ;
 
 # Then the rest
-#SubInclude TOP efiler ;
 SubInclude TOP edialog ;
 SubInclude TOP eimage ;
+SubInclude TOP ecolorconf ;
+SubInclude TOP econtrol ;
+SubInclude TOP edisplayconf ;
+SubInclude TOP efinder ;
+SubInclude TOP eiconsconf ;
+SubInclude TOP einstaller ;
+SubInclude TOP ekeyconf ;
+SubInclude TOP elauncher ;
+SubInclude TOP emenueditor ;
+SubInclude TOP epanelconf ;
+SubInclude TOP etimedate ;
+SubInclude TOP etip ;
+SubInclude TOP evolume ;
+SubInclude TOP ewmconf ;
+
+# These can't be compiled for now
+
+#SubInclude TOP efiler ;
+#SubInclude TOP eiconman ;

Jamrules

@@ -11,11 +11,16 @@
 XGETTEXT ?= xgettext ;
 MSGFMT   ?= msgfmt ;
 
-FLAGS  ?= -Wall -g3 -D_DEBUG ;
+FLAGS  ?= -Wall -g3 -D_DEBUG -I$(TOP) ;
 STDLIB ?= -lstdc++ ;
 
 FLTKLIB    ?= -L/usr/local/lib -lfltk2 ;
 FLTKIMAGES ?= -L/usr/local/lib -lfltk2_images ;
+
+# backward
+EFLTKLIB    ?= -L/usr/local/lib -lefltk ;
+EFLTKIMAGES ?= -L/usr/local/lib -lefltk_images ;
+
 X11LIBS    ?= -L/usr/X11R6/lib -lX11 -lXi -lXinerama -lXft -lpthread -lm -lXext ;
 IMGLIBS    ?= -lpng -ljpeg -lz ;
 
@@ -39,8 +44,8 @@ rule MakeLibrary
 	Library $(<) : $(>) ;
 }
 
-# MakeProgram <target> : <sources> : <optional-flags> ;
-rule MakeProgram
+# internal used by MakeProgram and MakeEfltkProgram
+rule InternalMakeProgram
 {
 	local eldir ;
 	local target ;
@@ -59,10 +64,27 @@ rule MakeProgram
 		SUBDIRCCFLAGS  += $(3) ;
 	}
 
-	LINKLIBS on $(target) = -L$(eldir) $(EDELIB) $(FLTKIMAGES) $(IMGLIBS) $(FLTKLIB) $(X11LIBS) $(STDLIB) ;
+	LINKLIBS on $(target) = -L$(eldir) $(EDELIB) $(4) $(IMGLIBS) $(5) $(X11LIBS) $(6) $(STDLIB) ;
 	Main $(target) : $(2) ;
 }
 
+# This should be used to build ede2 apps.
+# MakeProgram <target> : <sources> : <optional-flags> : <optional-libs> ;
+rule MakeProgram
+{
+	InternalMakeProgram $(1) : $(2) : $(3) : $(FLTKIMAGES) : $(FLTKLIB) : $(4) ;
+}
+
+# This is for efltk (aka. previous code) compilation
+# so it can be tested with whole package.
+# It should be used only until efltk programs are translited
+# to fltk.
+# MakeEfltkProgram <target> : <sources> : <optional-flags> ;
+rule MakeEfltkProgram
+{
+	InternalMakeProgram $(1) : $(2) : $(3) : $(EFLTKIMAGES) : $(EFLTKLIB) ;
+}
+
 # ExtractStrings <dir-where> : <source> ;
 rule ExtractStrings
 {

ecolorconf/Jamfile

@@ -0,0 +1,19 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2000-2007 EDE Authors.
+#
+# This program is licenced under terms of the 
+# GNU General Public Licence version 2 or newer.
+# See COPYING for details.
+
+
+SubDir TOP ecolorconf ;
+
+SOURCE = ecolorconf.cpp 
+		ecolorutils.cpp 
+		EDE_FontChooser.cpp ;
+
+MakeProgram ecolorconf : $(SOURCE) ;
+ExtractStrings locale : $(SOURCE) ;

ecolorconf/ecolorutils.h

@@ -45,7 +45,7 @@
 #include "../edelib2/NLS.h" //#include <efltk/Fl_Locale.h>
 
 // this struct can hold slightly more information than Fl_Font
-extern typedef struct {
+typedef struct {
 	fltk::Font* font;
 	char* encoding;
 	int size;

econtrol/Jamfile

@@ -0,0 +1,17 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2000-2007 EDE Authors.
+#
+# This program is licenced under terms of the 
+# GNU General Public Licence version 2 or newer.
+# See COPYING for details.
+
+
+SubDir TOP econtrol ;
+
+SOURCE = econtrol.cpp ;
+
+MakeProgram econtrol : $(SOURCE) ;
+ExtractStrings locale : $(SOURCE) ;

edialog/Jamfile

@@ -1,3 +1,14 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2000-2007 EDE Authors.
+#
+# This program is licenced under terms of the 
+# GNU General Public Licence version 2 or newer.
+# See COPYING for details.
+
 SubDir TOP edialog ;
 
 MakeProgram edialog : edialog.cpp ;
+ExtractStrings locale : edialog.cpp ;

edisplayconf/Jamfile

@@ -0,0 +1,17 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2000-2007 EDE Authors.
+#
+# This program is licenced under terms of the 
+# GNU General Public Licence version 2 or newer.
+# See COPYING for details.
+
+
+SubDir TOP edisplayconf ;
+
+SOURCE = edisplayconf.cpp conf.cpp ;
+
+MakeProgram edisplayconf : $(SOURCE) ;
+ExtractStrings locale : $(SOURCE) ;

edisplayconf/edisplayconf.cpp

@@ -138,7 +138,7 @@ edisplayconf::edisplayconf() {
         o->begin();
          {fltk::CheckButton* o = check_autorepeat = new fltk::CheckButton(24, 20, 221, 20, "  Repeat key activated");
           o->selection_color((fltk::Color)2);
-          o->set_flag(fltk::VALUE);
+          //o->set_flag(fltk::VALUE);
         }
          {fltk::ValueSlider* o = slider_click = new fltk::ValueSlider(25, 67, 220, 18, "Click volume %");
           o->maximum(100);
@@ -165,7 +165,7 @@ edisplayconf::edisplayconf() {
         }
          {fltk::CheckButton* o = check_blanking = new fltk::CheckButton(15, 20, 222, 20, " Screen blanker activated");
           o->selection_color((fltk::Color)2);
-          o->set_flag(fltk::VALUE);
+          //o->set_flag(fltk::VALUE);
         }
         new fltk::InvisibleBox(10, 99, 234, 37);
          {fltk::ValueSlider* o = slider_pattern = new fltk::ValueSlider(27, 155, 210, 18, "Pattern change delay (min)");
@@ -180,7 +180,7 @@ edisplayconf::edisplayconf() {
           o->begin();
            {fltk::RadioButton* o = radio_blank = new fltk::RadioButton(0, 0, 105, 20, "Blank");
             o->selection_color((fltk::Color)1);
-            o->set_flag(fltk::VALUE);
+            //o->set_flag(fltk::VALUE);
             o->callback((fltk::Callback*)cb_radio_blank);
           }
            {fltk::RadioButton* o = radio_pattern = new fltk::RadioButton(107, 5, 95, 20, "Pattern");

edisplayconf/edisplayconf.fl

@@ -1,5 +1,5 @@
 # data file for the FLTK User Interface Designer (FLUID)
-version 2.0100 
+version 2.1000 
 images_dir ./ 
 header_name {.h} 
 code_name {.cpp} 
@@ -39,7 +39,7 @@ class edisplayconf {open
     {fltk::Window} win {
       label {Display configuration}
       callback {_finish = true;} open
-      private xywh {386 200 265 335} resizable visible
+      private xywh {386 222 265 335} resizable visible
     } {
       {fltk::TabGroup} {} {open
         xywh {5 5 260 285}
@@ -50,11 +50,11 @@ class edisplayconf {open
         } {
           {fltk::ValueSlider} slider_accel {
             label Acceleration
-            xywh {20 30 220 18} align 1 maximum 10 step 1 value 2
+            xywh {20 30 220 18} align 1 maximum 10 step 1 linesize 0 value 2
           }
           {fltk::ValueSlider} slider_thresh {
             label {Threshold (pixels)}
-            xywh {20 75 220 18} align 1 maximum 20 step 1 value 4
+            xywh {20 75 220 18} align 1 maximum 20 step 1 linesize 0 value 4
           }
         }
         {fltk::Group} group_bell {
@@ -63,15 +63,15 @@ class edisplayconf {open
         } {
           {fltk::ValueSlider} slider_volume {
             label {Volume in %}
-            xywh {20 30 220 18} align 1 maximum 100 step 1 value 50
+            xywh {20 30 220 18} align 1 maximum 100 step 1 linesize 0 value 50
           }
           {fltk::ValueSlider} slider_pitch {
             label {Pitch in Hz}
-            xywh {20 75 220 18} align 1 minimum 100 maximum 1000 step 1 value 440
+            xywh {20 75 220 18} align 1 minimum 100 maximum 1000 step 1 linesize 0 value 440
           }
           {fltk::ValueSlider} slider_duration {
             label {Duration in ms}
-            xywh {20 120 220 18} align 1 maximum 1000 step 1 value 200
+            xywh {20 120 220 18} align 1 maximum 1000 step 1 linesize 0 value 200
           }
           {fltk::Button} {} {
             label Test
@@ -89,7 +89,7 @@ class edisplayconf {open
           }
           {fltk::ValueSlider} slider_click {
             label {Click volume %}
-            xywh {25 67 220 18} align 1 maximum 100 step 1 value 50
+            xywh {25 67 220 18} align 1 maximum 100 step 1 linesize 0 value 50
           }
         }
         {fltk::Group} group_screen {
@@ -106,7 +106,7 @@ class edisplayconf {open
           }
           {fltk::ValueSlider} slider_delay {
             label {Activation delay (min)}
-            xywh {27 71 210 18} align 1 minimum 5 maximum 120 step 1 value 15
+            xywh {27 71 210 18} align 1 minimum 5 maximum 120 step 1 linesize 0 value 15
           }
           {fltk::CheckButton} check_blanking {
             label { Screen blanker activated}
@@ -117,7 +117,7 @@ class edisplayconf {open
           }
           {fltk::ValueSlider} slider_pattern {
             label {Pattern change delay (min)}
-            xywh {27 155 210 18} align 1 deactivate minimum 1 maximum 5 step 0 value 2
+            xywh {27 155 210 18} align 1 deactivate minimum 1 maximum 5 step 0 linesize 1202590843 value 2
           }
           {fltk::Group} {} {open
             xywh {35 108 210 27}

efinder/Jamfile

@@ -0,0 +1,16 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2000-2007 EDE Authors.
+#
+# This program is licenced under terms of the 
+# GNU General Public Licence version 2 or newer.
+# See COPYING for details.
+
+SubDir TOP efinder ;
+
+SOURCE = efinder.cpp eglob.cpp ;
+
+MakeEfltkProgram efinder : $(SOURCE) ;
+ExtractStrings locale : $(SOURCE) ;

eiconman/Jamfile

@@ -0,0 +1,16 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2000-2007 EDE Authors.
+#
+# This program is licenced under terms of the 
+# GNU General Public Licence version 2 or newer.
+# See COPYING for details.
+
+SubDir TOP eiconman ;
+
+SOURCE = eiconman.cpp edeskicon.cpp propdialog.cpp edeskconf.cpp ;
+
+MakeEfltkProgram eiconman : $(SOURCE) ;
+ExtractStrings locale : $(SOURCE) ;

eiconsconf/Jamfile

@@ -0,0 +1,16 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2000-2007 EDE Authors.
+#
+# This program is licenced under terms of the 
+# GNU General Public Licence version 2 or newer.
+# See COPYING for details.
+
+SubDir TOP eiconsconf ;
+
+SOURCE = eiconsconf.cpp eicon.cpp ;
+
+MakeProgram eiconsconf : $(SOURCE) ;
+ExtractStrings locale : $(SOURCE) ;

eimage/Jamfile

@@ -1,5 +1,14 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2000-2007 EDE Authors.
+#
+# This program is licenced under terms of the 
+# GNU General Public Licence version 2 or newer.
+# See COPYING for details.
+
 SubDir TOP eimage ;
 
-LOCALFLAGS += -Wall ;
-
 MakeProgram eimage : eimage.cpp ;
+ExtractStrings locale : eimage.cpp ;

einstaller/Jamfile

@@ -0,0 +1,16 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2000-2007 EDE Authors.
+#
+# This program is licenced under terms of the 
+# GNU General Public Licence version 2 or newer.
+# See COPYING for details.
+
+SubDir TOP einstaller ;
+
+SOURCE = einstaller.cpp einstall.cpp ;
+
+MakeProgram einstaller : $(SOURCE) ;
+ExtractStrings locale : $(SOURCE) ;

ekeyconf/Jamfile

@@ -0,0 +1,16 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2000-2007 EDE Authors.
+#
+# This program is licenced under terms of the 
+# GNU General Public Licence version 2 or newer.
+# See COPYING for details.
+
+SubDir TOP ekeyconf ;
+
+SOURCE = ekeys.cpp ekeyconf.cpp Shortcut_Button.cpp ;
+
+MakeProgram ekeyconf : $(SOURCE) ;
+ExtractStrings locale : $(SOURCE) ;

elauncher/Jamfile

@@ -0,0 +1,19 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2000-2007 EDE Authors.
+#
+# This program is licenced under terms of the 
+# GNU General Public Licence version 2 or newer.
+# See COPYING for details.
+
+SubDir TOP elauncher ;
+
+LIBMAGIC = -lmagic ;
+
+MakeProgram elauncher : elauncher.cpp 
+	: 
+	: $(LIBMAGIC) ;
+
+ExtractStrings locale : elauncher.cpp ;

emenueditor/Jamfile

@@ -0,0 +1,14 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2000-2007 EDE Authors.
+#
+# This program is licenced under terms of the 
+# GNU General Public Licence version 2 or newer.
+# See COPYING for details.
+
+SubDir TOP emenueditor ;
+
+MakeEfltkProgram emenueditor : emenueditor.cpp ;
+ExtractStrings locale : emenueditor.cpp ;

epanelconf/Jamfile

@@ -0,0 +1,16 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2000-2007 EDE Authors.
+#
+# This program is licenced under terms of the 
+# GNU General Public Licence version 2 or newer.
+# See COPYING for details.
+
+SubDir TOP epanelconf ;
+
+SOURCE = epanelconf.cpp util.cpp ;
+
+MakeProgram epanelconf : $(SOURCE) ;
+ExtractStrings locale : $(SOURCE) ;

esvrconf/Jamfile

@@ -0,0 +1,16 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2000-2007 EDE Authors.
+#
+# This program is licenced under terms of the 
+# GNU General Public Licence version 2 or newer.
+# See COPYING for details.
+
+SubDir TOP eimage ;
+
+SOURCE = escreensaver.cpp escrsaverconf.cpp ;
+
+MakeProgram esvrconf : $(SOURCE) ;
+ExtractStrings locale : $(SOURCE) ;

etimedate/Jamfile

@@ -0,0 +1,16 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2000-2007 EDE Authors.
+#
+# This program is licenced under terms of the 
+# GNU General Public Licence version 2 or newer.
+# See COPYING for details.
+
+SubDir TOP etimedate ;
+
+SOURCE = etimedate.cpp TimeBox.cpp EDE_Calendar.cpp Fl_Date_Time.cpp ;
+
+MakeProgram etimedate : $(SOURCE) ;
+ExtractStrings locale : $(SOURCE) ;

etip/Jamfile

@@ -0,0 +1,14 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2000-2007 EDE Authors.
+#
+# This program is licenced under terms of the 
+# GNU General Public Licence version 2 or newer.
+# See COPYING for details.
+
+SubDir TOP etip ;
+
+MakeProgram etip : etip.cpp ;
+ExtractStrings locale : etip.cpp ;

evolume/Jamfile

@@ -0,0 +1,16 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2000-2007 EDE Authors.
+#
+# This program is licenced under terms of the 
+# GNU General Public Licence version 2 or newer.
+# See COPYING for details.
+
+SubDir TOP evolume ;
+
+SOURCE = evolume.cpp prefs.cpp ;
+
+MakeProgram evolume : $(SOURCE) ;
+ExtractStrings locale : $(SOURCE) ;

ewmconf/Jamfile

@@ -0,0 +1,16 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2000-2007 EDE Authors.
+#
+# This program is licenced under terms of the 
+# GNU General Public Licence version 2 or newer.
+# See COPYING for details.
+
+SubDir TOP ewmconf ;
+
+SOURCE = ewm.cpp ewmconf.cpp ;
+
+MakeProgram ewmconf : $(SOURCE) ;
+ExtractStrings locale : $(SOURCE) ;

eworkpanel/Jamfile

@@ -0,0 +1,15 @@
+SubDir TOP eworkpanel ;
+
+SOURCE = aboutdialog.cpp 
+		logoutdialog.cpp 
+		panelbutton.cpp 
+		keyboardchooser.cpp 
+		taskbutton.cpp 
+		workpanel.cpp 
+		item.cpp 
+		cpumonitor.cpp 
+		dock.cpp 
+		mainmenu.cpp 
+		mainmenu_scan.cpp ;
+
+MakeEfltkProgram eworkpanel : $(SOURCE) ;