gpredict-svn Mailing List for Gpredict (Page 39)
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
You can subscribe to this list here.
2008 |
Jan
(24) |
Feb
|
Mar
(6) |
Apr
(14) |
May
(9) |
Jun
|
Jul
|
Aug
(25) |
Sep
(60) |
Oct
(26) |
Nov
|
Dec
(20) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2009 |
Jan
|
Feb
(2) |
Mar
(22) |
Apr
(61) |
May
(57) |
Jun
|
Jul
(3) |
Aug
(83) |
Sep
(35) |
Oct
(50) |
Nov
(28) |
Dec
(34) |
2010 |
Jan
(29) |
Feb
(15) |
Mar
(2) |
Apr
|
May
(6) |
Jun
(2) |
Jul
(24) |
Aug
(2) |
Sep
(9) |
Oct
(43) |
Nov
(22) |
Dec
(6) |
2011 |
Jan
(24) |
Feb
(22) |
Mar
(31) |
Apr
(13) |
May
(10) |
Jun
(10) |
Jul
(43) |
Aug
(12) |
Sep
(18) |
Oct
(33) |
Nov
(18) |
Dec
(4) |
From: <cs...@us...> - 2008-01-21 22:33:52
|
Revision: 8 http://gpredict.svn.sourceforge.net/gpredict/?rev=8&view=rev Author: csete Date: 2008-01-21 14:33:57 -0800 (Mon, 21 Jan 2008) Log Message: ----------- Added all widgets except the rig model selector. Modified Paths: -------------- trunk/src/sat-pref-rig-editor.c Modified: trunk/src/sat-pref-rig-editor.c =================================================================== --- trunk/src/sat-pref-rig-editor.c 2008-01-21 22:33:25 UTC (rev 7) +++ trunk/src/sat-pref-rig-editor.c 2008-01-21 22:33:57 UTC (rev 8) @@ -51,11 +51,15 @@ /* private widgets */ -static GtkWidget *dialog; /* dialog window */ -static GtkWidget *name; /* Configuration name */ +static GtkWidget *dialog; /* dialog window */ +static GtkWidget *name; /* Configuration name */ +static GtkWidget *model; /* radio model, e.g. Kenwood TS-2000 */ +static GtkWidget *type; /* radio type */ +static GtkWidget *port; /* port selector */ +static GtkWidget *speed; /* serial speed selector */ +static GtkWidget *dtr,*rts; /* DTR and RTS line states */ - static GtkWidget *create_editor_widgets (radio_conf_t *conf); static void update_widgets (radio_conf_t *conf); static void clear_widgets (void); @@ -138,7 +142,7 @@ GtkWidget *label; - table = gtk_table_new (6, 4, FALSE); + table = gtk_table_new (5, 5, FALSE); gtk_container_set_border_width (GTK_CONTAINER (table), 5); gtk_table_set_col_spacings (GTK_TABLE (table), 5); gtk_table_set_row_spacings (GTK_TABLE (table), 5); @@ -146,7 +150,7 @@ /* Config name */ label = gtk_label_new (_("Name")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1); + gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 4, 0, 1); name = gtk_entry_new (); gtk_entry_set_max_length (GTK_ENTRY (name), 25); @@ -160,35 +164,99 @@ */ g_signal_connect (name, "changed", G_CALLBACK (name_changed), NULL); - /* Manufacturer */ - label = gtk_label_new (_("Manufacturer")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2); - - //gtk_table_attach_defaults (GTK_TABLE (table), desc, 1, 4, 1, 2); - /* Model */ label = gtk_label_new (_("Model")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3); + gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2); /* Type */ label = gtk_label_new (_("Type")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4); + gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3); + type = gtk_combo_box_new_text (); + gtk_combo_box_append_text (GTK_COMBO_BOX (type), _("Receiver")); + gtk_combo_box_append_text (GTK_COMBO_BOX (type), _("Transmitter")); + gtk_combo_box_append_text (GTK_COMBO_BOX (type), _("RX + TX")); + gtk_combo_box_append_text (GTK_COMBO_BOX (type), _("Full Duplex")); + gtk_combo_box_set_active (GTK_COMBO_BOX (type), 0); + gtk_widget_set_tooltip_text (type, + _("Select radio type. Consult the user manual, if unsure")); + gtk_table_attach_defaults (GTK_TABLE (table), type, 1, 2, 2, 3); /* Port */ label = gtk_label_new (_("Port")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 4, 5); + gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4); + + port = gtk_combo_box_entry_new_text (); + if (conf->port != NULL) { + gtk_combo_box_append_text (GTK_COMBO_BOX (port), conf->port); + } + gtk_combo_box_append_text (GTK_COMBO_BOX (port), "/dev/ttyS0"); + gtk_combo_box_append_text (GTK_COMBO_BOX (port), "/dev/ttyS1"); + gtk_combo_box_append_text (GTK_COMBO_BOX (port), "/dev/ttyS2"); + gtk_combo_box_append_text (GTK_COMBO_BOX (port), "/dev/ttyUSB0"); + gtk_combo_box_append_text (GTK_COMBO_BOX (port), "/dev/ttyUSB1"); + gtk_combo_box_append_text (GTK_COMBO_BOX (port), "/dev/ttyUSB2"); + gtk_combo_box_set_active (GTK_COMBO_BOX (port), 0); + gtk_widget_set_tooltip_text (port, _("Select or enter communication port")); + gtk_table_attach_defaults (GTK_TABLE (table), port, 1, 2, 3, 4); + /* DTR State */ + label = gtk_label_new (_("DTR Line")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 3, 4); + + dtr = gtk_combo_box_new_text (); + gtk_combo_box_append_text (GTK_COMBO_BOX (dtr), _("Undefined")); + gtk_combo_box_append_text (GTK_COMBO_BOX (dtr), _("OFF")); + gtk_combo_box_append_text (GTK_COMBO_BOX (dtr), _("ON")); + gtk_combo_box_append_text (GTK_COMBO_BOX (dtr), _("PTT")); + gtk_combo_box_append_text (GTK_COMBO_BOX (dtr), _("CW")); + gtk_combo_box_set_active (GTK_COMBO_BOX (dtr), 0); + gtk_widget_set_tooltip_text (dtr, _("Select status and use of DTR line")); + gtk_table_attach_defaults (GTK_TABLE (table), dtr, 4, 5, 3, 4); + + /* Speed */ label = gtk_label_new (_("Rate")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 5, 6); + gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 4, 5); + speed = gtk_combo_box_new_text (); + gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "300"); + gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "1200"); + gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "2400"); + gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "4800"); + gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "9600"); + gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "19200"); + gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "38400"); + gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "57600"); + gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "115200"); + gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 4); + gtk_widget_set_tooltip_text (speed, _("Select serial port speed")); + gtk_table_attach_defaults (GTK_TABLE (table), speed, 1, 2, 4, 5); + /* RTS State */ + label = gtk_label_new (_("RTS Line")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 4, 5); + + rts = gtk_combo_box_new_text (); + gtk_combo_box_append_text (GTK_COMBO_BOX (rts), _("Undefined")); + gtk_combo_box_append_text (GTK_COMBO_BOX (rts), _("OFF")); + gtk_combo_box_append_text (GTK_COMBO_BOX (rts), _("ON")); + gtk_combo_box_append_text (GTK_COMBO_BOX (rts), _("PTT")); + gtk_combo_box_append_text (GTK_COMBO_BOX (rts), _("CW")); + gtk_combo_box_set_active (GTK_COMBO_BOX (rts), 0); + gtk_widget_set_tooltip_text (rts, _("Select status and use of RTS line")); + gtk_table_attach_defaults (GTK_TABLE (table), rts, 4, 5, 4, 5); + + /* separator between port/speed and DTR/RTS */ + gtk_table_attach (GTK_TABLE (table), gtk_vseparator_new(), 2, 3, 3, 5, + GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 5, 0); + if (conf->name != NULL) update_widgets (conf); @@ -203,6 +271,49 @@ static void update_widgets (radio_conf_t *conf) { + + /* configuration name */ + gtk_entry_set_text (GTK_ENTRY (name), conf->name); + + /* model */ + + /* type */ + gtk_combo_box_set_active (GTK_COMBO_BOX (type), conf->type); + + /*serial speed */ + switch (conf->speed) { + case 300: + gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 0); + break; + case 1200: + gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 1); + break; + case 2400: + gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 2); + break; + case 9600: + gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 3); + break; + case 19200: + gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 4); + break; + case 38400: + gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 5); + break; + case 57600: + gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 6); + break; + case 115200: + gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 7); + break; + default: + gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 4); + break; + } + + /* DTR and RTS lines */ + gtk_combo_box_set_active (GTK_COMBO_BOX (dtr), conf->dtr); + gtk_combo_box_set_active (GTK_COMBO_BOX (rts), conf->rts); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2008-01-21 22:33:21
|
Revision: 7 http://gpredict.svn.sourceforge.net/gpredict/?rev=7&view=rev Author: csete Date: 2008-01-21 14:33:25 -0800 (Mon, 21 Jan 2008) Log Message: ----------- Removed manufacturer field. Will be part of the model. Modified Paths: -------------- trunk/src/radio-conf.c trunk/src/radio-conf.h trunk/src/sat-pref-rig.c Modified: trunk/src/radio-conf.c =================================================================== --- trunk/src/radio-conf.c 2008-01-13 23:07:04 UTC (rev 6) +++ trunk/src/radio-conf.c 2008-01-21 22:33:25 UTC (rev 7) @@ -35,7 +35,6 @@ #include "radio-conf.h" #define GROUP "Radio" -#define KEY_MFG "Company" #define KEY_MODEL "Model" #define KEY_ID "ID" #define KEY_TYPE "Type" @@ -86,7 +85,6 @@ g_free (fname); /* read parameters */ - conf->company = g_key_file_get_string (cfg, GROUP, KEY_MFG, NULL); conf->model = g_key_file_get_string (cfg, GROUP, KEY_MODEL, NULL); conf->id = g_key_file_get_integer (cfg, GROUP, KEY_ID, NULL); conf->type = g_key_file_get_integer (cfg, GROUP, KEY_TYPE, NULL); @@ -123,7 +121,6 @@ /* create a config structure */ cfg = g_key_file_new(); - g_key_file_set_string (cfg, GROUP, KEY_MFG, conf->company); g_key_file_set_string (cfg, GROUP, KEY_MODEL, conf->model); g_key_file_set_integer (cfg, GROUP, KEY_ID, conf->id); g_key_file_set_integer (cfg, GROUP, KEY_TYPE, conf->type); Modified: trunk/src/radio-conf.h =================================================================== --- trunk/src/radio-conf.h 2008-01-13 23:07:04 UTC (rev 6) +++ trunk/src/radio-conf.h 2008-01-21 22:33:25 UTC (rev 7) @@ -55,8 +55,7 @@ /** \brief Radio configuration. */ typedef struct { gchar *name; /*!< Configuration file name. */ - gchar *company; /*!< Manufacturer, e.g. ICOM. */ - gchar *model; /*!< Radio model, e.g. IC-910H. */ + gchar *model; /*!< Radio model, e.g. ICOM IC-910H. */ guint id; /*!< Hamlib ID. */ radio_type_t type; /*!< Radio type. */ gchar *port; /*!< Device name, e.g. /dev/ttyS0. */ Modified: trunk/src/sat-pref-rig.c =================================================================== --- trunk/src/sat-pref-rig.c 2008-01-13 23:07:04 UTC (rev 6) +++ trunk/src/sat-pref-rig.c 2008-01-21 22:33:25 UTC (rev 7) @@ -129,13 +129,6 @@ NULL); gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1); - /* Company */ - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes (_("Company"), renderer, - "text", RIG_LIST_COL_COMP, - NULL); - gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1); - /* Model */ renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes (_("Model"), renderer, @@ -220,7 +213,6 @@ /* create a new list store */ liststore = gtk_list_store_new (RIG_LIST_COL_NUM, G_TYPE_STRING, // name - G_TYPE_STRING, // company G_TYPE_STRING, // model G_TYPE_INT, // hamlib id G_TYPE_INT, // radio type @@ -250,7 +242,6 @@ gtk_list_store_append (liststore, &item); gtk_list_store_set (liststore, &item, RIG_LIST_COL_NAME, conf.name, - RIG_LIST_COL_COMP, conf.company, RIG_LIST_COL_MODEL, conf.model, RIG_LIST_COL_ID, conf.id, RIG_LIST_COL_TYPE, conf.type, @@ -268,9 +259,6 @@ if (conf.name) g_free (conf.name); - if (conf.company) - g_free (conf.company); - if (conf.model) g_free (conf.model); @@ -376,8 +364,19 @@ */ static void add_cb (GtkWidget *button, gpointer data) { - radio_conf_t conf; + radio_conf_t conf = { + .name = NULL, + .model = NULL, + .id = 0, + .type = RADIO_TYPE_RX, + .port = NULL, + .speed = 0, + .civ = 0, + .dtr = LINE_UNDEF, + .rts = LINE_UNDEF, + }; + sat_pref_rig_editor_run (&conf); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2008-01-13 23:07:02
|
Revision: 6 http://gpredict.svn.sourceforge.net/gpredict/?rev=6&view=rev Author: csete Date: 2008-01-13 15:07:04 -0800 (Sun, 13 Jan 2008) Log Message: ----------- Updated. Modified Paths: -------------- trunk/ChangeLog trunk/goocanv8/Makefile.in trunk/goocanv8/aclocal.m4 trunk/goocanv8/configure trunk/goocanv8/src/Makefile.in trunk/src/radio-conf.h trunk/src/sat-pref-rig-data.h trunk/src/sat-pref-rig.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-01-12 22:55:47 UTC (rev 5) +++ trunk/ChangeLog 2008-01-13 23:07:04 UTC (rev 6) @@ -1,3 +1,9 @@ +2008-01-12; Alexandru Csete <oz...@gm...> + + * src/radio-conf.[ch]: + Added parameter for radio type (RX, TX, TRX, FULL_DUPL). + + 2008-01-01; Alexandru Csete <oz...@gm...> * src/compat.[ch]: Modified: trunk/goocanv8/Makefile.in =================================================================== --- trunk/goocanv8/Makefile.in 2008-01-12 22:55:47 UTC (rev 5) +++ trunk/goocanv8/Makefile.in 2008-01-13 23:07:04 UTC (rev 6) @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,11 +13,15 @@ # PARTICULAR PURPOSE. @SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -31,18 +35,18 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/goocanvas.pc.in $(top_srcdir)/configure AUTHORS \ COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \ depcomp install-sh ltmain.sh missing mkinstalldirs +subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno config.status.lineno + configure.lineno configure.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = goocanvas.pc @@ -50,13 +54,10 @@ DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -72,6 +73,8 @@ distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -107,7 +110,6 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ -INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -122,8 +124,9 @@ LTLIBOBJS = @LTLIBOBJS@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ @@ -139,6 +142,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ +PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -152,13 +157,13 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -170,7 +175,6 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -198,11 +202,8 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ SUBDIRS = src po # require automake 1.7 @@ -252,7 +253,7 @@ config.h: stamp-h1 @if test ! -f $@; then \ rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ + $(MAKE) stamp-h1; \ else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @@ -276,6 +277,7 @@ distclean-libtool: -rm -f libtool +uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -308,7 +310,8 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -410,22 +413,24 @@ distdir: $(DISTFILES) $(am__remove_distdir) - test -d $(distdir) || mkdir $(distdir) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ + mkdir $(distdir) + $(mkdir_p) $(distdir)/. $(distdir)/po + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -439,7 +444,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -447,8 +452,6 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -456,7 +459,7 @@ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz @@ -531,7 +534,7 @@ $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' + sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -601,20 +604,12 @@ install-data-am: -install-dvi: install-dvi-recursive - install-exec-am: -install-html: install-html-recursive - install-info: install-info-recursive install-man: -install-pdf: install-pdf-recursive - -install-ps: install-ps-recursive - installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -635,26 +630,24 @@ ps-am: -uninstall-am: +uninstall-am: uninstall-info-am -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip +uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ + check-am clean clean-generic clean-libtool clean-recursive \ + ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ + dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am + distclean-recursive distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-generic \ + mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. Modified: trunk/goocanv8/aclocal.m4 =================================================================== --- trunk/goocanv8/aclocal.m4 2008-01-12 22:55:47 UTC (rev 5) +++ trunk/goocanv8/aclocal.m4 2008-01-13 23:07:04 UTC (rev 6) @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,11 +11,6 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) - # Copyright (C) 1995-2002 Free Software Foundation, Inc. # Copyright (C) 2001-2003,2004 Red Hat, Inc. # @@ -7189,7 +7184,7 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -7199,29 +7194,14 @@ # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.10' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) - # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) + [AM_AUTOMAKE_VERSION([1.9.6])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -7278,14 +7258,14 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 +# serial 7 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -7294,10 +7274,8 @@ [AC_PREREQ(2.52)dnl ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl +AC_SUBST([$1_TRUE]) +AC_SUBST([$1_FALSE]) if $2; then $1_TRUE= $1_FALSE='#' @@ -7311,14 +7289,15 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 +# serial 8 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -7346,7 +7325,6 @@ ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [depcc="$$1" am_compiler_list=]) @@ -7412,7 +7390,6 @@ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -7465,8 +7442,7 @@ AMDEPBACKSLASH='\' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([AMDEPBACKSLASH]) ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -7491,9 +7467,8 @@ # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -7540,8 +7515,8 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -7564,20 +7539,16 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.60])dnl +[AC_PREREQ([2.58])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi +# test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi # test whether we have cygpath @@ -7597,9 +7568,6 @@ AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl @@ -7635,10 +7603,6 @@ [_AM_DEPENDENCIES(CXX)], [define([AC_PROG_CXX], defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ]) ]) @@ -7674,7 +7638,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} +install_sh=${install_sh-"$am_aux_dir/install-sh"} AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -7781,14 +7745,14 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 4 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -7804,7 +7768,6 @@ # If it does, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL if eval "$MISSING --run true"; then @@ -7815,7 +7778,7 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -7823,23 +7786,60 @@ # AM_PROG_MKDIR_P # --------------- -# Check for `mkdir -p'. +# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. +# +# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +# created by `make install' are always world readable, even if the +# installer happens to have an overly restrictive umask (e.g. 077). +# This was a mistake. There are at least two reasons why we must not +# use `-m 0755': +# - it causes special bits like SGID to be ignored, +# - it may be too restrictive (some setups expect 775 directories). +# +# Do not use -m 0755 and let people choose whatever they expect by +# setting umask. +# +# We cannot accept any implementation of `mkdir' that recognizes `-p'. +# Some implementations (such as Solaris 8's) are not thread-safe: if a +# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +# concurrently, both version can detect that a/ is missing, but only +# one can create it and the other will error out. Consequently we +# restrict ourselves to GNU make (using the --version option ensures +# this.) AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) +[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' +else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + for d in ./-p ./--version; + do + test -d $d && rmdir $d + done + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. + if test -f "$ac_aux_dir/mkinstalldirs"; then + mkdir_p='$(mkinstalldirs)' + else + mkdir_p='$(install_sh) -d' + fi +fi +AC_SUBST([mkdir_p])]) # Helper functions for option handling. -*- Autoconf -*- @@ -7951,21 +7951,9 @@ if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) - # Check how to create a tarball. -*- Autoconf -*- # Copyright (C) 2004, 2005 Free Software Foundation, Inc. Modified: trunk/goocanv8/configure =================================================================== --- trunk/goocanv8/configure 2008-01-12 22:55:47 UTC (rev 5) +++ trunk/goocanv8/configure 2008-01-13 23:07:04 UTC (rev 6) @@ -807,7 +807,6 @@ INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA -am__isrc CYGPATH_W PACKAGE VERSION @@ -1972,8 +1971,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version='1.10' - +am__api_version="1.9" ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -2156,54 +2154,39 @@ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } -if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ - 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext - break 3;; - esac - done - done -done -IFS=$as_save_IFS - -fi - - if test "${ac_cv_path_mkdir+set}" = set; then - MKDIR_P="$ac_cv_path_mkdir -p" + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + for d in ./-p ./--version; + do + test -d $d && rmdir $d + done + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. + if test -f "$ac_aux_dir/mkinstalldirs"; then + mkdir_p='$(mkinstalldirs)' else - # As a last resort, use the slow shell script. Don't cache a - # value for MKDIR_P within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version - MKDIR_P="$ac_install_sh -d" + mkdir_p='$(install_sh) -d' fi fi -{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -echo "${ECHO_T}$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -2285,16 +2268,12 @@ fi rmdir .tst 2>/dev/null -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +# test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } - fi fi # test whether we have cygpath @@ -2337,7 +2316,7 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} +install_sh=${install_sh-"$am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user # run `make install-strip'. However `strip' might not be the right @@ -2441,7 +2420,7 @@ fi fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -2478,7 +2457,9 @@ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } - if test $USE_MAINTAINER_MODE = yes; then + + +if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= MAINTAINER_MODE_FALSE='#' else @@ -2543,7 +2524,9 @@ am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' fi - if test "x$enable_dependency_tracking" != xno; then + + +if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= AMDEP_FALSE='#' else @@ -2552,6 +2535,7 @@ fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3538,7 +3522,6 @@ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -3568,7 +3551,9 @@ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - if + + +if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then am__fastdepCC_TRUE= @@ -4406,7 +4391,6 @@ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -4436,7 +4420,9 @@ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - if + + +if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then am__fastdepCC_TRUE= @@ -5659,7 +5645,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5662 "configure"' > conftest.$ac_ext + echo '#line 5648 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6485,7 +6471,6 @@ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -6515,7 +6500,9 @@ echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - if + + +if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then am__fastdepCXX_TRUE= @@ -7991,11 +7978,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7994: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7981: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7998: \$? = $ac_status" >&5 + echo "$as_me:7985: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8281,11 +8268,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8284: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8271: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8288: \$? = $ac_status" >&5 + echo "$as_me:8275: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8385,11 +8372,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8388: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8375: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8392: \$? = $ac_status" >&5 + echo "$as_me:8379: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10747,7 +10734,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10750 "configure" +#line 10737 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10847,7 +10834,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10850 "configure" +#line 10837 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13267,11 +13254,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13270: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13257: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13274: \$? = $ac_status" >&5 + echo "$as_me:13261: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13371,11 +13358,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13374: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13361: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13378: \$? = $ac_status" >&5 + echo "$as_me:13365: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14948,11 +14935,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14951: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14938: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14955: \$? = $ac_status" >&5 + echo "$as_me:14942: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15052,11 +15039,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15055: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15042: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15059: \$? = $ac_status" >&5 + echo "$as_me:15046: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17252,11 +17239,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17255: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17242: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17259: \$? = $ac_status" >&5 + echo "$as_me:17246: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17542,11 +17529,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17545: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17532: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17549: \$? = $ac_status" >&5 + echo "$as_me:17536: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17646,11 +17633,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17649: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17636: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17653: \$? = $ac_status" >&5 + echo "$as_me:17640: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -22154,7 +22141,9 @@ esac { echo "$as_me:$LINENO: result: $platform_win32" >&5 echo "${ECHO_T}$platform_win32" >&6; } - if test "$platform_win32" = "yes"; then + + +if test "$platform_win32" = "yes"; then PLATFORM_WIN32_TRUE= PLATFORM_WIN32_FALSE='#' else @@ -22669,7 +22658,6 @@ ac_pwd='$ac_pwd' srcdir='$srcdir' INSTALL='$INSTALL' -MKDIR_P='$MKDIR_P' _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -22882,7 +22870,6 @@ INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim INSTALL_DATA!$INSTALL_DATA$ac_delim -am__isrc!$am__isrc$ac_delim CYGPATH_W!$CYGPATH_W$ac_delim PACKAGE!$PACKAGE$ac_delim VERSION!$VERSION$ac_delim @@ -22939,6 +22926,7 @@ RANLIB!$RANLIB$ac_delim CXX!$CXX$ac_delim CXXFLAGS!$CXXFLAGS$ac_delim +ac_ct_CXX!$ac_ct_CXX$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -22980,7 +22968,6 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -ac_ct_CXX!$ac_ct_CXX$ac_delim CXXDEPMODE!$CXXDEPMODE$ac_delim am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim @@ -23019,7 +23006,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 37; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -23246,11 +23233,6 @@ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac - ac_MKDIR_P=$MKDIR_P - case $MKDIR_P in - [\\/$]* | ?:[\\/]* ) ;; - */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; - esac _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -23304,7 +23286,6 @@ s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t -s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out @@ -23469,9 +23450,8 @@ # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ Modified: trunk/goocanv8/src/Makefile.in =================================================================== --- trunk/goocanv8/src/Makefile.in 2008-01-12 22:55:47 UTC (rev 5) +++ trunk/goocanv8/src/Makefile.in 2008-01-13 23:07:04 UTC (rev 6) @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,11 +15,15 @@ @SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -54,21 +58,17 @@ goocanvastext.lo goocanvasutils.lo goocanvaswidget.lo \ goocanvas.lo libgoocanvas_la_OBJECTS = $(am_libgoocanvas_la_OBJECTS) -libgoocanvas_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libgoocanvas_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libgoocanvas_la_SOURCES) DIST_SOURCES = $(libgoocanvas_la_SOURCES) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -84,6 +84,8 @@ CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -119,7 +121,6 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ -INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -134,8 +135,9 @@ LTLIBOBJS = @LTLIBOBJS@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ @@ -151,6 +153,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ +PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -164,13 +168,13 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -182,7 +186,6 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -210,11 +213,8 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ INCLUDES = \ -DG_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \ @@ -341,7 +341,7 @@ rm -f "$${dir}/so_locations"; \ done libgoocanvas.la: $(libgoocanvas_la_OBJECTS) $(libgoocanvas_la_DEPENDENCIES) - $(libgoocanvas_la_LINK) $(libgoocanvas_la_OBJECTS) $(libgoocanvas_la_LIBADD) $(LIBS) + $(LINK) $(libgoocanvas_la_LDFLAGS) $(libgoocanvas_la_OBJECTS) $(libgoocanvas_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -369,22 +369,22 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goocanvaswidget.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -394,9 +394,13 @@ clean-libtool: -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: install-libgoocanvasincludeHEADERS: $(libgoocanvasinclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(libgoocanvasincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgoocanvasincludedir)" + test -z "$(libgoocanvasincludedir)" || $(mkdir_p) "$(DESTDIR)$(libgoocanvasincludedir)" @list='$(libgoocanvasinclude_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -461,21 +465,22 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -492,7 +497,7 @@ all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: for dir in "$(DESTDIR)$(libgoocanvasincludedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am @@ -531,7 +536,7 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags + distclean-libtool distclean-tags dvi: dvi-am @@ -545,20 +550,12 @@ install-data-am: install-libgoocanvasincludeHEADERS -install-dvi: install-dvi-am - install-exec-am: -install-html: install-html-am - install-info: install-info-am install-man: -install-pdf: install-pdf-am - -install-ps: install-ps-am - installcheck-am: maintainer-clean: maintainer-clean-am @@ -579,23 +576,19 @@ ps-am: -uninstall-am: uninstall-libgoocanvasincludeHEADERS +uninstall-am: uninstall-info-am uninstall-libgoocanvasincludeHEADERS -.MAKE: install-am install-strip - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libgoocanvasincludeHEADERS install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am \ + install-libgoocanvasincludeHEADERS install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am \ + tags uninstall uninstall-am uninstall-info-am \ uninstall-libgoocanvasincludeHEADERS Modified: trunk/src/radio-conf.h =================================================================== --- trunk/src/radio-conf.h 2008-01-12 22:55:47 UTC (rev 5) +++ trunk/src/radio-conf.h 2008-01-13 23:07:04 UTC (rev 6) @@ -36,7 +36,8 @@ /** \brief RS232 control line usage definitions. */ typedef enum { - LINE_OFF = 0, /*!< Line should be permanently OFF. */ + LINE_UNDEF = 0, /*!< Undefined. */ + LINE_OFF, /*!< Line should be permanently OFF. */ LINE_ON, /*!< Line should be permanently ON. */ LINE_PTT, /*!< Line used for PTT control. */ LINE_CW /*!< Line used for CW keying. */ Modified: trunk/src/sat-pref-rig-data.h =================================================================== --- trunk/src/sat-pref-rig-data.h 2008-01-12 22:55:47 UTC (rev 5) +++ trunk/src/sat-pref-rig-data.h 2008-01-13 23:07:04 UTC (rev 6) @@ -34,6 +34,7 @@ RIG_LIST_COL_COMP, /*!< Company, e.g. Yaesu. */ RIG_LIST_COL_MODEL, /*!< Model, e.g. FT-847. */ RIG_LIST_COL_ID, /*!< Hamlib ID. */ + RIG_LIST_COL_TYPE, /*!< Radio type (RX, TX, TRX, FULL_DUP. */ RIG_LIST_COL_PORT, /*!< Port / Device, e.g. /dev/ttyS0. */ RIG_LIST_COL_SPEED, /*!< Serial speed. */ RIG_LIST_COL_CIV, /*!< CI-V address for Icom rigs. */ Modified: trunk/src/sat-pref-rig.c =================================================================== --- trunk/src/sat-pref-rig.c 2008-01-12 22:55:47 UTC (rev 5) +++ trunk/src/sat-pref-rig.c 2008-01-13 23:07:04 UTC (rev 6) @@ -36,6 +36,7 @@ #include "compat.h" #include "radio-conf.h" #include "sat-pref-rig-data.h" +#include "sat-pref-rig-editor.h" #include "sat-pref-rig.h" @@ -51,6 +52,11 @@ static void edit_cb (GtkWidget *button, gpointer data); static void delete_cb (GtkWidget *button, gpointer data); +static void render_name (GtkTreeViewColumn *col, + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer column); static void render_civ (GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, @@ -61,6 +67,11 @@ GtkTreeModel *model, GtkTreeIter *iter, gpointer column); +static void render_rig_type (GtkTreeViewColumn *col, + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer column); /* global objects */ static GtkWidget *addbutton; @@ -107,6 +118,17 @@ gtk_tree_view_set_model (GTK_TREE_VIEW (riglist), model); g_object_unref (model); + /* Conf name */ + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes (_("Config Name"), renderer, + "text", RIG_LIST_COL_NAME, + NULL); + gtk_tree_view_column_set_cell_data_func (column, renderer, + render_name, + GUINT_TO_POINTER(RIG_LIST_COL_NAME), + NULL); + gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1); + /* Company */ renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes (_("Company"), renderer, @@ -121,6 +143,17 @@ NULL); gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1); + /* Type */ + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes (_("Type"), renderer, + "text", RIG_LIST_COL_TYPE, + NULL); + gtk_tree_view_column_set_cell_data_func (column, renderer, + render_rig_type, + GUINT_TO_POINTER(RIG_LIST_COL_TYPE), + NULL); + gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1); + /* Port */ renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes (_("Port"), renderer, @@ -190,6 +223,7 @@ G_TYPE_STRING, // company G_TYPE_STRING, // model G_TYPE_INT, // hamlib id + G_TYPE_INT, // radio type G_TYPE_STRING, // port G_TYPE_INT, // speed G_TYPE_INT, // Icom CI-V @@ -219,6 +253,7 @@ RIG_LIST_COL_COMP, conf.company, RIG_LIST_COL_MODEL, conf.model, RIG_LIST_COL_ID, conf.id, + RIG_LIST_COL_TYPE, conf.type, RIG_LIST_COL_PORT, conf.port, RIG_LIST_COL_SPEED, conf.speed, RIG_LIST_COL_CIV, conf.civ, @@ -313,8 +348,7 @@ /** \brief User pressed cancel. Any changes to config must be cancelled. */ -void -sat_pref_rig_cancel () +void sat_pref_rig_cancel () { } @@ -324,12 +358,11 @@ * First, all .grc files are deleted, whereafter the radio configurations in * the riglist are saved one by one. */ -void -sat_pref_rig_ok () +void sat_pref_rig_ok () { - /* delete all .grc files */ + /* delete all .r... [truncated message content] |
From: <cs...@us...> - 2008-01-12 22:55:41
|
Revision: 5 http://gpredict.svn.sourceforge.net/gpredict/?rev=5&view=rev Author: csete Date: 2008-01-12 14:55:47 -0800 (Sat, 12 Jan 2008) Log Message: ----------- Added files. Modified Paths: -------------- trunk/src/Makefile.am Added Paths: ----------- trunk/src/sat-pref-rig-editor.c trunk/src/sat-pref-rig-editor.h Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2008-01-12 15:49:06 UTC (rev 4) +++ trunk/src/Makefile.am 2008-01-12 22:55:47 UTC (rev 5) @@ -90,6 +90,7 @@ sat-pref-single-sat.c sat-pref-single-sat.h \ sat-pref-interfaces.c sat-pref-interfaces.h \ sat-pref-rig.c sat-pref-rig.h sat-pref-rig-data.h \ + sat-pref-rig-editor.c sat-pref-rig-editor.h \ sat-pref-rot.c sat-pref-rot.h \ sat-pref-predict.c sat-pref-predict.h \ sat-pref-conditions.c sat-pref-conditions.h \ Added: trunk/src/sat-pref-rig-editor.c =================================================================== --- trunk/src/sat-pref-rig-editor.c (rev 0) +++ trunk/src/sat-pref-rig-editor.c 2008-01-12 22:55:47 UTC (rev 5) @@ -0,0 +1,293 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* + Gpredict: Real-time satellite tracking and orbit prediction program + + Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC. + + Authors: Alexandru Csete <oz...@gm...> + + Comments, questions and bugreports should be submitted via + http://sourceforge.net/projects/groundstation/ + More details can be found at the project home page: + + http://groundstation.sourceforge.net/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, visit http://www.fsf.org/ +*/ + +/** \brief Edit radio configuration. + * + */ + +#include <gtk/gtk.h> +#include <glib/gi18n.h> +#include <glib/gstdio.h> +#include <math.h> +#ifdef HAVE_CONFIG_H +# include <build-config.h> +#endif +#include "gpredict-utils.h" +#include "sat-cfg.h" +#include "sat-log.h" +#include "radio-conf.h" +#include "sat-pref-rig-editor.h" + + + + +extern GtkWidget *window; /* dialog window defined in sat-pref.c */ + + + +/* private widgets */ +static GtkWidget *dialog; /* dialog window */ +static GtkWidget *name; /* Configuration name */ + + + +static GtkWidget *create_editor_widgets (radio_conf_t *conf); +static void update_widgets (radio_conf_t *conf); +static void clear_widgets (void); +static gboolean apply_changes (radio_conf_t *conf); +static void name_changed (GtkWidget *widget, gpointer data); + +/** \brief Add or edit a radio configuration. + * \param conf Pointer to a radio configuration. + * + * Of conf->name is not NULL the widgets will be populated with the data. + */ +void +sat_pref_rig_editor_run (radio_conf_t *conf) +{ + gint response; + gboolean finished = FALSE; + + + /* crate dialog and add contents */ + dialog = gtk_dialog_new_with_buttons (_("Edit radio configuration"), + GTK_WINDOW (window), + GTK_DIALOG_MODAL | + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CLEAR, + GTK_RESPONSE_REJECT, + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, + GTK_STOCK_OK, + GTK_RESPONSE_OK, + NULL); + + /* disable OK button to begin with */ + gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), + GTK_RESPONSE_OK, + FALSE); + + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), + create_editor_widgets (conf)); + + /* this hacky-thing is to keep the dialog running in case the + CLEAR button is plressed. OK and CANCEL will exit the loop + */ + while (!finished) { + + response = gtk_dialog_run (GTK_DIALOG (dialog)); + + switch (response) { + + /* OK */ + case GTK_RESPONSE_OK: + if (apply_changes (conf)) { + finished = TRUE; + } + else { + finished = FALSE; + } + break; + + /* CLEAR */ + case GTK_RESPONSE_REJECT: + clear_widgets (); + break; + + /* Everything else is considered CANCEL */ + default: + finished = TRUE; + break; + } + } + + gtk_widget_destroy (dialog); +} + + +/** \brief Create and initialise widgets */ +static GtkWidget * +create_editor_widgets (radio_conf_t *conf) +{ + GtkWidget *table; + GtkWidget *label; + + + table = gtk_table_new (6, 4, FALSE); + gtk_container_set_border_width (GTK_CONTAINER (table), 5); + gtk_table_set_col_spacings (GTK_TABLE (table), 5); + gtk_table_set_row_spacings (GTK_TABLE (table), 5); + + /* Config name */ + label = gtk_label_new (_("Name")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1); + + name = gtk_entry_new (); + gtk_entry_set_max_length (GTK_ENTRY (name), 25); + gtk_widget_set_tooltip_text (name, + _("Enter a short name for this configuration, e.g. IC910-1.\n"\ + "Allowed charachters: 0..9, a..z, A..Z, - and _")); + gtk_table_attach_defaults (GTK_TABLE (table), name, 1, 4, 0, 1); + + /* attach changed signal so that we can enable OK button when + a proper name has been entered + */ + g_signal_connect (name, "changed", G_CALLBACK (name_changed), NULL); + + /* Manufacturer */ + label = gtk_label_new (_("Manufacturer")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2); + + //gtk_table_attach_defaults (GTK_TABLE (table), desc, 1, 4, 1, 2); + + /* Model */ + label = gtk_label_new (_("Model")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3); + + + + /* Type */ + label = gtk_label_new (_("Type")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4); + + /* Port */ + label = gtk_label_new (_("Port")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 4, 5); + + /* Speed */ + label = gtk_label_new (_("Rate")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 5, 6); + + if (conf->name != NULL) + update_widgets (conf); + + gtk_widget_show_all (table); + + return table; +} + + +/** \brief Update widgets from the currently selected row in the treeview + */ +static void +update_widgets (radio_conf_t *conf) +{ +} + + + +/** \brief Clear the contents of all widgets. + * + * This function is usually called when the user clicks on the CLEAR button + * + */ +static void +clear_widgets () +{ +} + + +/** \brief Apply changes. + * \return TRUE if things are ok, FALSE otherwise. + * + * This function is usually called when the user clicks the OK button. + */ +static gboolean +apply_changes (radio_conf_t *conf) +{ + + return TRUE; +} + + + +/** \brief Manage name changes. + * + * This function is called when the contents of the name entry changes. + * The primary purpose of this function is to check whether the char length + * of the name is greater than zero, if yes enable the OK button of the dialog. + */ +static void +name_changed (GtkWidget *widget, gpointer data) +{ + const gchar *text; + gchar *entry, *end, *j; + gint len, pos; + + + /* step 1: ensure that only valid characters are entered + (stolen from xlog, tnx pg4i) + */ + entry = gtk_editable_get_chars (GTK_EDITABLE (widget), 0, -1); + if ((len = g_utf8_strlen (entry, -1)) > 0) + { + end = entry + g_utf8_strlen (entry, -1); + for (j = entry; j < end; ++j) + { + switch (*j) + { + case '0' ... '9': + case 'a' ... 'z': + case 'A' ... 'Z': + case '-': + case '_': + break; + default: + gdk_beep (); + pos = gtk_editable_get_position (GTK_EDITABLE (widget)); + gtk_editable_delete_text (GTK_EDITABLE (widget), + pos, pos+1); + break; + } + } + } + + + /* step 2: if name seems all right, enable OK button */ + text = gtk_entry_get_text (GTK_ENTRY (widget)); + + if (g_utf8_strlen (text, -1) > 0) { + gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), + GTK_RESPONSE_OK, + TRUE); + } + else { + gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), + GTK_RESPONSE_OK, + FALSE); + } +} + + + Added: trunk/src/sat-pref-rig-editor.h =================================================================== --- trunk/src/sat-pref-rig-editor.h (rev 0) +++ trunk/src/sat-pref-rig-editor.h 2008-01-12 22:55:47 UTC (rev 5) @@ -0,0 +1,38 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* + Gpredict: Real-time satellite tracking and orbit prediction program + + Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC. + + Authors: Alexandru Csete <oz...@gm...> + + Comments, questions and bugreports should be submitted via + http://sourceforge.net/projects/groundstation/ + More details can be found at the project home page: + + http://groundstation.sourceforge.net/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, visit http://www.fsf.org/ +*/ +#ifndef SAT_PREF_RIG_EDITOR_H +#define SAT_PREF_RIG_EDITOR_H 1 + +#include <gtk/gtk.h> +#include "radio-conf.h" + + +void sat_pref_rig_editor_run (radio_conf_t *conf); + + +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2008-01-12 15:49:02
|
Revision: 4 http://gpredict.svn.sourceforge.net/gpredict/?rev=4&view=rev Author: csete Date: 2008-01-12 07:49:06 -0800 (Sat, 12 Jan 2008) Log Message: ----------- Require Gtk+ 2.12 Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-01-12 13:15:12 UTC (rev 3) +++ trunk/configure.ac 2008-01-12 15:49:06 UTC (rev 4) @@ -21,7 +21,7 @@ fi dnl chack for glib and gtk libraries -pkg_modules="gtk+-2.0 >= 2.10.0 glib-2.0 >= 2.12.0 gthread-2.0 >= 2.12.0" +pkg_modules="gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.14.0 gthread-2.0 >= 2.14.0" PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) AC_SUBST(PACKAGE_CFLAGS) AC_SUBST(PACKAGE_LIBS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2008-01-12 13:15:07
|
Revision: 3 http://gpredict.svn.sourceforge.net/gpredict/?rev=3&view=rev Author: csete Date: 2008-01-12 05:15:12 -0800 (Sat, 12 Jan 2008) Log Message: ----------- Added parameter for radio type (RX, TX, TRX, FULL_DUP). Modified Paths: -------------- trunk/src/radio-conf.c trunk/src/radio-conf.h Modified: trunk/src/radio-conf.c =================================================================== --- trunk/src/radio-conf.c 2008-01-08 22:51:02 UTC (rev 2) +++ trunk/src/radio-conf.c 2008-01-12 13:15:12 UTC (rev 3) @@ -38,6 +38,7 @@ #define KEY_MFG "Company" #define KEY_MODEL "Model" #define KEY_ID "ID" +#define KEY_TYPE "Type" #define KEY_PORT "Port" #define KEY_SPEED "Speed" #define KEY_CIV "CIV" @@ -45,12 +46,13 @@ #define KEY_RTS "RTS" -/** \brief REad radio configuration. +/** \brief Read radio configuration. * \param conf Pointer to a radio_conf_t structure where the data will be * stored. * + * This function reads a radio configuration from a .rig file into conf. * conf->name must contain the file name of the configuration (no path, just - * file). + * file name). */ gboolean radio_conf_read (radio_conf_t *conf) { @@ -87,6 +89,7 @@ conf->company = g_key_file_get_string (cfg, GROUP, KEY_MFG, NULL); conf->model = g_key_file_get_string (cfg, GROUP, KEY_MODEL, NULL); conf->id = g_key_file_get_integer (cfg, GROUP, KEY_ID, NULL); + conf->type = g_key_file_get_integer (cfg, GROUP, KEY_TYPE, NULL); conf->port = g_key_file_get_string (cfg, GROUP, KEY_PORT, NULL); conf->speed = g_key_file_get_integer (cfg, GROUP, KEY_SPEED, NULL); conf->civ = g_key_file_get_integer (cfg, GROUP, KEY_CIV, NULL); @@ -99,6 +102,13 @@ } +/** \brief Save radio configuration. + * \param conf Pointer to the radio configuration. + * + * This function saves the radio configuration stored in conf to a + * .rig file. conf->name must contain the file name of the configuration + * (no path, just file name). + */ void radio_conf_save (radio_conf_t *conf) { GKeyFile *cfg = NULL; @@ -115,7 +125,8 @@ g_key_file_set_string (cfg, GROUP, KEY_MFG, conf->company); g_key_file_set_string (cfg, GROUP, KEY_MODEL, conf->model); - g_key_file_set_integer (cfg, GROUP, KEY_MFG, conf->id); + g_key_file_set_integer (cfg, GROUP, KEY_ID, conf->id); + g_key_file_set_integer (cfg, GROUP, KEY_TYPE, conf->type); g_key_file_set_string (cfg, GROUP, KEY_PORT, conf->port); g_key_file_set_integer (cfg, GROUP, KEY_SPEED, conf->speed); g_key_file_set_integer (cfg, GROUP, KEY_CIV, conf->civ); Modified: trunk/src/radio-conf.h =================================================================== --- trunk/src/radio-conf.h 2008-01-08 22:51:02 UTC (rev 2) +++ trunk/src/radio-conf.h 2008-01-12 13:15:12 UTC (rev 3) @@ -34,24 +34,35 @@ - +/** \brief RS232 control line usage definitions. */ typedef enum { - LINE_OFF = 0, - LINE_ON, - LINE_PTT, - LINE_CW + LINE_OFF = 0, /*!< Line should be permanently OFF. */ + LINE_ON, /*!< Line should be permanently ON. */ + LINE_PTT, /*!< Line used for PTT control. */ + LINE_CW /*!< Line used for CW keying. */ } ctrl_stat_t; + +/** \brief Radio type definitions. */ +typedef enum { + RADIO_TYPE_RX = 0, /*!< Radio used as receiver only. */ + RADIO_TYPE_TX, /*!< Radio used as TX only. */ + RADIO_TYPE_TRX, /*!< Radio use as both TX and RX. */ + RADIO_TYPE_FULL_DUP /*!< Full duplex radio. */ +} radio_type_t; + +/** \brief Radio configuration. */ typedef struct { - gchar *name; - gchar *company; - gchar *model; - guint id; - gchar *port; - guint speed; - guint civ; - ctrl_stat_t dtr; - ctrl_stat_t rts; + gchar *name; /*!< Configuration file name. */ + gchar *company; /*!< Manufacturer, e.g. ICOM. */ + gchar *model; /*!< Radio model, e.g. IC-910H. */ + guint id; /*!< Hamlib ID. */ + radio_type_t type; /*!< Radio type. */ + gchar *port; /*!< Device name, e.g. /dev/ttyS0. */ + guint speed; /*!< Serial speed. */ + guint civ; /*!< ICOM CI-V address. */ + ctrl_stat_t dtr; /*!< DTR line usage. */ + ctrl_stat_t rts; /*!< PTT line usage. */ } radio_conf_t; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2008-01-08 22:51:03
|
Revision: 2 http://gpredict.svn.sourceforge.net/gpredict/?rev=2&view=rev Author: csete Date: 2008-01-08 14:51:02 -0800 (Tue, 08 Jan 2008) Log Message: ----------- Testing SVN repository setup. Modified Paths: -------------- trunk/NEWS Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2008-01-08 22:21:12 UTC (rev 1) +++ trunk/NEWS 2008-01-08 22:51:02 UTC (rev 2) @@ -1,3 +1,4 @@ + Changes in version 1.0 (TBD): x New alarm manager: Notify user ... systray ... This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |