From 5ad0687e1e18a414fea8f9d9ef822ce74ffe99c2 Mon Sep 17 00:00:00 2001 From: Sanel Zukan Date: Fri, 16 Mar 2007 15:18:54 +0000 Subject: [PATCH] Imported Jamfiles for subprojects. It compiles everything, except few programs who uses old fltk2 api. --- Jamfile | 32 ++++++++++++++++++++++++++++++-- Jamrules | 30 ++++++++++++++++++++++++++---- ecolorconf/Jamfile | 19 +++++++++++++++++++ ecolorconf/ecolorutils.h | 2 +- econtrol/Jamfile | 17 +++++++++++++++++ edialog/Jamfile | 11 +++++++++++ edisplayconf/Jamfile | 17 +++++++++++++++++ edisplayconf/edisplayconf.cpp | 6 +++--- edisplayconf/edisplayconf.fl | 20 ++++++++++---------- efinder/Jamfile | 16 ++++++++++++++++ eiconman/Jamfile | 16 ++++++++++++++++ eiconsconf/Jamfile | 16 ++++++++++++++++ eimage/Jamfile | 13 +++++++++++-- einstaller/Jamfile | 16 ++++++++++++++++ ekeyconf/Jamfile | 16 ++++++++++++++++ elauncher/Jamfile | 19 +++++++++++++++++++ emenueditor/Jamfile | 14 ++++++++++++++ epanelconf/Jamfile | 16 ++++++++++++++++ esvrconf/Jamfile | 16 ++++++++++++++++ etimedate/Jamfile | 16 ++++++++++++++++ etip/Jamfile | 14 ++++++++++++++ evolume/Jamfile | 16 ++++++++++++++++ ewmconf/Jamfile | 16 ++++++++++++++++ eworkpanel/Jamfile | 15 +++++++++++++++ 24 files changed, 367 insertions(+), 22 deletions(-) create mode 100644 ecolorconf/Jamfile create mode 100644 econtrol/Jamfile create mode 100644 edisplayconf/Jamfile create mode 100644 efinder/Jamfile create mode 100644 eiconman/Jamfile create mode 100644 eiconsconf/Jamfile create mode 100644 einstaller/Jamfile create mode 100644 ekeyconf/Jamfile create mode 100644 elauncher/Jamfile create mode 100644 emenueditor/Jamfile create mode 100644 epanelconf/Jamfile create mode 100644 esvrconf/Jamfile create mode 100644 etimedate/Jamfile create mode 100644 etip/Jamfile create mode 100644 evolume/Jamfile create mode 100644 ewmconf/Jamfile create mode 100644 eworkpanel/Jamfile diff --git a/Jamfile b/Jamfile index 72b726f..efc36e8 100644 --- a/Jamfile +++ b/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 ; diff --git a/Jamrules b/Jamrules index d57edc5..8f9ec66 100644 --- a/Jamrules +++ b/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 : : ; -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 : : : ; +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 : : ; +rule MakeEfltkProgram +{ + InternalMakeProgram $(1) : $(2) : $(3) : $(EFLTKIMAGES) : $(EFLTKLIB) ; +} + # ExtractStrings : ; rule ExtractStrings { diff --git a/ecolorconf/Jamfile b/ecolorconf/Jamfile new file mode 100644 index 0000000..85042ac --- /dev/null +++ b/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) ; diff --git a/ecolorconf/ecolorutils.h b/ecolorconf/ecolorutils.h index 7dbe286..20f7b99 100644 --- a/ecolorconf/ecolorutils.h +++ b/ecolorconf/ecolorutils.h @@ -45,7 +45,7 @@ #include "../edelib2/NLS.h" //#include // this struct can hold slightly more information than Fl_Font -extern typedef struct { +typedef struct { fltk::Font* font; char* encoding; int size; diff --git a/econtrol/Jamfile b/econtrol/Jamfile new file mode 100644 index 0000000..b3086a0 --- /dev/null +++ b/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) ; diff --git a/edialog/Jamfile b/edialog/Jamfile index 935df36..b41df6a 100644 --- a/edialog/Jamfile +++ b/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 ; diff --git a/edisplayconf/Jamfile b/edisplayconf/Jamfile new file mode 100644 index 0000000..214780b --- /dev/null +++ b/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) ; diff --git a/edisplayconf/edisplayconf.cpp b/edisplayconf/edisplayconf.cpp index 77cfbad..11108da 100644 --- a/edisplayconf/edisplayconf.cpp +++ b/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"); diff --git a/edisplayconf/edisplayconf.fl b/edisplayconf/edisplayconf.fl index fff98f1..245ef6a 100644 --- a/edisplayconf/edisplayconf.fl +++ b/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} diff --git a/efinder/Jamfile b/efinder/Jamfile new file mode 100644 index 0000000..9798316 --- /dev/null +++ b/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) ; diff --git a/eiconman/Jamfile b/eiconman/Jamfile new file mode 100644 index 0000000..7e2e783 --- /dev/null +++ b/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) ; diff --git a/eiconsconf/Jamfile b/eiconsconf/Jamfile new file mode 100644 index 0000000..733f3bb --- /dev/null +++ b/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) ; diff --git a/eimage/Jamfile b/eimage/Jamfile index a4712e4..7804d48 100644 --- a/eimage/Jamfile +++ b/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 ; diff --git a/einstaller/Jamfile b/einstaller/Jamfile new file mode 100644 index 0000000..9bf4b82 --- /dev/null +++ b/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) ; diff --git a/ekeyconf/Jamfile b/ekeyconf/Jamfile new file mode 100644 index 0000000..8eda0f0 --- /dev/null +++ b/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) ; diff --git a/elauncher/Jamfile b/elauncher/Jamfile new file mode 100644 index 0000000..a57ad50 --- /dev/null +++ b/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 ; diff --git a/emenueditor/Jamfile b/emenueditor/Jamfile new file mode 100644 index 0000000..f63fd6a --- /dev/null +++ b/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 ; diff --git a/epanelconf/Jamfile b/epanelconf/Jamfile new file mode 100644 index 0000000..1d8065b --- /dev/null +++ b/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) ; diff --git a/esvrconf/Jamfile b/esvrconf/Jamfile new file mode 100644 index 0000000..7dee57d --- /dev/null +++ b/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) ; diff --git a/etimedate/Jamfile b/etimedate/Jamfile new file mode 100644 index 0000000..d296bc7 --- /dev/null +++ b/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) ; diff --git a/etip/Jamfile b/etip/Jamfile new file mode 100644 index 0000000..577ddd0 --- /dev/null +++ b/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 ; diff --git a/evolume/Jamfile b/evolume/Jamfile new file mode 100644 index 0000000..12955bd --- /dev/null +++ b/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) ; diff --git a/ewmconf/Jamfile b/ewmconf/Jamfile new file mode 100644 index 0000000..062b1fd --- /dev/null +++ b/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) ; diff --git a/eworkpanel/Jamfile b/eworkpanel/Jamfile new file mode 100644 index 0000000..405adf3 --- /dev/null +++ b/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) ;