Menu
▾
▴
morphix-cvs — A list for all cvs commits done, to easily keep track of development
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(23) |
Nov
(20) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(43) |
Feb
(31) |
Mar
(99) |
Apr
(57) |
May
(82) |
Jun
(73) |
Jul
(123) |
Aug
(634) |
Sep
(588) |
Oct
(264) |
Nov
(217) |
Dec
(179) |
| 2005 |
Jan
(262) |
Feb
(273) |
Mar
(164) |
Apr
(88) |
May
(23) |
Jun
(10) |
Jul
(8) |
Aug
(19) |
Sep
(112) |
Oct
(57) |
Nov
(71) |
Dec
(6) |
| 2006 |
Jan
(14) |
Feb
(48) |
Mar
(56) |
Apr
(21) |
May
(77) |
Jun
(46) |
Jul
(47) |
Aug
(27) |
Sep
(18) |
Oct
(16) |
Nov
(4) |
Dec
(18) |
| 2007 |
Jan
(2) |
Feb
(6) |
Mar
(2) |
Apr
(27) |
May
(13) |
Jun
(27) |
Jul
(20) |
Aug
(3) |
Sep
(3) |
Oct
(23) |
Nov
(21) |
Dec
(6) |
| 2008 |
Jan
(7) |
Feb
(3) |
Mar
(4) |
Apr
(8) |
May
(3) |
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(11) |
Feb
(1) |
Mar
(8) |
Apr
|
May
|
Jun
(4) |
Jul
(6) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: <ale...@us...> - 2003-12-11 13:30:27
|
Update of /cvsroot/morphix/partitionmorpher/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31280/src
Modified Files:
callbacks.c interface.c main.c pm_libparted.h
Log Message:
simplified view
Index: callbacks.c
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/callbacks.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** callbacks.c 19 Oct 2003 00:18:57 -0000 1.10
--- callbacks.c 11 Dec 2003 13:30:24 -0000 1.11
***************
*** 9,12 ****
--- 9,13 ----
#include <fcntl.h>
+ #include "main.h"
#include "callbacks.h"
#include "interface.h"
***************
*** 152,156 ****
}
-
/*
initialise list of filesystem types
--- 153,156 ----
***************
*** 213,217 ****
selected_partition = get_arraynumber_from_partinfo_num(num);
if (selected_partition < 0) {
! printf("Error: selected partition has invalid arraynumber: %d\n",selected_partition);
}
else if (partition != NULL) {
--- 213,217 ----
selected_partition = get_arraynumber_from_partinfo_num(num);
if (selected_partition < 0) {
! debug("Error: selected partition has invalid arraynumber: %d\n",selected_partition);
}
else if (partition != NULL) {
***************
*** 301,305 ****
for (i = 1; i < part_count; i++) {
if (partinfo[i].part == NULL && partinfo[i].free != TRUE) {
! printf("Debug: Skipping partition. Free: %d\n",partinfo[i].free);
continue;
}
--- 301,305 ----
for (i = 1; i < part_count; i++) {
if (partinfo[i].part == NULL && partinfo[i].free != TRUE) {
! debug("Debug: Skipping partition. Free: %d\n",partinfo[i].free);
continue;
}
***************
*** 338,350 ****
if (partinfo[i].flags[5] == PED_PARTITION_LVM)
COLOR_LVM(color)
! printf("Debug: Color: %d, %d, %d\n",color.red,color.green,color.blue);
if (width >= 100) {
if (strcmp(partinfo[i].partname,"") != 0)
gtk_button_set_label(GTK_BUTTON(part_item),partinfo[i].partname);
else
! gtk_button_set_label(GTK_BUTTON(part_item),"free");
}
! printf("Debug: Color: %d, %d, %d\n",color.red,color.green,color.blue);
gtk_widget_modify_bg(part_item,GTK_STATE_NORMAL,&color);
--- 338,350 ----
if (partinfo[i].flags[5] == PED_PARTITION_LVM)
COLOR_LVM(color)
! debug("Debug: Color: %d, %d, %d\n",color.red,color.green,color.blue);
if (width >= 100) {
if (strcmp(partinfo[i].partname,"") != 0)
gtk_button_set_label(GTK_BUTTON(part_item),partinfo[i].partname);
else
! gtk_button_set_label(GTK_BUTTON(part_item),"Free Space");
}
! debug("Debug: Color: %d, %d, %d\n",color.red,color.green,color.blue);
gtk_widget_modify_bg(part_item,GTK_STATE_NORMAL,&color);
***************
*** 357,361 ****
g_signal_connect(GTK_OBJECT(part_item),"clicked",
GTK_SIGNAL_FUNC(click_part_item),(gpointer) &partinfo[i]);
! printf("Debug: Adding partition, number %d:%d width %d type %d name %s size %ld\n",partinfo[i].num, i, width, partinfo[i].type, partinfo[i].partname, partinfo[i].size);
gtk_box_pack_start(GTK_BOX(part_box),part_item,TRUE,TRUE,2);
--- 357,361 ----
g_signal_connect(GTK_OBJECT(part_item),"clicked",
GTK_SIGNAL_FUNC(click_part_item),(gpointer) &partinfo[i]);
! debug("Debug: Adding partition, number %d:%d width %d type %d name %s size %ld\n",partinfo[i].num, i, width, partinfo[i].type, partinfo[i].partname, partinfo[i].size);
gtk_box_pack_start(GTK_BOX(part_box),part_item,TRUE,TRUE,2);
***************
*** 447,451 ****
disk = ped_disk_new (devices[selected_device]);
if (!disk) {
! printf("Debug: No partitions!\n");
return FALSE;
--- 447,451 ----
disk = ped_disk_new (devices[selected_device]);
if (!disk) {
! debug("Debug: No partitions!\n");
return FALSE;
***************
*** 475,487 ****
part->type != PED_PARTITION_LOGICAL) {
/* Error in parted? */
! printf("Error: reading partition! Type: %d\n",part->type);
}
PedConstraint *constraint = NULL;
if (!part && !disk) {
! printf("Error: reading partition!\n");
return TRUE;
}
! //sprintf(minor,"%d",partition_get_minor(part));
partinfo[i].part = part;
--- 475,487 ----
part->type != PED_PARTITION_LOGICAL) {
/* Error in parted? */
! debug("Error: reading partition! Type: %d\n",part->type);
}
PedConstraint *constraint = NULL;
if (!part && !disk) {
! debug("Error: reading partition!\n");
return TRUE;
}
! //sdebug(minor,"%d",partition_get_minor(part));
partinfo[i].part = part;
***************
*** 494,498 ****
partinfo[i].label = "";
if (!(part->type & PED_PARTITION_FREESPACE)) {
! printf("Debug: Adding partition\n");
strcpy(partinfo[i].partname,ped_partition_get_path(part));
if (part->type & PED_PARTITION_LOGICAL) {
--- 494,498 ----
partinfo[i].label = "";
if (!(part->type & PED_PARTITION_FREESPACE)) {
! debug("Debug: Adding partition\n");
strcpy(partinfo[i].partname,ped_partition_get_path(part));
if (part->type & PED_PARTITION_LOGICAL) {
***************
*** 543,552 ****
PedFileSystem *fs = ped_file_system_open(&part->geom);
if (fs) {
! printf("Debug: Checking if partition %s is resizable...\n", partinfo[i].partname);
PedConstraint *resize_con =
ped_file_system_get_resize_constraint(fs);
if (resize_con) {
! printf("Debug: constraint accepted: mb_min: %ld mb_max: %ld\n",(int)(resize_con->min_size * 1.0/ MEGABYTE_SIZE * MEGABYTE_SECTORS),(int)(resize_con->max_size * 1.0 / MEGABYTE_SIZE * MEGABYTE_SECTORS));
partinfo[i].min_size = (int)resize_con->min_size;
partinfo[i].mb_min_size = (int)(resize_con->min_size * 1.0/ MEGABYTE_SIZE * MEGABYTE_SECTORS);
--- 543,552 ----
PedFileSystem *fs = ped_file_system_open(&part->geom);
if (fs) {
! debug("Debug: Checking if partition %s is resizable...\n", partinfo[i].partname);
PedConstraint *resize_con =
ped_file_system_get_resize_constraint(fs);
if (resize_con) {
! debug("Debug: constraint accepted: mb_min: %ld mb_max: %ld\n",(int)(resize_con->min_size * 1.0/ MEGABYTE_SIZE * MEGABYTE_SECTORS),(int)(resize_con->max_size * 1.0 / MEGABYTE_SIZE * MEGABYTE_SECTORS));
partinfo[i].min_size = (int)resize_con->min_size;
partinfo[i].mb_min_size = (int)(resize_con->min_size * 1.0/ MEGABYTE_SIZE * MEGABYTE_SECTORS);
***************
*** 556,560 ****
}
else {
! printf("Debug: constraint failed! Can'tresize %dth partition\n",i);
}
ped_file_system_close(fs);
--- 556,560 ----
}
else {
! debug("Debug: constraint failed! Can'tresize %dth partition\n",i);
}
ped_file_system_close(fs);
***************
*** 567,576 ****
}
else {
! printf("Debug: filesystem couldn't be opened\n");
}
}
else {
/* FREESPACE */
! printf("Debug: Adding freespace\n");
device_freespace += partinfo[i].size;
partinfo[i].t_start = -1;
--- 567,576 ----
}
else {
! debug("Debug: filesystem couldn't be opened\n");
}
}
else {
/* FREESPACE */
! debug("Debug: Adding freespace\n");
device_freespace += partinfo[i].size;
partinfo[i].t_start = -1;
***************
*** 617,625 ****
gtk_tree_view_set_model(GTK_TREE_VIEW(tree),GTK_TREE_MODEL(store));
- // printf("freespace: %ld\n",device_freespace);
sprintf(free_label,"Free: %ld MB",device_freespace);
gtk_label_set_text(GTK_LABEL(free_widget),free_label);
- // printf("used: %ld\n",device_total_size - device_freespace);
sprintf(used_label,"Used: %ld MB",device_total_size - device_freespace);
gtk_label_set_text(GTK_LABEL(used_widget),used_label);
--- 617,623 ----
***************
*** 646,650 ****
gchar string[256];
gint size_drive = (int) devices[device]->length * 1.0 / MEGABYTE_SIZE * devices[device]->sector_size;
! printf("Debug: device %d is: length %d sector %d MB\n",
device,(int)devices[device]->length,size_drive);
sprintf(string,"Total size: %d MB",size_drive);
--- 644,648 ----
gchar string[256];
gint size_drive = (int) devices[device]->length * 1.0 / MEGABYTE_SIZE * devices[device]->sector_size;
! debug("Debug: device %d is: length %d sector %d MB\n",
device,(int)devices[device]->length,size_drive);
sprintf(string,"Total size: %d MB",size_drive);
***************
*** 680,691 ****
gchar buffer[64];
GtkObject *adjustment;
- GtkWidget *range = lookup_widget(CreateWindow,"CreateSizeHScale");
GtkWidget *size_label = lookup_widget(CreateWindow,"CreateMaxLabel");
!
sprintf(buffer,"%ld MB",partinfo[selected_partition].size);
-
gtk_label_set_text(GTK_LABEL(size_label),buffer);
! adjustment = gtk_adjustment_new((gdouble)partinfo[selected_partition].size,
(gdouble)0,
(gdouble)partinfo[selected_partition].size,
--- 678,689 ----
gchar buffer[64];
GtkObject *adjustment;
GtkWidget *size_label = lookup_widget(CreateWindow,"CreateMaxLabel");
+ GtkWidget *size_entry = lookup_widget(CreateWindow,"CreateSizeEntry");
! sprintf(buffer,"%ld",partinfo[selected_partition].size);
! gtk_entry_set_text(GTK_ENTRY(size_entry),buffer);
sprintf(buffer,"%ld MB",partinfo[selected_partition].size);
gtk_label_set_text(GTK_LABEL(size_label),buffer);
! /* adjustment = gtk_adjustment_new((gdouble)partinfo[selected_partition].size,
(gdouble)0,
(gdouble)partinfo[selected_partition].size,
***************
*** 693,697 ****
100.0,
(gdouble)0);
! gtk_range_set_adjustment(GTK_RANGE(range),GTK_ADJUSTMENT(adjustment));
gtk_widget_show (CreateWindow);
}
--- 691,695 ----
100.0,
(gdouble)0);
! gtk_range_set_adjustment(GTK_RANGE(range),GTK_ADJUSTMENT(adjustment));*/
gtk_widget_show (CreateWindow);
}
***************
*** 909,913 ****
GtkWidget *option = lookup_widget(widget,"MainHarddiskOptionMenu");
! printf("Debug: devices: %d\n",device_count);
for (i = 0; i < device_count;i++) {
--- 907,911 ----
GtkWidget *option = lookup_widget(widget,"MainHarddiskOptionMenu");
! debug("Debug: devices: %d\n",device_count);
for (i = 0; i < device_count;i++) {
***************
*** 964,968 ****
/* (partition start in sectors) */
!
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(
--- 962,966 ----
/* (partition start in sectors) */
! /*
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(
***************
*** 980,984 ****
NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(tree),column);
!
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(
--- 978,982 ----
NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(tree),column);
! */
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(
***************
*** 1117,1121 ****
gpointer user_data)
{
! printf("Debug: Move not yet implemented!\n");
/*
do_move(&devices[selected_device],partinfo[selected_partition].part,partinfo[selected_partition].partname,(PedSector) start, (PedSector) end);
--- 1115,1119 ----
gpointer user_data)
{
! debug("Debug: Move not yet implemented!\n");
/*
do_move(&devices[selected_device],partinfo[selected_partition].part,partinfo[selected_partition].partname,(PedSector) start, (PedSector) end);
***************
*** 1131,1135 ****
{
show_busy_cursor( ((GtkWidget*)button)->window );
!
gboolean success;
gchar fs_buffer[64];
--- 1129,1134 ----
{
show_busy_cursor( ((GtkWidget*)button)->window );
! long long mb_size = 0;
! long long sector_num = 0;
gboolean success;
gchar fs_buffer[64];
***************
*** 1137,1141 ****
PedFileSystemType *fs_type;
PedPartitionType part_type;
! GtkWidget *range = lookup_widget(CreateWindow,"CreateSizeHScale");
GtkWidget *optionmenu_partfs = lookup_widget(CreateWindow,"CreateTypeOptionMenu");
GtkWidget *optionmenu_fs = lookup_widget(CreateWindow,"optionmenu4");
--- 1136,1140 ----
PedFileSystemType *fs_type;
PedPartitionType part_type;
! GtkWidget *size = lookup_widget(CreateWindow,"CreateSizeEntry");
GtkWidget *optionmenu_partfs = lookup_widget(CreateWindow,"CreateTypeOptionMenu");
GtkWidget *optionmenu_fs = lookup_widget(CreateWindow,"optionmenu4");
***************
*** 1152,1155 ****
--- 1151,1155 ----
int saved_fd, stderr_pipe;
gchar error_message_buffer[1000];
+ gchar *value = NULL;
int index;
***************
*** 1211,1222 ****
else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radio_logical_type)))
part_type = PED_PARTITION_LOGICAL;
!
! long long mb_size = (long long)gtk_range_get_value(GTK_RANGE(range));
! long long sector_num = ((mb_size * 1024*1024) / 512);
!
end_sector = sector_num + partinfo[selected_partition].start;
! printf("Debug: selectedpartititon: %d\n",selected_partition);
! printf("Debug: mbsize: %lld, start: %lld end: %lld\n",mb_size, partinfo[selected_partition].start,end_sector);
fs_type = ped_file_system_type_get(fs_buffer);
--- 1211,1225 ----
else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radio_logical_type)))
part_type = PED_PARTITION_LOGICAL;
! value = gtk_entry_get_text(GTK_ENTRY(size));
! mb_size = (long long)atol(value);
! sector_num = ((mb_size * 1024*1024) / 512);
! if (mb_size <= 0 || sector_num <= 0 || mb_size > partinfo[selected_partition].size) {
! debug("Debug: entered size is invalid, aborting\n");
! return;
! }
end_sector = sector_num + partinfo[selected_partition].start;
! debug("Debug: selectedpartititon: %d\n",selected_partition);
! debug("Debug: mbsize: %lld, start: %lld end: %lld\n",mb_size, partinfo[selected_partition].start,end_sector);
fs_type = ped_file_system_type_get(fs_buffer);
***************
*** 1273,1279 ****
long long sector_num = ((mb_size * 1024*1024) / 512);
! printf("Debug: %lld : %Ld\n",sector_num,sector_num);
end_sector = sector_num + partinfo[selected_partition].start;
! printf("Debug: mbsize: %lld, end: %lld\n",mb_size,end_sector);
do_resize(&devices[selected_device],partinfo[selected_partition].part,
--- 1276,1282 ----
long long sector_num = ((mb_size * 1024*1024) / 512);
! debug("Debug: %lld : %Ld\n",sector_num,sector_num);
end_sector = sector_num + partinfo[selected_partition].start;
! debug("Debug: mbsize: %lld, end: %lld\n",mb_size,end_sector);
do_resize(&devices[selected_device],partinfo[selected_partition].part,
***************
*** 1301,1305 ****
gpointer user_data)
{
! printf("Debug: Convert not yet implemented\n");
gtk_widget_hide(ConvertWindow);
refresh_devices_and_partitions();
--- 1304,1308 ----
gpointer user_data)
{
! debug("Debug: Convert not yet implemented\n");
gtk_widget_hide(ConvertWindow);
refresh_devices_and_partitions();
***************
*** 1422,1430 ****
break;
default:
! printf("Error: type not known!\n");
return;
}
if (type == NULL) {
! printf("Error: type not known!\n");
return;
}
--- 1425,1433 ----
break;
default:
! debug("Error: type not known!\n");
return;
}
if (type == NULL) {
! debug("Error: type not known!\n");
return;
}
Index: interface.c
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/interface.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** interface.c 19 Oct 2003 00:18:57 -0000 1.7
--- interface.c 11 Dec 2003 13:30:24 -0000 1.8
***************
*** 193,197 ****
gtk_widget_show (label1);
gtk_box_pack_start (GTK_BOX (hbox1), label1, FALSE, FALSE, 5);
- gtk_label_set_justify (GTK_LABEL (label1), GTK_JUSTIFY_LEFT);
MainHarddiskOptionMenu = gtk_option_menu_new ();
--- 193,196 ----
***************
*** 216,230 ****
gtk_widget_show (SizeLabel);
gtk_box_pack_start (GTK_BOX (hbox2), SizeLabel, TRUE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (SizeLabel), GTK_JUSTIFY_LEFT);
UsedLabel = gtk_label_new (_("Used:"));
gtk_widget_show (UsedLabel);
gtk_box_pack_start (GTK_BOX (hbox2), UsedLabel, TRUE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (UsedLabel), GTK_JUSTIFY_LEFT);
FreeLabel = gtk_label_new (_("Free:"));
gtk_widget_show (FreeLabel);
gtk_box_pack_start (GTK_BOX (hbox2), FreeLabel, TRUE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (FreeLabel), GTK_JUSTIFY_LEFT);
hseparator2 = gtk_hseparator_new ();
--- 215,226 ----
***************
*** 370,374 ****
GtkWidget *end_of_free_space1;
GtkWidget *label56;
- GtkWidget *CreateSizeHScale;
GtkWidget *label11;
GtkWidget *label10;
--- 366,369 ----
***************
*** 391,394 ****
--- 386,390 ----
GtkWidget *CreateExtendedRadiobutton;
GtkWidget *CreateLogicalRadiobutton;
+ GtkWidget *CreateSizeEntry;
GtkWidget *dialog_action_area1;
GtkWidget *cancelbutton1;
***************
*** 423,427 ****
gtk_widget_show (label55);
gtk_box_pack_start (GTK_BOX (hbox9), label55, TRUE, TRUE, 0);
- gtk_label_set_justify (GTK_LABEL (label55), GTK_JUSTIFY_LEFT);
table1 = gtk_table_new (13, 2, FALSE);
--- 419,422 ----
***************
*** 437,441 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label27), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label27), 0, 0.5);
--- 432,435 ----
***************
*** 446,449 ****
--- 440,444 ----
(GtkAttachOptions) (0), 0, 0);
gtk_tooltips_set_tip (tooltips, optionmenu4, _("Select the filesystem type. None is default. For an ordinary filesystem, you should choose one of the next 4 options. If you want a swap partition, select the 6th option"), NULL);
+ gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu4), 2);
menu7 = gtk_menu_new ();
***************
*** 524,536 ****
label8 = gtk_label_new (_("Partition Position:"));
- gtk_widget_show (label8);
gtk_table_attach (GTK_TABLE (table1), label8, 0, 1, 3, 4,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label8), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label8), 0, 0.5);
optionmenu3 = gtk_option_menu_new ();
- gtk_widget_show (optionmenu3);
gtk_table_attach (GTK_TABLE (table1), optionmenu3, 1, 2, 3, 4,
(GtkAttachOptions) (GTK_FILL),
--- 519,528 ----
***************
*** 555,568 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label56), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label56), 0, 0.5);
- CreateSizeHScale = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 0, 0, 0, 0)));
- gtk_widget_show (CreateSizeHScale);
- gtk_table_attach (GTK_TABLE (table1), CreateSizeHScale, 1, 2, 12, 13,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
- gtk_scale_set_value_pos (GTK_SCALE (CreateSizeHScale), GTK_POS_LEFT);
-
label11 = gtk_label_new (_("Partition Size"));
gtk_widget_show (label11);
--- 547,552 ----
***************
*** 570,574 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label11), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label11), 0, 0.5);
--- 554,557 ----
***************
*** 578,582 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label10), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label10), 0, 0.5);
--- 561,564 ----
***************
*** 586,590 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (CreateMaxLabel), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (CreateMaxLabel), 0, 0.5);
--- 568,571 ----
***************
*** 594,598 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label65), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label65), 0, 0.5);
--- 575,578 ----
***************
*** 602,606 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label66), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label66), 0, 0.5);
--- 582,585 ----
***************
*** 610,614 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label67), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label67), 0, 0.5);
--- 589,592 ----
***************
*** 618,622 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label68), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label68), 0, 0.5);
--- 596,599 ----
***************
*** 626,630 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label69), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label69), 0, 0.5);
--- 603,606 ----
***************
*** 634,638 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label70), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label70), 0, 0.5);
--- 610,613 ----
***************
*** 704,707 ****
--- 679,688 ----
CreatePrimaryRadiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (CreateLogicalRadiobutton));
+ CreateSizeEntry = gtk_entry_new ();
+ gtk_widget_show (CreateSizeEntry);
+ gtk_table_attach (GTK_TABLE (table1), CreateSizeEntry, 1, 2, 12, 13,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
dialog_action_area1 = GTK_DIALOG (CreateWindow)->action_area;
gtk_widget_show (dialog_action_area1);
***************
*** 831,835 ****
GLADE_HOOKUP_OBJECT (CreateWindow, end_of_free_space1, "end_of_free_space1");
GLADE_HOOKUP_OBJECT (CreateWindow, label56, "label56");
- GLADE_HOOKUP_OBJECT (CreateWindow, CreateSizeHScale, "CreateSizeHScale");
GLADE_HOOKUP_OBJECT (CreateWindow, label11, "label11");
GLADE_HOOKUP_OBJECT (CreateWindow, label10, "label10");
--- 812,815 ----
***************
*** 851,854 ****
--- 831,835 ----
GLADE_HOOKUP_OBJECT (CreateWindow, CreateExtendedRadiobutton, "CreateExtendedRadiobutton");
GLADE_HOOKUP_OBJECT (CreateWindow, CreateLogicalRadiobutton, "CreateLogicalRadiobutton");
+ GLADE_HOOKUP_OBJECT (CreateWindow, CreateSizeEntry, "CreateSizeEntry");
GLADE_HOOKUP_OBJECT_NO_REF (CreateWindow, dialog_action_area1, "dialog_action_area1");
GLADE_HOOKUP_OBJECT (CreateWindow, cancelbutton1, "cancelbutton1");
***************
*** 878,884 ****
GtkWidget *label17;
GtkWidget *ResizeSizeLabel;
- GtkWidget *hscale2;
GtkWidget *label57;
GtkWidget *ResizeMinLabel;
GtkWidget *dialog_action_area2;
GtkWidget *cancelbutton2;
--- 859,865 ----
GtkWidget *label17;
GtkWidget *ResizeSizeLabel;
GtkWidget *label57;
GtkWidget *ResizeMinLabel;
+ GtkWidget *entry2;
GtkWidget *dialog_action_area2;
GtkWidget *cancelbutton2;
***************
*** 913,916 ****
--- 894,898 ----
gtk_widget_show (label54);
gtk_box_pack_start (GTK_BOX (hbox8), label54, TRUE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (label54), GTK_JUSTIFY_CENTER);
table2 = gtk_table_new (6, 2, FALSE);
***************
*** 926,930 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label14), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label14), 0, 0.5);
--- 908,911 ----
***************
*** 934,938 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label15), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label15), 0, 0.5);
--- 915,918 ----
***************
*** 942,946 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label16), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label16), 0, 0.5);
--- 922,925 ----
***************
*** 950,954 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (ResizeDeviceLabel), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (ResizeDeviceLabel), 0, 0.5);
--- 929,932 ----
***************
*** 958,962 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (ResizeFsLabel), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (ResizeFsLabel), 0, 0.5);
--- 936,939 ----
***************
*** 966,970 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (ResizeMaxLabel), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (ResizeMaxLabel), 0, 0.5);
--- 943,946 ----
***************
*** 974,978 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label18), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label18), 0, 0.5);
--- 950,953 ----
***************
*** 982,986 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label17), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label17), 0, 0.5);
--- 957,960 ----
***************
*** 990,1003 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (ResizeSizeLabel), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (ResizeSizeLabel), 0, 0.5);
- hscale2 = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 0, 0, 0, 0)));
- gtk_widget_show (hscale2);
- gtk_table_attach (GTK_TABLE (table2), hscale2, 1, 2, 5, 6,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
- gtk_scale_set_value_pos (GTK_SCALE (hscale2), GTK_POS_LEFT);
-
label57 = gtk_label_new (_("Min Size:"));
gtk_widget_show (label57);
--- 964,969 ----
***************
*** 1005,1009 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label57), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label57), 0, 0.5);
--- 971,974 ----
***************
*** 1013,1019 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (ResizeMinLabel), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (ResizeMinLabel), 0, 0.5);
dialog_action_area2 = GTK_DIALOG (ResizeWindow)->action_area;
gtk_widget_show (dialog_action_area2);
--- 978,989 ----
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (ResizeMinLabel), 0, 0.5);
+ entry2 = gtk_entry_new ();
+ gtk_widget_show (entry2);
+ gtk_table_attach (GTK_TABLE (table2), entry2, 1, 2, 5, 6,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
dialog_action_area2 = GTK_DIALOG (ResizeWindow)->action_area;
gtk_widget_show (dialog_action_area2);
***************
*** 1060,1066 ****
GLADE_HOOKUP_OBJECT (ResizeWindow, label17, "label17");
GLADE_HOOKUP_OBJECT (ResizeWindow, ResizeSizeLabel, "ResizeSizeLabel");
- GLADE_HOOKUP_OBJECT (ResizeWindow, hscale2, "hscale2");
GLADE_HOOKUP_OBJECT (ResizeWindow, label57, "label57");
GLADE_HOOKUP_OBJECT (ResizeWindow, ResizeMinLabel, "ResizeMinLabel");
GLADE_HOOKUP_OBJECT_NO_REF (ResizeWindow, dialog_action_area2, "dialog_action_area2");
GLADE_HOOKUP_OBJECT (ResizeWindow, cancelbutton2, "cancelbutton2");
--- 1030,1036 ----
GLADE_HOOKUP_OBJECT (ResizeWindow, label17, "label17");
GLADE_HOOKUP_OBJECT (ResizeWindow, ResizeSizeLabel, "ResizeSizeLabel");
GLADE_HOOKUP_OBJECT (ResizeWindow, label57, "label57");
GLADE_HOOKUP_OBJECT (ResizeWindow, ResizeMinLabel, "ResizeMinLabel");
+ GLADE_HOOKUP_OBJECT (ResizeWindow, entry2, "entry2");
GLADE_HOOKUP_OBJECT_NO_REF (ResizeWindow, dialog_action_area2, "dialog_action_area2");
GLADE_HOOKUP_OBJECT (ResizeWindow, cancelbutton2, "cancelbutton2");
***************
*** 1092,1096 ****
gtk_widget_show (label24);
gtk_box_pack_start (GTK_BOX (dialog_vbox4), label24, TRUE, TRUE, 0);
- gtk_label_set_justify (GTK_LABEL (label24), GTK_JUSTIFY_LEFT);
gtk_misc_set_padding (GTK_MISC (label24), 8, 8);
--- 1062,1065 ----
***************
*** 1152,1156 ****
gtk_widget_show (label25);
gtk_box_pack_start (GTK_BOX (dialog_vbox5), label25, TRUE, TRUE, 0);
- gtk_label_set_justify (GTK_LABEL (label25), GTK_JUSTIFY_LEFT);
dialog_action_area5 = GTK_DIALOG (RevertWindow)->action_area;
--- 1121,1124 ----
***************
*** 1211,1215 ****
gtk_widget_show (label26);
gtk_box_pack_start (GTK_BOX (dialog_vbox6), label26, TRUE, TRUE, 0);
- gtk_label_set_justify (GTK_LABEL (label26), GTK_JUSTIFY_LEFT);
dialog_action_area6 = GTK_DIALOG (DialogWindow)->action_area;
--- 1179,1182 ----
***************
*** 1352,1355 ****
--- 1319,1323 ----
gtk_widget_show (label37);
gtk_box_pack_start (GTK_BOX (hbox5), label37, TRUE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (label37), GTK_JUSTIFY_CENTER);
table3 = gtk_table_new (3, 2, FALSE);
***************
*** 1363,1366 ****
--- 1331,1335 ----
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
+ gtk_label_set_justify (GTK_LABEL (DeletePathLabel), GTK_JUSTIFY_CENTER);
gtk_misc_set_alignment (GTK_MISC (DeletePathLabel), 0, 0.5);
***************
*** 1370,1374 ****
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
- gtk_label_set_justify (GTK_LABEL (DeleteFsLabel), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (DeleteFsLabel), 0, 0.5);
--- 1339,1342 ----
***************
*** 1378,1382 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label33), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label33), 0, 0.5);
--- 1346,1349 ----
***************
*** 1386,1390 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label34), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label34), 0, 0.5);
--- 1353,1356 ----
***************
*** 1394,1398 ****
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
- gtk_label_set_justify (GTK_LABEL (DeleteSizeLabel), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (DeleteSizeLabel), 0, 0.5);
--- 1360,1363 ----
***************
*** 1402,1406 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label35), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label35), 0, 0.5);
--- 1367,1370 ----
***************
*** 1504,1507 ****
--- 1468,1472 ----
gtk_widget_show (label38);
gtk_box_pack_start (GTK_BOX (hbox6), label38, TRUE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (label38), GTK_JUSTIFY_CENTER);
table4 = gtk_table_new (4, 2, FALSE);
***************
*** 1515,1519 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label39), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label39), 0, 0.5);
--- 1480,1483 ----
***************
*** 1523,1527 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label40), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label40), 0, 0.5);
--- 1487,1490 ----
***************
*** 1531,1535 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label41), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label41), 0, 0.5);
--- 1494,1497 ----
***************
*** 1539,1543 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label42), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label42), 0, 0.5);
--- 1501,1504 ----
***************
*** 1547,1550 ****
--- 1508,1512 ----
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
+ gtk_label_set_justify (GTK_LABEL (ConvertPathLabel), GTK_JUSTIFY_CENTER);
gtk_misc_set_alignment (GTK_MISC (ConvertPathLabel), 0, 0.5);
***************
*** 1554,1557 ****
--- 1516,1520 ----
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
+ gtk_label_set_justify (GTK_LABEL (ConvertFsLabel), GTK_JUSTIFY_CENTER);
gtk_misc_set_alignment (GTK_MISC (ConvertFsLabel), 0, 0.5);
***************
*** 1561,1564 ****
--- 1524,1528 ----
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
+ gtk_label_set_justify (GTK_LABEL (ConvertSizeLabel), GTK_JUSTIFY_CENTER);
gtk_misc_set_alignment (GTK_MISC (ConvertSizeLabel), 0, 0.5);
***************
*** 1703,1706 ****
--- 1667,1671 ----
gtk_widget_show (label46);
gtk_box_pack_start (GTK_BOX (hbox7), label46, TRUE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (label46), GTK_JUSTIFY_CENTER);
table5 = gtk_table_new (4, 2, FALSE);
***************
*** 1714,1718 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label47), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label47), 0, 0.5);
--- 1679,1682 ----
***************
*** 1722,1726 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label49), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label49), 0, 0.5);
--- 1686,1689 ----
***************
*** 1730,1734 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label51), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label51), 0, 0.5);
--- 1693,1696 ----
***************
*** 1738,1742 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label53), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label53), 0, 0.5);
--- 1700,1703 ----
***************
*** 1746,1750 ****
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
- gtk_label_set_justify (GTK_LABEL (MovePathLabel), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (MovePathLabel), 0, 0.5);
--- 1707,1710 ----
***************
*** 1754,1758 ****
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
- gtk_label_set_justify (GTK_LABEL (MoveFsLabel), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (MoveFsLabel), 0, 0.5);
--- 1714,1717 ----
***************
*** 1762,1766 ****
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
- gtk_label_set_justify (GTK_LABEL (MoveSizeLabel), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (MoveSizeLabel), 0, 0.5);
--- 1721,1724 ----
***************
*** 1876,1879 ****
--- 1834,1838 ----
gtk_widget_show (label58);
gtk_box_pack_start (GTK_BOX (hbox10), label58, TRUE, TRUE, 0);
+ gtk_label_set_justify (GTK_LABEL (label58), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label58), TRUE);
***************
*** 1890,1894 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label59), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label59), 0, 0.5);
--- 1849,1852 ----
***************
*** 1898,1902 ****
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (GTK_EXPAND), 0, 0);
- gtk_label_set_justify (GTK_LABEL (TableDeviceLabel), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (TableDeviceLabel), 0, 0.5);
--- 1856,1859 ----
***************
*** 1906,1910 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label64), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label64), 0, 0.5);
--- 1863,1866 ----
***************
*** 2080,2084 ****
gtk_box_pack_start (GTK_BOX (vbox11), label75, FALSE, FALSE, 0);
gtk_label_set_use_markup (GTK_LABEL (label75), TRUE);
- gtk_label_set_justify (GTK_LABEL (label75), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (label75), TRUE);
gtk_misc_set_alignment (GTK_MISC (label75), 0, 0.5);
--- 2036,2039 ----
***************
*** 2091,2095 ****
gtk_widget_show (ErrorLabel);
gtk_box_pack_start (GTK_BOX (hbox12), ErrorLabel, FALSE, FALSE, 20);
- gtk_label_set_justify (GTK_LABEL (ErrorLabel), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (ErrorLabel), TRUE);
gtk_misc_set_alignment (GTK_MISC (ErrorLabel), 0, 0.5);
--- 2046,2049 ----
***************
*** 2098,2102 ****
gtk_widget_show (label77);
gtk_box_pack_start (GTK_BOX (vbox11), label77, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label77), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (label77), TRUE);
gtk_misc_set_alignment (GTK_MISC (label77), 0, 0.5);
--- 2052,2055 ----
***************
*** 2165,2169 ****
gtk_widget_show (ProgressLabel);
gtk_box_pack_start (GTK_BOX (vbox15), ProgressLabel, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (ProgressLabel), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (ProgressLabel), 0, 0.5);
--- 2118,2121 ----
Index: main.c
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** main.c 20 Oct 2003 17:22:29 -0000 1.5
--- main.c 11 Dec 2003 13:30:24 -0000 1.6
***************
*** 37,40 ****
--- 37,57 ----
}
+ int debug(const char *fmt, ...) {
+ int d;
+ va_list args;
+
+ va_start(args, fmt);
+ #ifdef PRINT_DEBUGGING_INFO
+ d = vfprintf(stdout,fmt,args);
+ va_end(args);
+
+ return d;
+ #endif
+
+ va_end(args);
+ return 0;
+ }
+
+
int
main (int argc, char *argv[])
Index: pm_libparted.h
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/src/pm_libparted.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pm_libparted.h 19 Oct 2003 00:18:57 -0000 1.7
--- pm_libparted.h 11 Dec 2003 13:30:24 -0000 1.8
***************
*** 5,10 ****
#include <gtk/gtk.h>
- //#define PRINT_DEBUGGING_INFO
-
#define MAX_PARTITIONS 128
#define MAX_FILESYSTEMS 128
--- 5,8 ----
|
|
From: <ale...@us...> - 2003-12-11 13:30:27
|
Update of /cvsroot/morphix/partitionmorpher/autom4te.cache
In directory sc8-pr-cvs1:/tmp/cvs-serv31280/autom4te.cache
Modified Files:
output.0 requests traces.0
Log Message:
simplified view
Index: output.0
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/autom4te.cache/output.0,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** output.0 12 Oct 2003 02:01:47 -0000 1.2
--- output.0 11 Dec 2003 13:30:24 -0000 1.3
***************
*** 1,8 ****
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
! @%:@ Generated by GNU Autoconf 2.57.
@%:@
! @%:@ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
! @%:@ Free Software Foundation, Inc.
@%:@ This configure script is free software; the Free Software Foundation
@%:@ gives unlimited permission to copy, distribute and modify it.
--- 1,7 ----
@%:@! /bin/sh
[...4003 lines suppressed...]
! echo X"$as_dir" |
! sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
! /^X\(\/\/\)[^/].*/{ s//\1/; q; }
! /^X\(\/\/\)$/{ s//\1/; q; }
! /^X\(\/\).*/{ s//\1/; q; }
! s/.*/./; q'`
! done
! test ! -n "$as_dirs" || mkdir $as_dirs
! fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
! echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
! { (exit 1); exit 1; }; }; }
!
! # echo "creating $dirpart/$file"
! echo '# dummy' > "$dirpart/$file"
! done
! done
! ;;
! default-1 ) case "$CONFIG_FILES" in *po/Makefile.in*)
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
esac ;;
Index: requests
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/autom4te.cache/requests,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** requests 7 Apr 2003 23:47:15 -0000 1.1.1.1
--- requests 11 Dec 2003 13:30:24 -0000 1.2
***************
*** 1,3 ****
! # This file was created by autom4te.
# It contains the lists of macros which have been traced.
# It can be safely removed.
--- 1,3 ----
! # This file was generated by Autom4te Wed Nov 19 23:55:15 PST 2003.
# It contains the lists of macros which have been traced.
# It can be safely removed.
***************
*** 17,40 ****
{
'm4_pattern_forbid' => 1,
! 'AC_TYPE_OFF_T' => 1,
'AC_C_VOLATILE' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1,
- 'AC_HEADER_TIME' => 1,
'AC_FUNC_WAIT3' => 1,
! 'AM_AUTOMAKE_VERSION' => 1,
! 'AC_STRUCT_TM' => 1,
'AC_FUNC_LSTAT' => 1,
! 'AC_TYPE_MODE_T' => 1,
'AC_FUNC_GETMNTENT' => 1,
'AC_FUNC_STRTOD' => 1,
'AC_CHECK_HEADERS' => 1,
'AC_FUNC_STRNLEN' => 1,
'AC_PROG_CXX' => 1,
'AC_PATH_X' => 1,
'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
'AC_PROG_AWK' => 1,
'AC_HEADER_STDC' => 1,
'AC_HEADER_MAJOR' => 1,
--- 17,43 ----
{
'm4_pattern_forbid' => 1,
! 'AC_CONFIG_LIBOBJ_DIR' => 1,
'AC_C_VOLATILE' => 1,
+ 'AC_TYPE_OFF_T' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1,
'AC_FUNC_WAIT3' => 1,
! 'AC_HEADER_TIME' => 1,
'AC_FUNC_LSTAT' => 1,
! 'AC_STRUCT_TM' => 1,
! 'AM_AUTOMAKE_VERSION' => 1,
'AC_FUNC_GETMNTENT' => 1,
+ 'AC_TYPE_MODE_T' => 1,
'AC_FUNC_STRTOD' => 1,
'AC_CHECK_HEADERS' => 1,
'AC_FUNC_STRNLEN' => 1,
+ 'm4_sinclude' => 1,
'AC_PROG_CXX' => 1,
'AC_PATH_X' => 1,
'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
'AC_PROG_AWK' => 1,
+ '_m4_warn' => 1,
'AC_HEADER_STDC' => 1,
'AC_HEADER_MAJOR' => 1,
***************
*** 46,59 ****
'AC_TYPE_SIGNAL' => 1,
'AC_TYPE_UID_T' => 1,
- 'AC_CONFIG_AUX_DIR' => 1,
'AC_PROG_MAKE_SET' => 1,
'm4_pattern_allow' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1,
- 'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_FORK' => 1,
! 'AC_FUNC_VPRINTF' => 1,
'AC_FUNC_STRCOLL' => 1,
'AC_PROG_YACC' => 1,
'AC_INIT' => 1,
--- 49,63 ----
'AC_TYPE_SIGNAL' => 1,
'AC_TYPE_UID_T' => 1,
'AC_PROG_MAKE_SET' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
'm4_pattern_allow' => 1,
+ 'sinclude' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1,
'AC_FUNC_FORK' => 1,
! 'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_STRCOLL' => 1,
+ 'AC_FUNC_VPRINTF' => 1,
'AC_PROG_YACC' => 1,
'AC_INIT' => 1,
***************
*** 71,74 ****
--- 75,79 ----
'AC_FUNC_REALLOC' => 1,
'AC_TYPE_SIZE_T' => 1,
+ 'AC_CONFIG_LINKS' => 1,
'AC_CHECK_TYPES' => 1,
'AC_CHECK_MEMBERS' => 1,
***************
*** 76,86 ****
'AC_FUNC_UTIME_NULL' => 1,
'AC_FUNC_SELECT_ARGTYPES' => 1,
- 'AC_FUNC_STRFTIME' => 1,
'AC_HEADER_STAT' => 1,
! 'AC_C_INLINE' => 1,
'AC_PROG_CPP' => 1,
! 'AC_TYPE_PID_T' => 1,
! 'AC_C_CONST' => 1,
'AC_PROG_LEX' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
--- 81,92 ----
'AC_FUNC_UTIME_NULL' => 1,
'AC_FUNC_SELECT_ARGTYPES' => 1,
'AC_HEADER_STAT' => 1,
! 'AC_FUNC_STRFTIME' => 1,
'AC_PROG_CPP' => 1,
! 'AC_C_INLINE' => 1,
! 'AM_ENABLE_MULTILIB' => 1,
'AC_PROG_LEX' => 1,
+ 'AC_C_CONST' => 1,
+ 'AC_TYPE_PID_T' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
***************
*** 96,111 ****
'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1,
- 'AM_CONDITIONAL' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
'AC_FUNC_MKTIME' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1,
- 'AC_FUNC_MEMCMP' => 1,
'AC_PROG_LN_S' => 1,
'm4_include' => 1,
'AC_HEADER_DIRENT' => 1,
'AC_CHECK_FUNCS' => 1
}
! ], 'Request' )
);
--- 102,117 ----
'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1,
'AC_FUNC_MKTIME' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AM_CONDITIONAL' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1,
'AC_PROG_LN_S' => 1,
+ 'AC_FUNC_MEMCMP' => 1,
'm4_include' => 1,
'AC_HEADER_DIRENT' => 1,
'AC_CHECK_FUNCS' => 1
}
! ], 'Autom4te::Request' )
);
Index: traces.0
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/autom4te.cache/traces.0,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** traces.0 7 Apr 2003 23:47:54 -0000 1.1.1.1
--- traces.0 11 Dec 2003 13:30:24 -0000 1.2
***************
*** 1,2 ****
--- 1,3 ----
+ m4trace:aclocal.m4:43: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
m4trace:configure.in:3: -1- AC_INIT([configure.in])
m4trace:configure.in:3: -1- m4_pattern_forbid([^_?A[CHUM]_])
***************
*** 53,68 ****
m4trace:configure.in:3: -1- AC_SUBST([LIBS])
m4trace:configure.in:4: -1- AM_INIT_AUTOMAKE([partitionmorpher], [0.1])
! m4trace:configure.in:4: -1- AM_AUTOMAKE_VERSION([1.4-p6])
m4trace:configure.in:4: -1- AC_PROG_INSTALL
m4trace:configure.in:4: -1- AC_SUBST([INSTALL_PROGRAM])
m4trace:configure.in:4: -1- AC_SUBST([INSTALL_SCRIPT])
m4trace:configure.in:4: -1- AC_SUBST([INSTALL_DATA])
! m4trace:configure.in:4: -1- AC_SUBST([PACKAGE])
! m4trace:configure.in:4: -1- AC_SUBST([VERSION])
! m4trace:configure.in:4: -2- AC_DEFINE_TRACE_LITERAL([PACKAGE])
! m4trace:configure.in:4: -2- AH_OUTPUT([PACKAGE], [/* Name of package */
#undef PACKAGE])
! m4trace:configure.in:4: -2- AC_DEFINE_TRACE_LITERAL([VERSION])
! m4trace:configure.in:4: -2- AH_OUTPUT([VERSION], [/* Version number of package */
#undef VERSION])
m4trace:configure.in:4: -1- AC_SUBST([ACLOCAL])
--- 54,70 ----
m4trace:configure.in:3: -1- AC_SUBST([LIBS])
m4trace:configure.in:4: -1- AM_INIT_AUTOMAKE([partitionmorpher], [0.1])
! m4trace:configure.in:4: -1- AM_AUTOMAKE_VERSION([1.7.9])
m4trace:configure.in:4: -1- AC_PROG_INSTALL
m4trace:configure.in:4: -1- AC_SUBST([INSTALL_PROGRAM])
m4trace:configure.in:4: -1- AC_SUBST([INSTALL_SCRIPT])
m4trace:configure.in:4: -1- AC_SUBST([INSTALL_DATA])
! m4trace:configure.in:4: -1- AC_SUBST([CYGPATH_W])
! m4trace:configure.in:4: -1- AC_SUBST([PACKAGE], [partitionmorpher])
! m4trace:configure.in:4: -1- AC_SUBST([VERSION], [0.1])
! m4trace:configure.in:4: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
! m4trace:configure.in:4: -1- AH_OUTPUT([PACKAGE], [/* Name of package */
#undef PACKAGE])
! m4trace:configure.in:4: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
! m4trace:configure.in:4: -1- AH_OUTPUT([VERSION], [/* Version number of package */
#undef VERSION])
m4trace:configure.in:4: -1- AC_SUBST([ACLOCAL])
***************
*** 71,76 ****
--- 73,89 ----
m4trace:configure.in:4: -1- AC_SUBST([AUTOHEADER])
m4trace:configure.in:4: -1- AC_SUBST([MAKEINFO])
+ m4trace:configure.in:4: -1- AC_SUBST([AMTAR])
+ m4trace:configure.in:4: -1- AC_SUBST([install_sh])
+ m4trace:configure.in:4: -1- AC_SUBST([STRIP])
+ m4trace:configure.in:4: -1- AC_SUBST([ac_ct_STRIP])
+ m4trace:configure.in:4: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
+ m4trace:configure.in:4: -1- AC_PROG_AWK
+ m4trace:configure.in:4: -1- AC_SUBST([AWK])
m4trace:configure.in:4: -1- AC_PROG_MAKE_SET
m4trace:configure.in:4: -1- AC_SUBST([SET_MAKE])
+ m4trace:configure.in:4: -1- AC_SUBST([am__leading_dot])
+ m4trace:configure.in:5: -1- _m4_warn([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete.
+ You should run autoupdate.], [aclocal.m4:860: AM_CONFIG_HEADER is expanded from...
+ configure.in:5: the top level])
m4trace:configure.in:5: -1- AC_CONFIG_HEADERS([config.h])
m4trace:configure.in:6: -1- AM_MAINTAINER_MODE
***************
*** 94,97 ****
--- 107,123 ----
m4trace:configure.in:8: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
m4trace:configure.in:8: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
+ m4trace:configure.in:8: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
+ m4trace:configure.in:8: -1- AC_SUBST([am__include])
+ m4trace:configure.in:8: -1- AC_SUBST([am__quote])
+ m4trace:configure.in:8: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+ m4trace:configure.in:8: -1- AC_SUBST([AMDEP_TRUE])
+ m4trace:configure.in:8: -1- AC_SUBST([AMDEP_FALSE])
+ m4trace:configure.in:8: -1- AC_SUBST([AMDEPBACKSLASH])
+ m4trace:configure.in:8: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
+ m4trace:configure.in:8: -1- AM_CONDITIONAL([am__fastdepCC], [
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
+ m4trace:configure.in:8: -1- AC_SUBST([am__fastdepCC_TRUE])
+ m4trace:configure.in:8: -1- AC_SUBST([am__fastdepCC_FALSE])
m4trace:configure.in:9: -1- AC_PROG_CC
m4trace:configure.in:9: -1- AC_SUBST([CC])
***************
*** 106,109 ****
--- 132,146 ----
m4trace:configure.in:9: -1- AC_SUBST([CC])
m4trace:configure.in:9: -1- AC_SUBST([ac_ct_CC])
+ m4trace:configure.in:9: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
+ m4trace:configure.in:9: -1- AM_CONDITIONAL([am__fastdepCC], [
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
+ m4trace:configure.in:9: -1- AC_SUBST([am__fastdepCC_TRUE])
+ m4trace:configure.in:9: -1- AC_SUBST([am__fastdepCC_FALSE])
+ m4trace:configure.in:10: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+ You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
+ autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
+ aclocal.m4:1032: AM_PROG_CC_STDC is expanded from...
+ configure.in:10: the top level])
m4trace:configure.in:11: -1- AC_HEADER_STDC
m4trace:configure.in:11: -1- AC_PROG_CPP
***************
*** 126,130 ****
#undef HAVE_LOCALE_H])
m4trace:configure.in:24: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
! inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default])
m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H])
--- 163,167 ----
#undef HAVE_LOCALE_H])
m4trace:configure.in:24: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
! inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default])
m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H])
***************
*** 145,152 ****
--- 182,206 ----
m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H])
+ m4trace:configure.in:24: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+ You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
+ autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
+ autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
+ aclocal.m4:1149: GLIB_LC_MESSAGES is expanded from...
+ aclocal.m4:1444: GLIB_GNU_GETTEXT is expanded from...
+ aclocal.m4:1473: AM_GLIB_GNU_GETTEXT is expanded from...
+ configure.in:24: the top level])
m4trace:configure.in:24: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LC_MESSAGES])
m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_LC_MESSAGES], [/* Define if your <locale.h> file defines LC_MESSAGES. */
#undef HAVE_LC_MESSAGES])
m4trace:configure.in:24: -1- AC_SUBST([USE_NLS])
+ m4trace:configure.in:24: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+ You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
+ autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
+ autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
+ autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
+ aclocal.m4:1361: GLIB_WITH_NLS is expanded from...
+ aclocal.m4:1444: GLIB_GNU_GETTEXT is expanded from...
+ aclocal.m4:1473: AM_GLIB_GNU_GETTEXT is expanded from...
+ configure.in:24: the top level])
m4trace:configure.in:24: -1- AC_CHECK_FUNCS([bind_textdomain_codeset])
m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */
***************
*** 169,175 ****
--- 223,249 ----
m4trace:configure.in:24: -1- AC_SUBST([GMSGFMT], [$ac_cv_path_GMSGFMT])
m4trace:configure.in:24: -1- AC_SUBST([XGETTEXT])
+ m4trace:configure.in:24: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+ You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
+ autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
+ aclocal.m4:1361: GLIB_WITH_NLS is expanded from...
+ aclocal.m4:1444: GLIB_GNU_GETTEXT is expanded from...
+ aclocal.m4:1473: AM_GLIB_GNU_GETTEXT is expanded from...
+ configure.in:24: the top level])
m4trace:configure.in:24: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_NLS])
m4trace:configure.in:24: -1- AH_OUTPUT([ENABLE_NLS], [/* always defined to indicate that i18n is enabled */
#undef ENABLE_NLS])
+ m4trace:configure.in:24: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete.
+ You should run autoupdate.], [autoconf/status.m4:318: AC_OUTPUT_COMMANDS is expanded from...
+ aclocal.m4:1361: GLIB_WITH_NLS is expanded from...
+ aclocal.m4:1444: GLIB_GNU_GETTEXT is expanded from...
+ aclocal.m4:1473: AM_GLIB_GNU_GETTEXT is expanded from...
+ configure.in:24: the top level])
+ m4trace:configure.in:24: -3- _m4_warn([obsolete], [The macro `_AC_OUTPUT_COMMANDS_CNT' is obsolete.
+ You should run autoupdate.], [autoconf/status.m4:321: _AC_OUTPUT_COMMANDS_CNT is expanded from...
+ autoconf/status.m4:318: AC_OUTPUT_COMMANDS is expanded from...
+ aclocal.m4:1361: GLIB_WITH_NLS is expanded from...
+ aclocal.m4:1444: GLIB_GNU_GETTEXT is expanded from...
+ aclocal.m4:1473: AM_GLIB_GNU_GETTEXT is expanded from...
+ configure.in:24: the top level])
m4trace:configure.in:24: -1- AC_SUBST([CATALOGS])
m4trace:configure.in:24: -1- AC_SUBST([CATOBJEXT])
***************
*** 188,191 ****
--- 262,267 ----
po/Makefile.in
])
+ m4trace:configure.in:30: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+ You should run autoupdate.], [])
m4trace:configure.in:30: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
m4trace:configure.in:30: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
|
|
From: <ale...@us...> - 2003-12-11 13:30:27
|
Update of /cvsroot/morphix/partitionmorpher
In directory sc8-pr-cvs1:/tmp/cvs-serv31280
Modified Files:
partitionmorpher.glade translation
Log Message:
simplified view
Index: partitionmorpher.glade
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/partitionmorpher.glade,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** partitionmorpher.glade 19 Oct 2003 00:18:57 -0000 1.7
--- partitionmorpher.glade 11 Dec 2003 13:30:23 -0000 1.8
***************
*** 550,554 ****
<property name="tooltip" translatable="yes">Select the filesystem type. None is default. For an ordinary filesystem, you should choose one of the next 4 options. If you want a swap partition, select the 6th option</property>
<property name="can_focus">True</property>
! <property name="history">0</property>
<child>
--- 550,554 ----
<property name="tooltip" translatable="yes">Select the filesystem type. None is default. For an ordinary filesystem, you should choose one of the next 4 options. If you want a swap partition, select the 6th option</property>
<property name="can_focus">True</property>
! <property name="history">2</property>
<child>
***************
*** 710,714 ****
<child>
<widget class="GtkLabel" id="label8">
- <property name="visible">True</property>
<property name="label" translatable="yes">Partition Position:</property>
<property name="use_underline">False</property>
--- 710,713 ----
***************
*** 734,738 ****
<child>
<widget class="GtkOptionMenu" id="optionmenu3">
- <property name="visible">True</property>
<property name="tooltip" translatable="yes">When the partition doesn't fill up all the free space, you can choose to have it located at the beginning or the end of the free space</property>
<property name="can_focus">True</property>
--- 733,736 ----
***************
*** 797,820 ****
<child>
- <widget class="GtkHScale" id="CreateSizeHScale">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="draw_value">True</property>
- <property name="value_pos">GTK_POS_LEFT</property>
- <property name="digits">1</property>
- <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
- <property name="inverted">False</property>
- <property name="adjustment">0 0 0 0 0 0</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">12</property>
- <property name="bottom_attach">13</property>
- <property name="x_options">fill</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkLabel" id="label11">
<property name="visible">True</property>
--- 795,798 ----
***************
*** 1242,1245 ****
--- 1220,1244 ----
</packing>
</child>
+
+ <child>
+ <widget class="GtkEntry" id="CreateSizeEntry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">12</property>
+ <property name="bottom_attach">13</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
<packing>
***************
*** 1604,1626 ****
<child>
- <widget class="GtkHScale" id="hscale2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="draw_value">True</property>
- <property name="value_pos">GTK_POS_LEFT</property>
- <property name="digits">1</property>
- <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
- <property name="inverted">False</property>
- <property name="adjustment">0 0 0 0 0 0</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkLabel" id="label57">
<property name="visible">True</property>
--- 1603,1606 ----
***************
*** 1666,1669 ****
--- 1646,1670 ----
<property name="bottom_attach">4</property>
<property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="entry2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="y_options"></property>
</packing>
Index: translation
===================================================================
RCS file: /cvsroot/morphix/partitionmorpher/translation,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** translation 19 Oct 2003 00:18:57 -0000 1.6
--- translation 11 Dec 2003 13:30:24 -0000 1.7
***************
*** 72,75 ****
--- 72,76 ----
gchar *s = N_("You can have any number of Logical partions inside an Extended partition.");
gchar *s = N_("Logical");
+ gchar *s = N_("*");
gchar *s = N_("Resize Partition");
gchar *s = N_("Cancel the resizing operation");
***************
*** 83,86 ****
--- 84,88 ----
gchar *s = N_("Current Size:");
gchar *s = N_("Min Size:");
+ gchar *s = N_("*");
gchar *s = N_("Apply Changes?");
gchar *s = N_("Are you SURE you wish to apply all changes?\n"
|
|
From: <ale...@us...> - 2003-12-09 22:42:17
|
Update of /cvsroot/morphix/mcp2/src
In directory sc8-pr-cvs1:/tmp/cvs-serv6663/src
Modified Files:
Makefile.am callbacks.c data.h main.c
Log Message:
actually looks pretty now... and even better, it works, sortof :)
Index: Makefile.am
===================================================================
RCS file: /cvsroot/morphix/mcp2/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am 1 Dec 2003 21:19:44 -0000 1.2
--- Makefile.am 9 Dec 2003 22:42:14 -0000 1.3
***************
*** 6,9 ****
--- 6,11 ----
@PACKAGE_CFLAGS@ -I/usr/include/libxml2
+ bin_SCRIPTS = morphix-control-panel
+
bin_PROGRAMS = mcp
Index: callbacks.c
===================================================================
RCS file: /cvsroot/morphix/mcp2/src/callbacks.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** callbacks.c 1 Dec 2003 21:19:44 -0000 1.2
--- callbacks.c 9 Dec 2003 22:42:14 -0000 1.3
***************
*** 13,21 ****
#include "data.h"
! #define MINIMUM_WIDTH 400
#define MAX_ICON_WIDTH 48
#define MAX_ICON_HEIGHT 48
extern gchar *config_file;
GdkPixbuf *image;
--- 13,22 ----
#include "data.h"
! #define MINIMUM_WIDTH 500
#define MAX_ICON_WIDTH 48
#define MAX_ICON_HEIGHT 48
extern gchar *config_file;
+ extern gint item_count;
GdkPixbuf *image;
***************
*** 25,29 ****
extern GtkWidget *MainWindow;
extern gchar *window_name;
- GtkWidget *da;
/* GDK_WINDOW coord helpers */
--- 26,29 ----
***************
*** 75,79 ****
this could use a diagram to clear it up :)
*/
! void RedrawIconviewer(GdkPixmap *pixmap, GtkWidget *da) {
int nr_x = 0;
--- 75,79 ----
this could use a diagram to clear it up :)
*/
! void RedrawIconviewer(GtkWidget *da) {
int nr_x = 0;
***************
*** 87,90 ****
--- 87,91 ----
GdkColor colorfg, colorbg;
+ GdkPixmap *pixmap;
colorfg.red = 0;
***************
*** 99,103 ****
context = gtk_widget_get_pango_context(da);
fontd = pango_font_description_from_string("sans 10");
! gdk_window_get_geometry(da->window,NULL,NULL,&width,&height,NULL);
gtk_widget_modify_fg(da,GTK_STATE_NORMAL,&colorfg);
--- 100,111 ----
context = gtk_widget_get_pango_context(da);
fontd = pango_font_description_from_string("sans 10");
! if (minimum_width < 0) {
! gdk_window_get_geometry(da->window,NULL,NULL,&width,&height,NULL);
! }
! else {
! width = minimum_width;
! height = minimum_height;
! }
! pixmap = gdk_pixmap_new(da->window,width,height,-1);
gtk_widget_modify_fg(da,GTK_STATE_NORMAL,&colorfg);
***************
*** 105,109 ****
gdk_draw_rectangle(pixmap,da->style->bg_gc[GTK_WIDGET_STATE(da)],TRUE,0,0,width,height);
!
for (i = 0; i < item_count; i++) {
--- 113,117 ----
gdk_draw_rectangle(pixmap,da->style->bg_gc[GTK_WIDGET_STATE(da)],TRUE,0,0,width,height);
! printf("Redrawing\n");
for (i = 0; i < item_count; i++) {
***************
*** 120,142 ****
if (items[i]->selected == TRUE) {
GdkColor color;
! color.red = 0;
! color.blue = 32768;
! color.green = 0;
gtk_widget_modify_fg(da,GTK_STATE_NORMAL,&color);
! items[i]->selected = FALSE;
}
else {
gtk_widget_modify_fg(da,GTK_STATE_NORMAL,&colorfg);
}
!
! gdk_draw_rectangle(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],FALSE,x_coord,y_coord,box_width,box_height);
!
!
gdk_draw_pixbuf(pixmap,NULL,items[i]->pixbuf,0,0,x_coord + (box_width - icon_width) / 2,y_coord + icon_from_top,-1,-1,GDK_RGB_DITHER_NORMAL,0,0);
layout = pango_layout_new(context);
- pango_layout_set_text(layout,items[i]->name,-1);
pango_layout_set_font_description(layout,fontd);
! pango_layout_set_width(layout,x_coord + box_width - 5);
pango_layout_set_alignment(layout,PANGO_ALIGN_CENTER);
gdk_draw_layout(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],x_coord+box_width / 2,y_coord+58,layout);
--- 128,175 ----
if (items[i]->selected == TRUE) {
GdkColor color;
! color.red = 32768;
! color.blue = 65535;
! color.green = 32768;
! int circle_width = 30;
gtk_widget_modify_fg(da,GTK_STATE_NORMAL,&color);
! /* top left */
! gdk_draw_arc(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord + box_width - circle_width,y_coord,circle_width,circle_width,64 * 0,64 * 90);
! /* bottom left */
! gdk_draw_arc(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord,y_coord + box_height - circle_width,circle_width,circle_width,64 * 180,64 * 90);
! /* bottom right */
! gdk_draw_arc(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord + box_width - circle_width,y_coord + box_height - circle_width,circle_width,circle_width,64 * 270,64 * 90);
! /* top right */
! gdk_draw_arc(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord,y_coord,circle_width,circle_width,64 * 90,64 * 90);
! /* center */
! gdk_draw_rectangle(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord + circle_width / 2,y_coord + circle_width / 2,box_width - circle_width,box_height - circle_width);
! /* top */
! gdk_draw_rectangle(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord + circle_width / 2,y_coord,box_width - circle_width,circle_width / 2);
! /* left */
! gdk_draw_rectangle(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord,y_coord + circle_width / 2,circle_width / 2,box_height - circle_width);
! /* right */
! gdk_draw_rectangle(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord + box_width - circle_width / 2,y_coord + circle_width / 2,circle_width / 2,box_height - circle_width);
! /* bottom */
! gdk_draw_rectangle(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],TRUE,x_coord + circle_width / 2,y_coord + box_height - circle_width / 2,box_width - circle_width, circle_width / 2);
}
else {
gtk_widget_modify_fg(da,GTK_STATE_NORMAL,&colorfg);
}
!
gdk_draw_pixbuf(pixmap,NULL,items[i]->pixbuf,0,0,x_coord + (box_width - icon_width) / 2,y_coord + icon_from_top,-1,-1,GDK_RGB_DITHER_NORMAL,0,0);
+
+ if (items[i]->selected == TRUE) {
+ GdkColor color;
+ color.red = 65535;
+ color.blue = 65535;
+ color.green = 65535;
+ gtk_widget_modify_fg(da,GTK_STATE_NORMAL,&color);
+ items[i]->selected = FALSE;
+ }
+
layout = pango_layout_new(context);
pango_layout_set_font_description(layout,fontd);
! pango_layout_set_width(layout,box_width);
pango_layout_set_alignment(layout,PANGO_ALIGN_CENTER);
+ pango_layout_set_text(layout,items[i]->name,-1);
gdk_draw_layout(pixmap,da->style->fg_gc[GTK_WIDGET_STATE (da)],x_coord+box_width / 2,y_coord+58,layout);
***************
*** 145,149 ****
/* Looks scary, but it seems to work... */
}
! image = gdk_pixbuf_get_from_drawable(NULL,pixmap,NULL,0,0,0,0,width,height);
}
--- 178,184 ----
/* Looks scary, but it seems to work... */
}
! printf("width: %d height: %d\n",width,height);
! image = gdk_pixbuf_get_from_drawable(NULL, pixmap, NULL, 0,0,0,0,width,height);
! gdk_draw_drawable(da->window,gdk_gc_new(pixmap),pixmap,0,0,0,0,width,height);
}
***************
*** 180,184 ****
}
minimum_width = MINIMUM_WIDTH;
! minimum_height = y_coord + box_height;
}
--- 215,219 ----
}
minimum_width = MINIMUM_WIDTH;
! minimum_height = y_coord + box_height + top_border * 3;
}
***************
*** 189,196 ****
GtkWidget *drawingarea = lookup_widget(MainWindow,"MainDrawingArea");
gint i;
!
gtk_window_set_resizable(GTK_WINDOW(MainWindow),FALSE);
-
- item_count = 0;
gtk_window_set_title(GTK_WINDOW(MainWindow),window_name);
set_minimum_size();
--- 224,229 ----
GtkWidget *drawingarea = lookup_widget(MainWindow,"MainDrawingArea");
gint i;
! image = NULL;
gtk_window_set_resizable(GTK_WINDOW(MainWindow),FALSE);
gtk_window_set_title(GTK_WINDOW(MainWindow),window_name);
set_minimum_size();
***************
*** 198,202 ****
printf("Size request: %d %d\n",minimum_width, minimum_height);
gtk_widget_set_size_request (drawingarea,minimum_width, minimum_height);
! gtk_widget_set_size_request (MainWindow,minimum_width, minimum_height+20);
gtk_window_set_default_size (GTK_WINDOW(MainWindow), minimum_width, minimum_height);
}
--- 231,235 ----
printf("Size request: %d %d\n",minimum_width, minimum_height);
gtk_widget_set_size_request (drawingarea,minimum_width, minimum_height);
! gtk_widget_set_size_request (MainWindow,minimum_width, minimum_height);
gtk_window_set_default_size (GTK_WINDOW(MainWindow), minimum_width, minimum_height);
}
***************
*** 218,240 ****
else {
if (gdk_pixbuf_get_width(pix) > MAX_ICON_WIDTH || gdk_pixbuf_get_height(pix) > MAX_ICON_HEIGHT) {
! fprintf(stderr,"Icon too large: %s\n",items[i]->iconpath);
! free(items[i]->iconpath);
! pix = assign_fallback(items[i]->iconpath);
}
}
items[i]->pixbuf = pix;
}
! da = drawingarea;
! gtk_widget_realize(da);
gint width, height;
! gtk_widget_add_events(da,GDK_BUTTON_PRESS_MASK);
! gdk_window_get_geometry(da->window,NULL,NULL,&width,&height,NULL);
! GdkPixmap *pixmap = gdk_pixmap_new(da->window,width,height,-1);
! RedrawIconviewer(pixmap,da);
! g_object_unref(pixmap);
}
--- 251,271 ----
else {
if (gdk_pixbuf_get_width(pix) > MAX_ICON_WIDTH || gdk_pixbuf_get_height(pix) > MAX_ICON_HEIGHT) {
! pix = gdk_pixbuf_scale_simple(pix,MAX_ICON_WIDTH,MAX_ICON_HEIGHT,GDK_INTERP_BILINEAR);
! //fprintf(stderr,"Icon too large: %s\n",items[i]->iconpath);
! //free(items[i]->iconpath);
! //pix = assign_fallback(items[i]->iconpath);
}
}
items[i]->pixbuf = pix;
}
! gtk_widget_realize(drawingarea);
gint width, height;
! gtk_widget_add_events(drawingarea,GDK_BUTTON_PRESS_MASK);
! gdk_window_get_geometry(drawingarea->window,NULL,NULL,&width,&height,NULL);
! RedrawIconviewer(drawingarea);
}
***************
*** 248,253 ****
gint width, height;
gdk_window_get_geometry(drawingarea->window,NULL,NULL,&width,&height,NULL);
- GdkPixmap *pixmap = gdk_pixmap_new(drawingarea->window,width,height,-1);
-
gint i;
--- 279,282 ----
***************
*** 284,287 ****
--- 313,317 ----
}
else {
+ change_current_statusbar("");
items[i]->selected = TRUE;
}
***************
*** 290,296 ****
nr_x++;
}
! pixmap = gdk_pixmap_new(da->window,width,height,-1);
! RedrawIconviewer(pixmap,da);
! g_object_unref(pixmap);
}
--- 320,324 ----
nr_x++;
}
! RedrawIconviewer(drawingarea);
}
***************
*** 387,390 ****
--- 415,430 ----
guchar *pixels;
int rowstride;
+ int width = 0, height = 0;
+ if (image == NULL)
+ return FALSE;
+
+ if (minimum_width < 0) {
+ gdk_window_get_geometry(widget->window,NULL,NULL,&width,&height,NULL);
+ }
+ else {
+ width = minimum_width;
+ height = minimum_height;
+ }
+
rowstride = gdk_pixbuf_get_rowstride(image);
pixels = gdk_pixbuf_get_pixels (image) + rowstride * event->area.y +
***************
*** 394,402 ****
event->area.x, event->area.y,
event->area.width, event->area.height,
! GDK_RGB_DITHER_NORMAL,
! pixels, rowstride,
! event->area.x, event->area.y);
!
! return TRUE;
}
!
--- 434,439 ----
event->area.x, event->area.y,
event->area.width, event->area.height,
! GDK_RGB_DITHER_NORMAL,pixels,rowstride,0,0);
! return TRUE;
}
!
Index: data.h
===================================================================
RCS file: /cvsroot/morphix/mcp2/src/data.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** data.h 1 Dec 2003 21:19:44 -0000 1.1
--- data.h 9 Dec 2003 22:42:14 -0000 1.2
***************
*** 15,19 ****
item_struct *items[MAX_ITEMS];
gint item_count;
-
void parseDoc(char *docname);
--- 15,18 ----
Index: main.c
===================================================================
RCS file: /cvsroot/morphix/mcp2/src/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.c 1 Dec 2003 21:19:44 -0000 1.2
--- main.c 9 Dec 2003 22:42:14 -0000 1.3
***************
*** 8,16 ****
#include "interface.h"
#include "support.h"
- #include "data.h"
GtkWidget *MainWindow;
gchar *window_name = NULL;
gchar *config_file;
int
--- 8,16 ----
#include "interface.h"
#include "support.h"
GtkWidget *MainWindow;
gchar *window_name = NULL;
gchar *config_file;
+ extern gint item_count;
int
***************
*** 30,33 ****
--- 30,38 ----
config_file = g_strdup(argv[1]);
parseDoc(config_file);
+ printf("Item count: %d\n",item_count);
+ if (item_count <= 0) {
+ fprintf(stderr,"Config file doesn't have any valid items\n");
+ exit(1);
+ }
gtk_init (&argc, &argv);
***************
*** 35,43 ****
! MainWindow = create_MainWindow ();
! gtk_widget_show (MainWindow);
! gtk_main ();
! return 0;
}
--- 40,48 ----
! MainWindow = create_MainWindow ();
! gtk_widget_show (MainWindow);
! gtk_main ();
! return 0;
}
|
|
From: <ale...@us...> - 2003-12-09 22:42:16
|
Update of /cvsroot/morphix/mcp2/pixmaps In directory sc8-pr-cvs1:/tmp/cvs-serv6663/pixmaps Added Files: BabyTuxTerm.png Keyboard.png Log Message: actually looks pretty now... and even better, it works, sortof :) --- NEW FILE: BabyTuxTerm.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Keyboard.png --- (This appears to be a binary file; contents omitted.) |
|
From: <ale...@us...> - 2003-12-09 22:42:16
|
Update of /cvsroot/morphix/mcp2/data In directory sc8-pr-cvs1:/tmp/cvs-serv6663/data Added Files: help.xml mcp-main.xml Log Message: actually looks pretty now... and even better, it works, sortof :) --- NEW FILE: help.xml --- <?xml version="1.0"?> <mcp> <global> <name>Help</name> </global> <item> <command>mozilla www.morphix.org</command> <name>Morphix website</name> <tip>Check out the FAQ and fora for answers</tip> <icon>../morphix.png</icon> </item> </mcp> --- NEW FILE: mcp-main.xml --- <?xml version="1.0"?> <mcp> <global> </global> <item> <command>xconfig</command> <name>Xwindow settings</name> <tip>Helps you set your X settings</tip> <icon>/usr/local/share/mcp/pixmaps/Monitor.png</icon> </item> <item> <command>networkconf</command> <name>Network</name> <tip>Helps you set your network settings</tip> <icon>/usr/local/share/mcp/pixmaps/Networking.png</icon> </item> <item> <command>soundconf</command> <name>Sound</name> <tip>Helps you set your sound settings</tip> <icon>/usr/local/share/mcp/pixmaps/Speaker.png</icon> </item> <item> <command>keybconf</command> <name>Keyboard</name> <tip>Helps you set your keyboard settings</tip> <icon>/usr/local/share/mcp/pixmaps/Keyboard.png</icon> </item> <item> <command>morphixinstaller</command> <name>Harddisk Install</name> <tip>Copy Morphix to the harddisk for usage without CD</tip> <icon>/usr/local/share/mcp/pixmaps/Harddisk.png</icon> </item> <item> <command>sudo xterm</command> <name>Root Xterminal</name> <tip>Open a root terminal</tip> <icon>/usr/local/share/mcp/pixmaps/BabyTuxTerm.png</icon> </item> <item> <command>localeconf</command> <name>Locale</name> <tip>For setting the locale</tip> <icon>/usr/local/share/mcp/pixmaps/Localeconf.png</icon> </item> <item> <command>datetimeconf</command> <name>Date&Time</name> <tip>Set the Date, Time and/or timezone</tip> <icon>/usr/local/share/mcp/pixmaps/Datetime.png</icon> </item> </mcp> |
|
From: <ale...@us...> - 2003-12-09 22:42:16
|
Update of /cvsroot/morphix/mcp2 In directory sc8-pr-cvs1:/tmp/cvs-serv6663 Modified Files: Makefile.am Removed Files: mcp.conf Log Message: actually looks pretty now... and even better, it works, sortof :) Index: Makefile.am =================================================================== RCS file: /cvsroot/morphix/mcp2/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.am 10 Nov 2003 02:03:59 -0000 1.1.1.1 --- Makefile.am 9 Dec 2003 22:42:13 -0000 1.2 *************** *** 18,21 **** --- 18,29 ---- done \ fi + if test -d $(srcdir)/data; then \ + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data; \ + for data in $(srcdir)/data/*; do \ + if test -f $$data; then \ + $(INSTALL_DATA) $$data $(DESTDIR)$(pkgdatadir)/data; \ + fi \ + done \ + fi dist-hook: *************** *** 25,28 **** --- 33,44 ---- if test -f $$pixmap; then \ cp -p $$pixmap $(distdir)/pixmaps; \ + fi \ + done \ + fi + if test -d data; then \ + mkdir $(distdir)/data; \ + for data in data/*; do \ + if test -f $$data; then \ + cp -p $$data $(distdir)/data; \ fi \ done \ --- mcp.conf DELETED --- |
|
From: <ale...@us...> - 2003-12-09 22:37:38
|
Update of /cvsroot/morphix/mcp2/pixmaps In directory sc8-pr-cvs1:/tmp/cvs-serv5936 Modified Files: Datetime.png Localeconf.png Log Message: lala Index: Datetime.png =================================================================== RCS file: /cvsroot/morphix/mcp2/pixmaps/Datetime.png,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsZBt2UQ and /tmp/cvskKMTAx differ Index: Localeconf.png =================================================================== RCS file: /cvsroot/morphix/mcp2/pixmaps/Localeconf.png,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvswVe2gY and /tmp/cvsKMo6lM differ |
|
From: <ale...@us...> - 2003-12-09 22:30:45
|
Update of /cvsroot/morphix/mcp2/pixmaps In directory sc8-pr-cvs1:/tmp/cvs-serv4468 Removed Files: Font-Capplet.png GNOME-Terminal-BabyTux.png Keyboard2.png Keymap1.png Log Message: removing old icons --- Font-Capplet.png DELETED --- --- GNOME-Terminal-BabyTux.png DELETED --- --- Keyboard2.png DELETED --- --- Keymap1.png DELETED --- |
|
From: <ale...@us...> - 2003-12-09 22:29:09
|
Update of /cvsroot/morphix/mcp2/data In directory sc8-pr-cvs1:/tmp/cvs-serv4168/data Log Message: Directory /cvsroot/morphix/mcp2/data added to the repository |
|
From: <ale...@us...> - 2003-12-09 21:50:58
|
Update of /cvsroot/morphix/mcp2/pixmaps In directory sc8-pr-cvs1:/tmp/cvs-serv27894 Added Files: Datetime.png Localeconf.png Log Message: datetime + localeconf pixmaps --- NEW FILE: Datetime.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Localeconf.png --- (This appears to be a binary file; contents omitted.) |
|
From: <ale...@us...> - 2003-12-07 23:17:26
|
Update of /cvsroot/morphix/morph-scripts/minilist In directory sc8-pr-cvs1:/tmp/cvs-serv12826/minilist Added Files: consolelist devellist openofficelist printlist pxebootlist rescuelist scientificlist securitylist vulist wifilist winelist Log Message: adding minimodule-generator scripts, first attempt at a baselist --- NEW FILE: consolelist --- screen ee emacs21 vim gnupg w3mmee mutt sc centericq ncftp cplay vfu ytree mc links curl abook gpm libgpmg1 axel biew bwm cdrecord cdcd cdw cw cpio cwcp diff dosfstools fdclone fdutils ftp hexcurse joe mbr pork radio recover rexima rsync sc sel shx sl slpim symlinks textdraw tinyirc twin zip unzip vche vfu vrms whowatch worklog zivot --- NEW FILE: devellist --- gdb gcc cpp g++ g++-3.2 libstdc++5 libstdc++5-dev libc6-dev gcc-3.2 gcc-3.2-base binutils libgcc1 cpp-3.2 make manpages-dev m4 autoconf automake1.7 autotools-dev libtool flex bison gcc-3.2-doc --- NEW FILE: openofficelist --- openoffice.org openoffice.org-bin openoffice.org-debian-files openoffice.org-help-en openoffice.org-l10n-en oooqs-kde ooqstart-gnome --- NEW FILE: printlist --- cupsys cupsys-bsd cupsys-client gs-esp libcupsimage2 libslp1 --- NEW FILE: pxebootlist --- nfs-kernel-server tftpd dosfstools --- NEW FILE: rescuelist --- parted libparted1.6-0 ext2resize gpart recover ddrescue defrag mondo symlinks afio buffer mindi bzip2 mkisofs syslinux tar gzip rsync partimage ms-sys memtester logtool ccrypt acl --- NEW FILE: scientificlist --- r-base-core r-base r-base-html r-base-latex r-cran-tseries r-cran-rquantlib r-cran-tkrplot octave octave-forge octave-sp octave2.1 octave-epstk octave-ci matwrap libinline-octave-perl kmatplot maxima maxima-emacs maxima-doc xmaxima maxima-share maxima-test pari-gp pari-extra libpari1 pari-doc ginac-tools ginaccint libginac1.1 yacas yacas-doc yacas-proteus gsl-bin libgsl0 gsl-ref-html libquantlib0 quantlib-python quantlib-examples quantlib-refman dvi2ps dx dx-doc dxsamples mayavi grass texmacs latex2html lyx lyx-common lyx-qt lyx-xforms tth apcalc aribas autoclass euler evolver freefem gambit geg geomview glpk gnuplot gperiodic gri gmt gretl lp-solve mcl multimix rasmol plotutils pgapack pspp pdl rcalc yorick xlispstat --- NEW FILE: securitylist --- ethereal-common ethereal scapy tethereal libnessus2 libnasl2 nessus nessusd nessus-plugins fwbuilder fwbuilder-ipt fwbuilder-iptables fwbuilder-ipf fwbuilder-pf libfwbuilder5 nmap iptraf xprobe lft amap honeyd hping2 idswakeup isic redir hunt kismet --- NEW FILE: vulist --- lyx lyx-common lyx-xforms --- NEW FILE: wifilist --- kismet airsnort gpsdrive --- NEW FILE: winelist --- wine winesetuptk wine-doc libwine-alsa libwine-print libwine-twain wine-utils libwine |
|
From: <ale...@us...> - 2003-12-07 23:17:24
|
Update of /cvsroot/morphix/morph-scripts In directory sc8-pr-cvs1:/tmp/cvs-serv12826 Modified Files: debwrap Added Files: baselist Log Message: adding minimodule-generator scripts, first attempt at a baselist --- NEW FILE: baselist --- # For this recipe you need to have the following in your sources.list: # a flavour of your choice (woody/sarge/sid) # deb http://developer.linuxtag.net/knoppix ./ # hwdata-knoppix hwsetup kudzu-knoppix kdbconfig REMOVE exim4 REMOVE exim4-base REMOVE at REMOVE mailx REMOVE logrotate REMOVE cron REMOVE ipchains REMOVE iptables REMOVE cpio REMOVE groff-base REMOVE klogd REMOVE sysklogd REMOVE lilo REMOVE syslinux REMOVE vim REMOVE libident REMOVE gcc-3.2-base REMOVE tasksel REMOVE ppp REMOVE pppoeconf REMOVE pppoe REMOVE pppconfig REMOVE fdutils REMOVE apt-utils REMOVE netkit-inetd REMOVE netbase REMOVE info REMOVE manpages REMOVE ed REMOVE nvi REMOVE libgnutls7 REMOVE liblockfile1 REMOVE whiptail REMOVE gettext-base REMOVE tcpd REMOVE libwrap0 REMOVE ncurses-base REMOVE ncurses-bin REMOVE libwrap0 REMOVE libgdbm3 REMOVE slang1 REMOVE libgpmg1 REMOVE liblzo1 REMOVE libpcap0.7 REMOVE libopencdk8 REMOVE libpcre3 REMOVE libtasn1-0 REMOVE libtextwrap1 REMOVE libdb2 REMOVE diff # can't apt-get anything without apt, PONR! REMOVE apt EXEC mknod dev/cloop b 240 0 EXEC mknod dev/cloop1 b 240 1 EXEC mknod dev/nvidia0 c 195 0 EXEC mknod dev/nvidia1 c 195 1 EXEC mknod dev/nvidia2 c 195 2 EXEC mknod dev/nvidia3 c 195 3 EXEC mknod dev/nvidia4 c 195 4 EXEC mknod dev/nvidia5 c 195 5 EXEC mknod dev/nvidia6 c 195 6 EXEC mknod dev/nvidia7 c 195 7 EXEC mknod dev/nvidiactl c 195 255 EXEC rm -r usr/share/doc EXEC rm -r usr/share/locale EXEC rm -r usr/share/zoneinfo EXEC rm -r usr/share/unidata EXEC rm -r usr/share/man EXEC rm -r var/lib/apt EXEC rm var/lib/dpkg/available-old EXEC rm var/lib/dpkg/status-old EXEC rm -r var/cache/* Index: debwrap =================================================================== RCS file: /cvsroot/morphix/morph-scripts/debwrap,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** debwrap 6 Dec 2003 15:49:55 -0000 1.1 --- debwrap 7 Dec 2003 23:17:22 -0000 1.2 *************** *** 30,33 **** --- 30,39 ---- } + if [ "$UID" -ne 0 ] + then + echo "Sorry, you need to be root to run debootstrap, and chroot!" + exit + fi + if [ $# -eq 0 ] || [[ *************** *** 133,140 **** while read line do ! if [ $line == *REMOVE ] then ! {$line/REMOVE/} ! apt-get purge $line else apt-get --yes install $line --- 139,154 ---- while read line do ! if [[ $line == \#* ]] then ! echo ! elif [[ $line == EXEC* ]] ! then ! line=${line:4} ! `$line` ! elif [[ $line == REMOVE* ]] ! then ! line=${line:6} ! apt-get --yes remove $line ! dpkg --force-all --purge $line else apt-get --yes install $line |
|
From: <ale...@us...> - 2003-12-07 23:16:37
|
Update of /cvsroot/morphix/morph-scripts/minilist In directory sc8-pr-cvs1:/tmp/cvs-serv12759/minilist Log Message: Directory /cvsroot/morphix/morph-scripts/minilist added to the repository |
|
From: <ale...@us...> - 2003-12-06 22:30:54
|
Update of /cvsroot/morphix/scripts-base/etc/init.d
In directory sc8-pr-cvs1:/tmp/cvs-serv23532/init.d
Modified Files:
alsa-autoconfig knoppix-autoconfig morphix-start
Log Message:
possible 0.4-1b files
Index: alsa-autoconfig
===================================================================
RCS file: /cvsroot/morphix/scripts-base/etc/init.d/alsa-autoconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** alsa-autoconfig 21 Apr 2003 14:13:37 -0000 1.3
--- alsa-autoconfig 6 Dec 2003 22:30:49 -0000 1.4
***************
*** 12,16 ****
then
cat << EOF > /etc/modutils/1alsa
! path[alsa]=$ALSAPATH
depfile=$ALSAPATH/modules.dep
generic_stringfile=$ALSAPATH/modules.generic_string
--- 12,16 ----
then
cat << EOF > /etc/modutils/1alsa
! path[misc]=$ALSAPATH
depfile=$ALSAPATH/modules.dep
generic_stringfile=$ALSAPATH/modules.generic_string
***************
*** 172,176 ****
CARD_DRIVER=snd-$1
! # CARD_OPTS="${*:2}"
if [ -z "$CARD_OPTS" ]; then
CARD_OPTS="${mpfx}index=0"
--- 172,176 ----
CARD_DRIVER=snd-$1
! # CARD_OPTS="${*:2}" # FIXME
if [ -z "$CARD_OPTS" ]; then
CARD_OPTS="${mpfx}index=0"
***************
*** 226,232 ****
[ -n "$GAUGE" ] && echo 80
update-modules 2>/dev/null
[ -n "$GAUGE" ] && echo 90
! #touch -r /etc/modules.conf $DESTDIR/modules.dep
!
#echo Loading driver...
#/etc/init.d/alsa start
--- 226,234 ----
[ -n "$GAUGE" ] && echo 80
update-modules 2>/dev/null
+ touch -r $ALSAPATH/modules.dep /etc/modules.conf
+ [ -n "$DEBUG" ] && echo "Creating snddevices..."
+ /usr/sbin/alsa_snddevices >/dev/null 2>/dev/null
[ -n "$GAUGE" ] && echo 90
!
#echo Loading driver...
#/etc/init.d/alsa start
***************
*** 236,240 ****
else
#set_mixers
! aumix -m 0 -v 60 -w 60 # set pcm & master to 60
fi
[ -n "$GAUGE" ] && echo 100
--- 238,242 ----
else
#set_mixers
! aumix -m 0 -v 60 -w 60 # set pcm & master to 60, micro to 0
fi
[ -n "$GAUGE" ] && echo 100
Index: knoppix-autoconfig
===================================================================
RCS file: /cvsroot/morphix/scripts-base/etc/init.d/knoppix-autoconfig,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** knoppix-autoconfig 24 Sep 2003 23:24:41 -0000 1.15
--- knoppix-autoconfig 6 Dec 2003 22:30:50 -0000 1.16
***************
*** 187,191 ****
LANGUAGE="be"
COUNTRY="be"
! LANG="be"
KEYTABLE="be-latin1"
XKEYBOARD="be"
--- 187,191 ----
LANGUAGE="be"
COUNTRY="be"
! LANG="C" # used to be "be", but thats Belgarian, not belgian
KEYTABLE="be-latin1"
XKEYBOARD="be"
Index: morphix-start
===================================================================
RCS file: /cvsroot/morphix/scripts-base/etc/init.d/morphix-start,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** morphix-start 24 Sep 2003 23:24:41 -0000 1.19
--- morphix-start 6 Dec 2003 22:30:50 -0000 1.20
***************
*** 194,197 ****
--- 194,198 ----
RC="$?"
fi
+ mount --bind /home/morph /mnt/main/home/morph
[ "$RC" = "0" ] && echo "${GREEN}/home/morph mounted OK.${NORMAL}" || { echo "${RED}FAILED."; echo "$ERROR${NORMAL}"; }
fi
|
|
From: <ale...@us...> - 2003-12-06 22:30:53
|
Update of /cvsroot/morphix/scripts-base/etc In directory sc8-pr-cvs1:/tmp/cvs-serv23532 Modified Files: passwd profile Removed Files: auto.master auto.misc auto.net automount.sh Log Message: possible 0.4-1b files Index: passwd =================================================================== RCS file: /cvsroot/morphix/scripts-base/etc/passwd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** passwd 17 Apr 2003 19:15:27 -0000 1.1 --- passwd 6 Dec 2003 22:30:49 -0000 1.2 *************** *** 20,26 **** irc:x:39:39:ircd:/var:/bin/sh gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats/gnats-db:/bin/sh ! mysql:x:100:103:MySQL Server:/var/lib/mysql:/bin/false postfix:x:102:65534:Postfix Mailsystem:/var/spool/postfix:/bin/false morph:x:1000:1000:Morphix User:/home/morph:/bin/bash nobody:x:65534:65534:nobody:/nonexistent:/bin/sh ! gdm:!:100:1000:Gnome Display Manager:/var/lib/gdm:/bin/false --- 20,27 ---- irc:x:39:39:ircd:/var:/bin/sh gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats/gnats-db:/bin/sh ! mysql:x:100:100:MySQL Server:/var/lib/mysql:/bin/false postfix:x:102:65534:Postfix Mailsystem:/var/spool/postfix:/bin/false + sshd:x:101:65534::/var/run/sshd:/bin/false morph:x:1000:1000:Morphix User:/home/morph:/bin/bash nobody:x:65534:65534:nobody:/nonexistent:/bin/sh ! gdm:!:104:1000:Gnome Display Manager:/var/lib/gdm:/bin/false Index: profile =================================================================== RCS file: /cvsroot/morphix/scripts-base/etc/profile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** profile 21 Apr 2003 14:13:33 -0000 1.2 --- profile 6 Dec 2003 22:30:49 -0000 1.3 *************** *** 4,7 **** --- 4,8 ---- [ "$UID" = "0" ] || PATH="$PATH:." export PATH + # Set LOCALE if [ -f /etc/sysconfig/i18n ]; then --- auto.master DELETED --- --- auto.misc DELETED --- --- auto.net DELETED --- --- automount.sh DELETED --- |
|
From: <ale...@us...> - 2003-12-06 15:49:58
|
Update of /cvsroot/morphix/morph-scripts In directory sc8-pr-cvs1:/tmp/cvs-serv25384 Modified Files: minimod-gen.pl Added Files: debwrap Log Message: adding debootstrap wrapper, minimod-gen changes --- NEW FILE: debwrap --- #!/bin/sh # Mainmodule generator/Debootstrap wrapper #, not unlike the great yet underrated minimod generator # Do note that this one is non-interactive. It's quicker and I'm lazy # # Uses debootstrap to make a new mainmodule, depending on arguments given # # Copyright Alex de Landgraaf, 2003 <alextreme at xs4all dot nl> # licensed under the GNU GPL v2, see www.gnu.org for details # With thanks to the makers of the ABS guide usage() { echo "Usage:" echo echo "debwrap -d /file/newdir [SUITE [ MIRROR] ]" echo " - debootstrap new directory, apply changes for mainmodule, don't build one" echo "debwrap -c /file/newdir MainModule-fubar.mod [SUITE [ MIRROR] ]" echo " - same as '-d', but also create a mainmodule from the directory" echo echo "debwrap -dl /file/newdir /file/packagelist [SUITE [ MIRROR] ]" echo " - same as '-d', but apt-get every file in the package list" echo " (newline seperated list of debian packages)" echo "debwrap -cl /file/packagelist /file/newdir MainModule-fubar.mod [SUITE [ MIRROR] ]" echo " - '-dl' and '-c' combined, you get the drill" echo echo "debwrap -dls /file/newdir /file/packagelist [SUITE [ MIRROR] ]" echo " - same as '-dl', but also copies your /etc/apt/sources.list over" echo "debwrap -cls /file/packagelist /file/newdir MainModule-fubar.mod [SUITE [ MIRROR] ]" echo " - guess :)" } if [ $# -eq 0 ] || [[ $1 != "-d" && $1 != "-c" && $1 != "-dl" && $1 != "-cl" && $1 != "-dls" && $1 != "-cls" && $1 != "-apt-get-list" ]] then usage fi MYNAME=$0 run_chrooted_apt() { cp $MYNAME $1/debwrap cp $2 $1/apt-list chroot $1/ sh ./debwrap -apt-get-list ./apt-list rm $1/apt-list rm $1/debwrap } # takes the directory to setup as first argument # suite (woody/sarge/sid) as second # mirror as third (not needed) debootstrap_setup() { mkdir $1 debootstrap $2 $1 $3 mkdir $1/MorphixCD rmdir $1/initrd rmdir $1/opt rmdir $1/tmp ln -s var/tmp $1/tmp mkdir $1/morphix if [[ $3 != "" ]] then echo "deb $3 $2 main contrib non-free" >> $1/etc/apt/sources.list else echo "deb http://ftp.debian.org/debian/ $2 main contrib non-free" >> $1/etc/apt/sources.list fi echo "#!/bin/sh" >> $1/morphix/loadmod.sh echo "echo \"Chrooting to MainModule\"" >> $1/morphix/loadmod.sh echo "chroot /mnt/main sh /morphix/init.sh" >> $1/morphix/loadmod.sh echo "#!/bin/sh" >> $1/morphix/init.sh echo "# Put stuff to load at boottime here" >> $1/morphix/init.sh echo "$2" >> $1/morphix/main_module echo "This module has been automatically generated by debwrap" >> $1/morphix/main_module echo "This module has been automatically generated by debwrap" >> $1/morphix/README echo "Put any info for morphers here. For morphix stuff see www.morphix.org" >> $1/morphix/README } # takes the directory to setup as first argument # suite (woody/sarge/sid) as second (not needed) # mirror as third (not needed) do_debootstrap() { if [[ $2 != "woody" && $2 != "sarge" && $2 != "sid" ]] then debootstrap_setup $1 "sid" $3 else debootstrap_setup $1 $2 $3 fi } build_module() { mkisofs -R -U -V "Morphix" -P "Morphix" -hide-rr-moved -cache-inodes -no-bak -pad $1 | nice -5 create_compressed_fs - 65536 > $2 } libX_patch() { mkdir usr/lib/backup mv usr/lib/libGL.* usr/lib/backup mkdir usr/X11R6/lib/backup mv usr/X11R6/lib/libGL.* usr/X11R6/lib/backup/ mkdir usr/X11R6/lib/modules/extensions/backup mv usr/X11R6/lib/modules/extensions/libGLcore.a usr/X11R6/lib/modules/extensions/backup/ mv usr/X11R6/lib/modules/extensions/libglx.a usr/X11R6/lib/modules/extensions/backup/ } add_sources() { cp /etc/apt/sources.list $1/etc/apt/sources.list } ### start of selectors ### # flag directory [suite [ mirror ]] if [[ $1 == "-d" && $2 != "" ]] then do_debootstrap $2 $3 $4 fi ### should only be used by the script itself, will cause chaos otherwise ### # this is run while chrooted in the fresh debootstrap # also attempts to patch libX *FIXME* # flag file-list # we could use some kind of xml file to add/remove packages... if [[ $1 == "-apt-get-list" && $2 != "" ]] then apt-get update while read line do if [ $line == *REMOVE ] then {$line/REMOVE/} apt-get purge $line else apt-get --yes install $line fi done < $2 apt-get clean libX_patch fi # flag directory modulename.mod [suite [ mirror ]] if [[ $1 == "-c" && $2 != "" && $3 != "" ]] then do_debootstrap $2 $4 $5 build_module $2 $3 fi # flag directory packagelist [suite [ mirror ]] if [[ $1 == "-dl" && $2 != "" && $3 != "" ]] then do_debootstrap $2 $4 $5 run_chrooted_apt $2 $3 fi # flag directory packagelist modulename.mod [suite [ mirror ]] if [[ $1 == "-cl" && $2 != "" && $3 != "" && $4 != "" ]] then do_debootstrap $2 $5 $6 run_chrooted_apt $2 $3 build_module $2 $4 fi # flag directory packagelist [suite [ mirror ]] if [[ $1 == "-dls" && $2 != "" && $3 != "" ]] then do_debootstrap $2 $4 $5 add_sources $2 run_chrooted_apt $2 $3 fi # flag directory packagelist modulename.mod [suite [ mirror ]] if [[ $1 == "-cls" && $2 != "" && $3 != "" && $4 != "" ]] then do_debootstrap $2 $5 $6 add_sources $2 run_chrooted_apt $2 $3 build_module $2 $4 fi Index: minimod-gen.pl =================================================================== RCS file: /cvsroot/morphix/morph-scripts/minimod-gen.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** minimod-gen.pl 24 Sep 2003 23:20:21 -0000 1.3 --- minimod-gen.pl 6 Dec 2003 15:49:55 -0000 1.4 *************** *** 21,28 **** our $moddir; ! our @cmdlist; our %filelist; our @deblist; ! our @deblist_list; our @debfiles_list; --- 21,32 ---- our $moddir; ! ! # option 1: copy our %filelist; + # option 2: cmd + our @cmdlist; + # option 3: deb our @deblist; ! # option 4: deblist our @deblist_list; our @debfiles_list; *************** *** 31,34 **** --- 35,40 ---- our @loclist; our @localfilelist; + # option 5: homedir + our $homedir; if ($> != 0) { *************** *** 39,42 **** --- 45,111 ---- main(); + sub main { + our $type; + our $ret; + + print ("\n\tWelcome to the interactive Morphix minimodule generator\n\n"); + + # Check necessary programs (create_compressed_fs, mkisofs) + + my $ccfs = qx|which create_compressed_fs 2>&1|; + my $mkisofs = qx|which mkisofs 2>&1|; + + if (($ccfs =~ /no create_compressed_fs in/) || ($mkisofs =~ /no mkisofs in/)) { + die("Can't find create_compressed_fs and / or mkisofs, install these to run the minimodule generator\n"); + } + + do { + $ret = setup_new_module(); + } while $ret != 1; + + do { + print("Please add an action to the minimodule:\n"); + print("1) Copy a file/dir to the mainmod at boot, or overwrite one if it exists\n"); + print("2) Enter a command to be executed at boot\n"); + print("3) Enter one or more debian packages to be added (experimental, needs dpkg-deb)\n"); + print("4) Enter a filename containing a list of debian packages to download and add\n"); + print("5) Enter a directories name, all files in it will be available in morph's homedir\n"); + print("9) Build the module and exit\n"); + print("0) Abort without building the module\n\n"); + print("> "); + chomp($type = <STDIN>); + print("\n"); + + if ($type == 1) { + add_copy(); + } + if ($type == 2) { + add_cmd(); + } + if ($type == 3) { + add_deb(); + } + if ($type == 4) { + add_deblist(); + } + if ($type == 5) { + add_homedir(); + } + if ($type == 9) { + generate_module(); + print("The generator will now exit\n"); + exit 1; + } + if ($type == 0) { + print "Aborted..."; + exit 1; + } + } + while (1); + exit 0; + } + + # done before the GUI is shown, used as work directory + sub setup_new_module { our $i; *************** *** 70,73 **** --- 139,201 ---- } + ### start option section ### + + # first option: copy a directory over at boottime + + sub add_copy { + our $src; + our $dest; + our $input; + + while(1) { + print "Enter a filename to be included (the new file), newline to stop\n"; + print "> "; + chomp($src = <STDIN>); + print "\n"; + if ($src eq "") { + last; + } + if (!(-e $src)) { + print "Can't find $src, lets try again\n"; + redo; + } + + print "Enter in which dir it will be placed, or what file it will replace (with path!)\n"; + print "> "; + chomp($dest = <STDIN>); + print "\n\n"; + + $filelist{"$src"} = "$dest"; + + our $break = ""; + while ($break eq "") { + print "Do you want to add another file? (or l for list)\n"; + print "y/N/l > "; + chomp($input = <STDIN>); + if ($input eq "y" || $input eq "Y") { + $break = "false"; + } + if ($input eq "n" || $input eq "N" || $input eq "") { + $break = "true"; + } + if ($input eq "l" || $input eq "L") { + while (($src,$dest) = each(%filelist)) { + print("Source: $src Destination: $dest\n"); + } + print "\n"; + } + }; + if ($break eq "true") { + last; + } + } + + if (keys %filelist == 0) { + print "No files were entered..."; + } + } + + # second option: execute a command at boottime + sub add_cmd { our $cmd; *************** *** 111,147 **** } } - sub add_deblist { - our $src; - our $input; - our $line; - - while(1) { - print "Enter a filename containing a list of debian packages\n"; - print "All packages in this list will be downloaded from your apt\n"; - print "mirror in /etc/apt/sources.list and unpacked into a minimod\n"; - print "Make sure you have apt-get update && apt-get upgrade ed your system\n"; - print "> "; - chomp($src = <STDIN>); - print "\n"; - if ($src eq "") { - last; - } - if (!(-e $src)) { - print "Can't find $src, lets try again\n"; - redo; - } - else { - last; - } - } - open(SOURCE, "< $src") - or die "Couldn't open $src for reading: $!\n"; ! while(defined ($line = <SOURCE>)) { ! chomp $line; ! @deblist_list = (@deblist_list,$line); ! } ! close(SOURCE); ! } sub add_deb { --- 239,244 ---- } } ! # third option: extract a debian package and overlay it at boottime sub add_deb { *************** *** 194,204 **** } } ! sub add_copy { our $src; - our $dest; our $input; while(1) { ! print "Enter a filename to be included (the new file), newline to stop\n"; print "> "; chomp($src = <STDIN>); --- 291,308 ---- } } ! ! # forth option: overlay a set of debian packages, which are found & downloaded ! # using the hosts source.list ! ! sub add_deblist { our $src; our $input; + our $line; while(1) { ! print "Enter a filename containing a list of debian packages\n"; ! print "All packages in this list will be downloaded from your apt\n"; ! print "mirror in /etc/apt/sources.list and unpacked into a minimod\n"; ! print "Make sure you have apt-get update && apt-get upgrade ed your system\n"; print "> "; chomp($src = <STDIN>); *************** *** 206,327 **** if ($src eq "") { last; ! } if (!(-e $src)) { print "Can't find $src, lets try again\n"; redo; } ! ! print "Enter in which dir it will be placed, or what file it will replace (with path!)\n"; ! print "> "; ! chomp($dest = <STDIN>); ! print "\n\n"; ! ! $filelist{"$src"} = "$dest"; ! ! our $break = ""; ! while ($break eq "") { ! print "Do you want to add another file? (or l for list)\n"; ! print "y/N/l > "; ! chomp($input = <STDIN>); ! if ($input eq "y" || $input eq "Y") { ! $break = "false"; ! } ! if ($input eq "n" || $input eq "N" || $input eq "") { ! $break = "true"; ! } ! if ($input eq "l" || $input eq "L") { ! while (($src,$dest) = each(%filelist)) { ! print("Source: $src Destination: $dest\n"); ! } ! print "\n"; ! } ! }; ! if ($break eq "true") { last; } } ! if (keys %filelist == 0) { ! print "No files were entered..."; } ! } ! sub build_module { ! our $outfile; ! our $input; ! FILENAME: ! print "Enter the output filename of the module (MorphixMini-foo-bar.mod):\n"; ! print "> "; ! chomp ($outfile = <STDIN>); ! if (-e $outfile) { ! print "This file exists! Are you sure?\n"; ! print "y/N > "; ! chomp ($input = <STDIN>); ! if ($input ne "y" && $input ne "Y") { ! goto FILENAME; } } - print "Building module, please wait...\n"; - system "mkisofs -R -U -V \"Morphix Mini\" -P \"Morphix\" -hide-rr-moved -cache-inodes -no-bak -pad $_[0] | nice -5 create_compressed_fs - 65536 > $outfile"; } ! sub main { ! our $type; ! our $ret; ! ! print ("\n\tWelcome to the interactive Morphix minimodule generator\n\n"); ! ! # Check necessary programs (create_compressed_fs, mkisofs) ! ! my $ccfs = qx|which create_compressed_fs 2>&1|; ! my $mkisofs = qx|which mkisofs 2>&1|; ! ! if (($ccfs =~ /no create_compressed_fs in/) || ($mkisofs =~ /no mkisofs in/)) { ! die("Can't find create_compressed_fs and / or mkisofs, install these to run the minimodule generator\n"); ! } ! ! do { ! $ret = setup_new_module(); ! } while $ret != 1; ! do { ! print("Please add an action to the minimodule:\n"); ! print("1) Copy a file/dir to the mainmod at boot, or overwrite one if it exists\n"); ! print("2) Enter a command to be executed at boot\n"); ! print("3) Enter one or more debian packages to be added (experimental, needs dpkg-deb)\n"); ! print("4) Enter a filename containing a list of debian packages to download and add\n"); ! print("5) Build the module and exit\n"); ! print("0) Abort without building the module\n\n"); ! print("> "); ! chomp($type = <STDIN>); ! print("\n"); ! ! if ($type == 1) { ! add_copy(); ! } ! if ($type == 2) { ! add_cmd(); ! } ! if ($type == 3) { ! add_deb(); ! } ! if ($type == 4) { ! add_deblist(); ! } ! if ($type == 5) { ! generate_module(); ! print("The generator will now exit\n"); ! exit 1; ! } ! if ($type == 0) { ! print "Aborted..."; ! exit 1; ! } ! } ! while (1); ! exit 0; ! } sub get_repos { --- 310,359 ---- if ($src eq "") { last; ! } if (!(-e $src)) { print "Can't find $src, lets try again\n"; redo; } ! else { last; } } + open(SOURCE, "< $src") + or die "Couldn't open $src for reading: $!\n"; ! while(defined ($line = <SOURCE>)) { ! chomp $line; ! @deblist_list = (@deblist_list,$line); } ! close(SOURCE); ! } ! # fifth option: use a directory as homedir ! sub add_homedir { ! our $src; ! our $input; ! while(1) { ! print "Enter a dir to use as homedirectory, newline to stop\n"; ! print "> "; ! chomp($src = <STDIN>); ! print "\n"; ! if ($src eq "") { ! last; ! } ! if (!(-e $src)) { ! print "Can't find $src, lets try again\n"; ! redo; } + + $homedir = $src; + last; } } ! ### end option section ### ! # gets the list of repositories in /etc/apt/sources.list sub get_repos { *************** *** 348,351 **** --- 380,385 ---- } + # gets the list of packages to be downloaded + sub download_list { our $package = $_[0]; *************** *** 380,383 **** --- 414,419 ---- } + # actually download the debs necessary + sub download_debs { our $item; *************** *** 452,460 **** print "Select the main module for which this mini module will be generated:\n"; print "1) LightGUI\n"; ! print "2) HeavyGUI\n"; ! print "3) Gamer\n"; ! print "4) Bare\n"; ! print "5) ALL (generic minimodule, works on everything :o)\n"; ! print "6) Enter your own\n"; print "[1-5] > "; chomp($input = <STDIN>); --- 488,497 ---- print "Select the main module for which this mini module will be generated:\n"; print "1) LightGUI\n"; ! print "2) Gnome\n"; ! print "3) KDE\n"; ! print "4) Gamer\n"; ! print "5) Bare\n"; ! print "6) ALL (generic minimodule, works on everything :)\n"; ! print "7) Enter your own\n"; print "[1-5] > "; chomp($input = <STDIN>); *************** *** 466,480 **** } if ($input == 3) { ! $maintag = "Gamer\n"; } if ($input == 4) { ! $maintag = "Bare\n"; } if ($input == 5) { ! $maintag = "ALL\n"; } if ($input == 6) { while ($maintag eq "") { ! print "Enter the /morphix/main_module tag, or ALL for all main modules\nMake sure the tag is exactly correct! "; print "> "; chomp($maintag = <STDIN>); --- 503,520 ---- } if ($input == 3) { ! $maintag = "KDE\n"; } if ($input == 4) { ! $maintag = "Gamer\n"; } if ($input == 5) { ! $maintag = "Bare\n"; } if ($input == 6) { + $maintag = "ALL\n"; + } + if ($input == 7) { while ($maintag eq "") { ! print "Enter the /morphix/main_module tag, or ALL for all main modules\nMake sure the tag is exactly correct, otherwise the module won't load! "; print "> "; chomp($maintag = <STDIN>); *************** *** 514,525 **** --- 554,572 ---- print OUT "#!/bin/sh\n\#\n# This file has been generated by minimod-gen.pl\n\n"; + ### the copy option + while (($src,$dest) = each(%filelist)) { $basename = (split/\//,$src)[-1]; print OUT "cp -a \"\$1\"/morphix/files/$basename $dest\n"; } + + ### the cmd/execute option + foreach $cmd (@cmdlist) { print OUT "$cmd\n"; } + ### the debianpackage list option + if (scalar @deblist_list != 0) { mkdir ("$moddir/morphix/deb",0755) || die "cannot mkdir $moddir/morphix/deb: $!"; *************** *** 573,576 **** --- 620,626 ---- elsif (scalar @deblist != 0) { mkdir ("$moddir/morphix/deb",0755) || die "cannot mkdir $moddir/morphix/deb: $!"; + + ### the single-deb option + foreach $src (@deblist) { system "dpkg-deb -x $src $moddir/morphix/deb/"; *************** *** 578,581 **** --- 628,642 ---- print OUT "cp -as \"\$1\"/morphix/deb/* /var/tmp/trans/\n"; } + + ### homedir copy option + + if ($homedir ne "") { + system("cp -r $homedir $moddir/homedir"); + print OUT "cp -r \"\$1\"/homedir/.[a-zA-Z]* /home/morph/\n"; + print OUT "cp -r \"\$1\"/homedir/* /home/morph\n"; + print OUT "cp -r \"\$1\"/homedir/.[a-zA-Z]* /etc/skel/\n"; + print OUT "cp -r \"\$1\"/homedir/* /etc/skel\n"; + print OUT "chown -R morph.users /home/morph\n"; + } print OUT "\necho \"MiniModule loaded\""; close OUT; *************** *** 594,596 **** --- 655,680 ---- build_module($moddir); + } + + # builds the final module + + sub build_module { + our $outfile; + our $input; + + FILENAME: + print "Enter the output filename of the module (MorphixMini-foo-bar.mod):\n"; + print "> "; + chomp ($outfile = <STDIN>); + + if (-e $outfile) { + print "This file exists! Are you sure?\n"; + print "y/N > "; + chomp ($input = <STDIN>); + if ($input ne "y" && $input ne "Y") { + goto FILENAME; + } + } + print "Building module, please wait...\n"; + system "mkisofs -R -U -V \"Morphix Mini\" -P \"Morphix\" -hide-rr-moved -cache-inodes -no-bak -pad $_[0] | nice -5 create_compressed_fs - 65536 > $outfile"; } |
|
From: <ale...@us...> - 2003-12-02 04:15:25
|
Update of /cvsroot/morphix/mcp2/src
In directory sc8-pr-cvs1:/tmp/cvs-serv29106
Modified Files:
Makefile.am callbacks.c interface.c main.c
Added Files:
data.c data.h
Log Message:
added more robustness in imagehandling, needs conf/xml file as first argument, fixed resizing (disabled), fixed sizechanging (sortof)
--- NEW FILE: data.c ---
#include <gtk/gtk.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <libxml/xmlmemory.h>
#include <libxml/parser.h>
#include "data.h"
extern gchar *window_name;
void parseItem(xmlDocPtr doc, xmlNodePtr cur) {
xmlChar *key;
cur = cur->xmlChildrenNode;
item_struct *item;
if (item_count+1 >= MAX_ITEMS) {
fprintf(stderr,"Reached maximum of items, bailing out...");
return;
}
item = (item_struct *) malloc(sizeof(item_struct));
item->selected = FALSE;
while (cur != NULL) {
if ((!xmlStrcmp(cur->name, (const xmlChar *) "command"))) {
key = xmlNodeListGetString(doc, cur->xmlChildrenNode,1);
item->command = (gchar *)malloc(strlen(key) + 1);
strncpy(item->command,key,strlen(key)+1);
xmlFree(key);
}
if ((!xmlStrcmp(cur->name, (const xmlChar *) "name"))) {
key = xmlNodeListGetString(doc, cur->xmlChildrenNode,1);
item->name = (gchar *)malloc(strlen(key) + 1);
strncpy(item->name,key,strlen(key)+1);
xmlFree(key);
}
if ((!xmlStrcmp(cur->name, (const xmlChar *) "tip"))) {
key = xmlNodeListGetString(doc, cur->xmlChildrenNode,1);
item->tip = (gchar *)malloc(strlen(key)+1);
strncpy(item->tip,key,strlen(key) + 1);
xmlFree(key);
}
if ((!xmlStrcmp(cur->name, (const xmlChar *) "icon"))) {
key = xmlNodeListGetString(doc, cur->xmlChildrenNode,1);
item->iconpath = (gchar *)malloc(strlen(key)+ 1);
strncpy(item->iconpath,key,strlen(key)+1);
xmlFree(key);
}
cur = cur->next;
}
if (item->command != NULL && item->iconpath != NULL) {
item_count++;
items[item_count-1] = item;
}
else {
fprintf(stderr,"Found incomplete item!\n");
}
return;
}
void parseGlobal(xmlDocPtr doc, xmlNodePtr cur) {
xmlChar *key;
cur = cur->xmlChildrenNode;
while (cur != NULL) {
if ((!xmlStrcmp(cur->name, (const xmlChar *) "name"))) {
key = xmlNodeListGetString(doc, cur->xmlChildrenNode,1);
window_name = (gchar *)malloc(strlen(key)+ 1);
strncpy(window_name,key,strlen(key)+1);
xmlFree(key);
}
cur = cur->next;
}
if (window_name == NULL) {
window_name = g_strdup("Morphix Control Panel");
}
return;
}
void parseDoc(char *docname) {
xmlDocPtr doc;
xmlNodePtr cur;
doc = xmlParseFile(docname);
if (doc == NULL) {
fprintf(stderr,"Document not parsed succesfully! \n");
return;
}
cur = xmlDocGetRootElement(doc);
if (cur == NULL) {
fprintf(stderr,"empty document\n");
return;
}
if (xmlStrcmp(cur->name, (const xmlChar *) "mcp")) {
fprintf(stderr,"document of the wrong type, root node != mcp");
xmlFreeDoc(doc);
return;
}
cur = cur->xmlChildrenNode;
while (cur != NULL) {
if ((!xmlStrcmp(cur->name, (const xmlChar *) "item"))) {
parseItem(doc,cur);
}
if ((!xmlStrcmp(cur->name, (const xmlChar *) "global"))) {
parseGlobal(doc,cur);
}
cur = cur->next;
}
xmlFreeDoc(doc);
return;
}
--- NEW FILE: data.h ---
#ifndef MCP_DATA_H
#define MCP_DATA_H
#define MAX_ITEMS 40
typedef struct {
GdkPixbuf *pixbuf;
gboolean selected;
gchar *command;
gchar *name;
gchar *tip;
gchar *iconpath;
} item_struct;
item_struct *items[MAX_ITEMS];
gint item_count;
void parseDoc(char *docname);
#endif
Index: Makefile.am
===================================================================
RCS file: /cvsroot/morphix/mcp2/src/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am 10 Nov 2003 02:04:00 -0000 1.1.1.1
--- Makefile.am 1 Dec 2003 21:19:44 -0000 1.2
***************
*** 12,16 ****
support.c support.h \
interface.c interface.h \
! callbacks.c callbacks.h
mcp_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -L/usr/lib -lxml2 -lz -lpthread -lm
--- 12,17 ----
support.c support.h \
interface.c interface.h \
! callbacks.c callbacks.h \
! data.c data.h
mcp_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -L/usr/lib -lxml2 -lz -lpthread -lm
Index: callbacks.c
===================================================================
RCS file: /cvsroot/morphix/mcp2/src/callbacks.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** callbacks.c 10 Nov 2003 02:04:00 -0000 1.1.1.1
--- callbacks.c 1 Dec 2003 21:19:44 -0000 1.2
***************
*** 11,34 ****
#include "interface.h"
#include "support.h"
! #define MCP_CONF "../mcp.conf"
! #define MAX_ITEMS 40
! typedef struct {
! GdkPixbuf *pixbuf;
! gboolean selected;
! gchar *command;
! gchar *name;
! gchar *tip;
! gchar *iconpath;
! } item_struct;
GdkPixbuf *image;
! gint item_count;
! gint minimumx;
! gint minimumy;
gint debug_switch = 1;
- item_struct *items[MAX_ITEMS];
extern GtkWidget *MainWindow;
GtkWidget *da;
--- 11,28 ----
#include "interface.h"
#include "support.h"
+ #include "data.h"
! #define MINIMUM_WIDTH 400
! #define MAX_ICON_WIDTH 48
! #define MAX_ICON_HEIGHT 48
! extern gchar *config_file;
GdkPixbuf *image;
! gint minimum_width = MINIMUM_WIDTH;
! gint minimum_height = -1;
gint debug_switch = 1;
extern GtkWidget *MainWindow;
+ extern gchar *window_name;
GtkWidget *da;
***************
*** 38,43 ****
int box_width = 100;
int box_height = 100;
! int icon_width = 48;
! int icon_height = 48;
int icon_from_top = 5;
--- 32,37 ----
int box_width = 100;
int box_height = 100;
! int icon_width = MAX_ICON_WIDTH;
! int icon_height = MAX_ICON_HEIGHT;
int icon_from_top = 5;
***************
*** 78,191 ****
}
- void parseItem(xmlDocPtr doc, xmlNodePtr cur) {
- xmlChar *key;
- cur = cur->xmlChildrenNode;
- item_struct *item;
-
- if (item_count+1 >= MAX_ITEMS) {
- fprintf(stderr,"Reached maximum of items, bailing out...");
- return;
- }
-
- item = (item_struct *) malloc(sizeof(item_struct));
- item->selected = FALSE;
- while (cur != NULL) {
- if ((!xmlStrcmp(cur->name, (const xmlChar *) "command"))) {
- key = xmlNodeListGetString(doc, cur->xmlChildrenNode,1);
- item->command = (gchar *)malloc(strlen(key) + 1);
- strncpy(item->command,key,strlen(key)+1);
- xmlFree(key);
- }
- if ((!xmlStrcmp(cur->name, (const xmlChar *) "name"))) {
- key = xmlNodeListGetString(doc, cur->xmlChildrenNode,1);
- item->name = (gchar *)malloc(strlen(key) + 1);
- strncpy(item->name,key,strlen(key)+1);
- xmlFree(key);
- }
- if ((!xmlStrcmp(cur->name, (const xmlChar *) "tip"))) {
- key = xmlNodeListGetString(doc, cur->xmlChildrenNode,1);
- item->tip = (gchar *)malloc(strlen(key)+1);
- strncpy(item->tip,key,strlen(key) + 1);
- xmlFree(key);
- }
- if ((!xmlStrcmp(cur->name, (const xmlChar *) "icon"))) {
- key = xmlNodeListGetString(doc, cur->xmlChildrenNode,1);
- item->iconpath = (gchar *)malloc(strlen(key)+ 1);
- strncpy(item->iconpath,key,strlen(key)+1);
- xmlFree(key);
- }
- cur = cur->next;
- }
-
- if (item->command != NULL && item->iconpath != NULL) {
- items[item_count++] = item;
- }
- else {
- fprintf(stderr,"Found incomplete item!\n");
- }
- return;
- }
-
- void parseGlobal(xmlDocPtr doc, xmlNodePtr cur) {
- xmlChar *key;
- cur = cur->xmlChildrenNode;
-
- minimumx = -1;
- minimumy = -1;
-
- while (cur != NULL) {
-
- if ((!xmlStrcmp(cur->name, (const xmlChar *) "minimumx"))) {
- key = xmlNodeListGetString(doc, cur->xmlChildrenNode,1);
- minimumx = atoi(key);
- xmlFree(key);
- }
- if ((!xmlStrcmp(cur->name, (const xmlChar *) "minimumy"))) {
- key = xmlNodeListGetString(doc, cur->xmlChildrenNode,1);
- minimumy = atoi(key);
- xmlFree(key);
- }
- cur = cur->next;
- }
- return;
- }
-
- void parseDoc(char *docname) {
- xmlDocPtr doc;
- xmlNodePtr cur;
-
- doc = xmlParseFile(docname);
-
- if (doc == NULL) {
- fprintf(stderr,"Document not parsed succesfully! \n");
- return;
- }
- cur = xmlDocGetRootElement(doc);
-
- if (cur == NULL) {
- fprintf(stderr,"empty document\n");
- return;
- }
-
- if (xmlStrcmp(cur->name, (const xmlChar *) "mcp")) {
- fprintf(stderr,"document of the wrong type, root node != mcp");
- xmlFreeDoc(doc);
- return;
- }
- cur = cur->xmlChildrenNode;
- while (cur != NULL) {
- if ((!xmlStrcmp(cur->name, (const xmlChar *) "item"))) {
- parseItem(doc,cur);
- }
- if ((!xmlStrcmp(cur->name, (const xmlChar *) "global"))) {
- parseGlobal(doc,cur);
- }
- cur = cur->next;
- }
- xmlFreeDoc(doc);
- return;
- }
-
-
/*
this could use a diagram to clear it up :)
--- 72,75 ----
***************
*** 227,231 ****
int y_coord = top_border + (nr_y * box_height + nr_y * top_border);
! if (x_coord + side_border * 2 > minimumx) {
nr_x = 0;
nr_y++;
--- 111,115 ----
int y_coord = top_border + (nr_y * box_height + nr_y * top_border);
! if (x_coord + side_border * 2 > minimum_width) {
nr_x = 0;
nr_y++;
***************
*** 240,243 ****
--- 124,128 ----
color.green = 0;
gtk_widget_modify_fg(da,GTK_STATE_NORMAL,&color);
+ items[i]->selected = FALSE;
}
else {
***************
*** 263,266 ****
--- 148,186 ----
}
+ GdkPixbuf *assign_fallback(gchar *reassign) {
+ GdkPixbuf *pix;
+
+ reassign = g_strdup_printf("/usr/share/pixmaps/no.xpm");
+ pix = gdk_pixbuf_new_from_file(reassign,NULL);
+ if (pix == NULL) {
+ fprintf(stderr,"Couldn't use fallback icon %s\nAborting",reassign);
+ exit(1);
+ }
+ return pix;
+ }
+
+ void set_minimum_size() {
+ gint i;
+ int nr_x = 0;
+ int nr_y = 0;
+ int x_coord = -1;
+ int y_coord = -1;
+ for (i = 0; i < item_count; i++) {
+ items[i]->selected = FALSE;
+ x_coord = side_border + (nr_x * box_width + nr_x * side_border);
+ y_coord = top_border + (nr_y * box_height + nr_y * top_border);
+
+ if (x_coord + side_border * 2 > minimum_width) {
+ nr_x = 0;
+ nr_y++;
+ }
+ x_coord = side_border + (nr_x * box_width + nr_x * side_border);
+ y_coord = top_border + (nr_y * box_height + nr_y * top_border);
+ nr_x++;
+ }
+ minimum_width = MINIMUM_WIDTH;
+ minimum_height = y_coord + box_height;
+ }
+
void
on_window1_show (GtkWidget *widget,
***************
*** 268,279 ****
{
GtkWidget *drawingarea = lookup_widget(MainWindow,"MainDrawingArea");
- item_count = 0;
- parseDoc(MCP_CONF);
gint i;
! if (minimumx > 0 && minimumy > 0) {
! // printf("Size request: %d %d\n",minimumx, minimumy);
! // gtk_widget_set_size_request (MainWindow, minimumx, minimumy);
}
GError *error = NULL;
for (i = 0; i < item_count; i++) {
--- 188,207 ----
{
GtkWidget *drawingarea = lookup_widget(MainWindow,"MainDrawingArea");
gint i;
! gtk_window_set_resizable(GTK_WINDOW(MainWindow),FALSE);
!
! item_count = 0;
! gtk_window_set_title(GTK_WINDOW(MainWindow),window_name);
! set_minimum_size();
! if (minimum_width > 0 && minimum_height > 0) {
! printf("Size request: %d %d\n",minimum_width, minimum_height);
! gtk_widget_set_size_request (drawingarea,minimum_width, minimum_height);
! gtk_widget_set_size_request (MainWindow,minimum_width, minimum_height+20);
! gtk_window_set_default_size (GTK_WINDOW(MainWindow), minimum_width, minimum_height);
}
+
+ fprintf(stderr,"Number of items: %d\n",item_count);
+
GError *error = NULL;
for (i = 0; i < item_count; i++) {
***************
*** 285,292 ****
if (pix == NULL) {
fprintf(stderr,"Couldn't find icon %s\n",items[i]->iconpath);
}
else {
! items[i]->pixbuf = pix;
}
}
da = drawingarea;
--- 213,227 ----
if (pix == NULL) {
fprintf(stderr,"Couldn't find icon %s\n",items[i]->iconpath);
+ free(items[i]->iconpath);
+ pix = assign_fallback(items[i]->iconpath);
}
else {
! if (gdk_pixbuf_get_width(pix) > MAX_ICON_WIDTH || gdk_pixbuf_get_height(pix) > MAX_ICON_HEIGHT) {
! fprintf(stderr,"Icon too large: %s\n",items[i]->iconpath);
! free(items[i]->iconpath);
! pix = assign_fallback(items[i]->iconpath);
! }
}
+ items[i]->pixbuf = pix;
}
da = drawingarea;
***************
*** 295,299 ****
gint width, height;
-
gtk_widget_add_events(da,GDK_BUTTON_PRESS_MASK);
--- 230,233 ----
***************
*** 303,310 ****
RedrawIconviewer(pixmap,da);
g_object_unref(pixmap);
-
}
-
gboolean
on_drawingarea1_button_press_event (GtkWidget *widget,
--- 237,242 ----
***************
*** 328,332 ****
int y_coord = top_border + (nr_y * box_height + nr_y * top_border);
! if (x_coord + side_border * 2 > minimumx) {
nr_x = 0;
nr_y++;
--- 260,264 ----
int y_coord = top_border + (nr_y * box_height + nr_y * top_border);
! if (x_coord + side_border * 2 > minimum_width) {
nr_x = 0;
nr_y++;
***************
*** 354,365 ****
items[i]->selected = TRUE;
}
- GdkPixmap *pixmap = gdk_pixmap_new(da->window,width,height,-1);
- RedrawIconviewer(pixmap,da);
- g_object_unref(pixmap);
break;
}
-
nr_x++;
}
}
--- 286,296 ----
items[i]->selected = TRUE;
}
break;
}
nr_x++;
}
+ pixmap = gdk_pixmap_new(da->window,width,height,-1);
+ RedrawIconviewer(pixmap,da);
+ g_object_unref(pixmap);
}
Index: interface.c
===================================================================
RCS file: /cvsroot/morphix/mcp2/src/interface.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** interface.c 10 Nov 2003 02:04:00 -0000 1.1.1.1
--- interface.c 1 Dec 2003 21:19:44 -0000 1.2
***************
*** 32,42 ****
GtkWidget *MainWindow;
GtkWidget *vbox1;
GtkWidget *MainDrawingArea;
GtkWidget *statusbar1;
MainWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
! gtk_widget_set_size_request (MainWindow, 400, 250);
! gtk_window_set_title (GTK_WINDOW (MainWindow), _("Morphix Configuration Panel"));
! gtk_window_set_default_size (GTK_WINDOW (MainWindow), 400, 250);
gtk_window_set_destroy_with_parent (GTK_WINDOW (MainWindow), TRUE);
--- 32,41 ----
GtkWidget *MainWindow;
GtkWidget *vbox1;
+ GtkWidget *scrolledwindow1;
GtkWidget *MainDrawingArea;
GtkWidget *statusbar1;
MainWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
! gtk_window_set_title (GTK_WINDOW (MainWindow), _("Morphix Control Panel"));
gtk_window_set_destroy_with_parent (GTK_WINDOW (MainWindow), TRUE);
***************
*** 45,51 ****
gtk_container_add (GTK_CONTAINER (MainWindow), vbox1);
MainDrawingArea = gtk_drawing_area_new ();
gtk_widget_show (MainDrawingArea);
! gtk_box_pack_start (GTK_BOX (vbox1), MainDrawingArea, TRUE, TRUE, 0);
statusbar1 = gtk_statusbar_new ();
--- 44,55 ----
gtk_container_add (GTK_CONTAINER (MainWindow), vbox1);
+ scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
+ gtk_widget_show (scrolledwindow1);
+ gtk_box_pack_start (GTK_BOX (vbox1), scrolledwindow1, TRUE, TRUE, 0);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
MainDrawingArea = gtk_drawing_area_new ();
gtk_widget_show (MainDrawingArea);
! gtk_container_add (GTK_CONTAINER (scrolledwindow1), MainDrawingArea);
statusbar1 = gtk_statusbar_new ();
***************
*** 96,99 ****
--- 100,104 ----
GLADE_HOOKUP_OBJECT_NO_REF (MainWindow, MainWindow, "MainWindow");
GLADE_HOOKUP_OBJECT (MainWindow, vbox1, "vbox1");
+ GLADE_HOOKUP_OBJECT (MainWindow, scrolledwindow1, "scrolledwindow1");
GLADE_HOOKUP_OBJECT (MainWindow, MainDrawingArea, "MainDrawingArea");
GLADE_HOOKUP_OBJECT (MainWindow, statusbar1, "statusbar1");
Index: main.c
===================================================================
RCS file: /cvsroot/morphix/mcp2/src/main.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** main.c 10 Nov 2003 02:04:00 -0000 1.1.1.1
--- main.c 1 Dec 2003 21:19:44 -0000 1.2
***************
*** 1,7 ****
- /*
- * Initial main.c file generated by Glade. Edit as required.
- * Glade will not overwrite this file.
- */
-
#ifdef HAVE_CONFIG_H
# include <config.h>
--- 1,2 ----
***************
*** 9,17 ****
--- 4,16 ----
#include <gtk/gtk.h>
+ #include <stdio.h>
#include "interface.h"
#include "support.h"
+ #include "data.h"
GtkWidget *MainWindow;
+ gchar *window_name = NULL;
+ gchar *config_file;
int
***************
*** 19,37 ****
{
#ifdef ENABLE_NLS
! bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
! bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
! textdomain (GETTEXT_PACKAGE);
#endif
! gtk_set_locale ();
! gtk_init (&argc, &argv);
- add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
- /*
- * The following code was added by Glade to create one of each component
- * (except popup menus), just so that you see something after building
- * the project. Delete any components that you don't want shown initially.
- */
MainWindow = create_MainWindow ();
gtk_widget_show (MainWindow);
--- 18,38 ----
{
#ifdef ENABLE_NLS
! bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
! bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
! textdomain (GETTEXT_PACKAGE);
#endif
! gtk_set_locale ();
! if (argc != 2) {
! fprintf(stderr,"Usage: mcp configfile\n");
! exit(1);
! }
! config_file = g_strdup(argv[1]);
! parseDoc(config_file);
! gtk_init (&argc, &argv);
!
! add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
MainWindow = create_MainWindow ();
gtk_widget_show (MainWindow);
|
|
From: <ale...@us...> - 2003-12-02 04:14:43
|
Update of /cvsroot/morphix/mcp2
In directory sc8-pr-cvs1:/tmp/cvs-serv30946
Modified Files:
mcp.conf mcp.glade translation
Log Message:
greatly simplified conf/xml file
Index: mcp.conf
===================================================================
RCS file: /cvsroot/morphix/mcp2/mcp.conf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** mcp.conf 10 Nov 2003 02:03:59 -0000 1.1.1.1
--- mcp.conf 1 Dec 2003 21:25:59 -0000 1.2
***************
*** 2,130 ****
<mcp>
<global>
- <minimumx>400</minimumx>
- <minimumy>400</minimumy>
</global>
<item>
!
! <command>gtkxrandr</command>
!
! <name>Display</name>
! <namex>25</namex>
! <namey>60</namey>
! <namexmax>270</namexmax>
!
<tip>Helps you set your X settings</tip>
-
<icon>../Monitor.png</icon>
- <iconx>30</iconx>
- <icony>10</icony>
- <iconwidth>48</iconwidth>
- <iconheight>48</iconheight>
-
</item>
-
<item>
-
-
<command>networkconf</command>
-
<name>Network</name>
- <namex>115</namex>
- <namey>60</namey>
- <namexmax>270</namexmax>
-
<tip>Helps you set your network settings</tip>
-
<icon>../Networking.png</icon>
- <iconx>120</iconx>
- <icony>10</icony>
- <iconwidth>48</iconwidth>
- <iconheight>48</iconheight>
</item>
-
<item>
-
-
<command>soundconf</command>
-
<name>Sound</name>
- <namex>210</namex>
- <namey>60</namey>
- <namexmax>270</namexmax>
-
<tip>Helps you set your sound settings</tip>
-
<icon>../Speaker.png</icon>
- <iconx>210</iconx>
- <icony>10</icony>
- <iconwidth>48</iconwidth>
- <iconheight>48</iconheight>
</item>
<item>
-
<command>keybconf</command>
-
<name>Keyboard</name>
- <namex>290</namex>
- <namey>60</namey>
- <namexmax>270</namexmax>
-
<tip>Helps you set your keyboard settings</tip>
-
<icon>../Keyboard2.png</icon>
- <iconx>300</iconx>
- <icony>10</icony>
- <iconwidth>48</iconwidth>
- <iconheight>48</iconheight>
</item>
-
<item>
<command>morphixinstaller</command>
-
<name>Harddisk Install</name>
- <namex>20</namex>
- <namey>150</namey>
- <namexmax>370</namexmax>
-
<tip>Copy Morphix to the harddisk for usage without CD</tip>
-
<icon>../Harddisk.png</icon>
- <iconx>30</iconx>
- <icony>100</icony>
- <iconwidth>48</iconwidth>
- <iconheight>48</iconheight>
</item>
<item>
<command>sudo xterm</command>
-
<name>Root Xterminal</name>
- <namex>115</namex>
- <namey>150</namey>
- <namexmax>100</namexmax>
<tip>Open a root terminal</tip>
-
<icon>../GNOME-Terminal-BabyTux.png</icon>
- <iconx>120</iconx>
- <icony>100</icony>
- <iconwidth>48</iconwidth>
- <iconheight>48</iconheight>
</item>
<item>
<command>i18nconf</command>
-
<name>Locale</name>
- <namex>210</namex>
- <namey>150</namey>
- <namexmax>270</namexmax>
-
<tip>For setting the keymapping</tip>
-
<icon>../Font-Capplet.png</icon>
- <iconx>210</iconx>
- <icony>100</icony>
- <iconwidth>48</iconwidth>
- <iconheight>48</iconheight>
</item>
</mcp>
--- 2,49 ----
<mcp>
<global>
</global>
<item>
! <command>./mcp ../mcp.conf2</command>
! <name>Module controls</name>
<tip>Helps you set your X settings</tip>
<icon>../Monitor.png</icon>
</item>
<item>
<command>networkconf</command>
<name>Network</name>
<tip>Helps you set your network settings</tip>
<icon>../Networking.png</icon>
</item>
<item>
<command>soundconf</command>
<name>Sound</name>
<tip>Helps you set your sound settings</tip>
<icon>../Speaker.png</icon>
</item>
<item>
<command>keybconf</command>
<name>Keyboard</name>
<tip>Helps you set your keyboard settings</tip>
<icon>../Keyboard2.png</icon>
</item>
<item>
<command>morphixinstaller</command>
<name>Harddisk Install</name>
<tip>Copy Morphix to the harddisk for usage without CD</tip>
<icon>../Harddisk.png</icon>
</item>
<item>
<command>sudo xterm</command>
<name>Root Xterminal</name>
<tip>Open a root terminal</tip>
<icon>../GNOME-Terminal-BabyTux.png</icon>
</item>
<item>
<command>i18nconf</command>
<name>Locale</name>
<tip>For setting the keymapping</tip>
<icon>../Font-Capplet.png</icon>
</item>
</mcp>
Index: mcp.glade
===================================================================
RCS file: /cvsroot/morphix/mcp2/mcp.glade,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** mcp.glade 10 Nov 2003 02:03:59 -0000 1.1.1.1
--- mcp.glade 1 Dec 2003 21:25:59 -0000 1.2
***************
*** 5,17 ****
<widget class="GtkWindow" id="MainWindow">
- <property name="width_request">400</property>
- <property name="height_request">250</property>
<property name="visible">True</property>
! <property name="title" translatable="yes">Morphix Configuration Panel</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
- <property name="default_width">400</property>
- <property name="default_height">250</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">True</property>
--- 5,13 ----
<widget class="GtkWindow" id="MainWindow">
<property name="visible">True</property>
! <property name="title" translatable="yes">Morphix Control Panel</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">True</property>
***************
*** 26,42 ****
<child>
! <widget class="GtkDrawingArea" id="MainDrawingArea">
<property name="visible">True</property>
! <signal name="button_press_event" handler="on_drawingarea1_button_press_event" last_modification_time="Sun, 29 Jun 2003 13:40:51 GMT"/>
! <signal name="drag_begin" handler="on_drawingarea1_drag_begin" last_modification_time="Sun, 29 Jun 2003 13:41:06 GMT"/>
! <signal name="drag_end" handler="on_drawingarea1_drag_end" last_modification_time="Sun, 29 Jun 2003 13:41:13 GMT"/>
! <signal name="drag_drop" handler="on_drawingarea1_drag_drop" last_modification_time="Sun, 29 Jun 2003 13:41:21 GMT"/>
! <signal name="drag_motion" handler="on_drawingarea1_drag_motion" last_modification_time="Sun, 29 Jun 2003 13:41:28 GMT"/>
! <signal name="drag_leave" handler="on_drawingarea1_drag_leave" last_modification_time="Sun, 29 Jun 2003 13:41:34 GMT"/>
! <signal name="key_press_event" handler="on_drawingarea1_key_press_event" last_modification_time="Sun, 29 Jun 2003 13:41:45 GMT"/>
! <signal name="show" handler="on_drawingarea1_show" last_modification_time="Sun, 29 Jun 2003 13:42:02 GMT"/>
! <signal name="destroy_event" handler="gtk_main_quit" last_modification_time="Sun, 29 Jun 2003 13:42:10 GMT"/>
! <signal name="button_release_event" handler="on_drawingarea1_button_release_event" last_modification_time="Sun, 29 Jun 2003 13:42:29 GMT"/>
! <signal name="expose_event" handler="on_MainDrawingArea_expose_event" last_modification_time="Sun, 29 Jun 2003 17:07:59 GMT"/>
</widget>
<packing>
--- 22,49 ----
<child>
! <widget class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
! <property name="can_focus">True</property>
! <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
! <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
! <property name="shadow_type">GTK_SHADOW_NONE</property>
! <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
!
! <child>
! <widget class="GtkDrawingArea" id="MainDrawingArea">
! <property name="visible">True</property>
! <signal name="button_press_event" handler="on_drawingarea1_button_press_event" last_modification_time="Sun, 29 Jun 2003 13:40:51 GMT"/>
! <signal name="drag_begin" handler="on_drawingarea1_drag_begin" last_modification_time="Sun, 29 Jun 2003 13:41:06 GMT"/>
! <signal name="drag_end" handler="on_drawingarea1_drag_end" last_modification_time="Sun, 29 Jun 2003 13:41:13 GMT"/>
! <signal name="drag_drop" handler="on_drawingarea1_drag_drop" last_modification_time="Sun, 29 Jun 2003 13:41:21 GMT"/>
! <signal name="drag_motion" handler="on_drawingarea1_drag_motion" last_modification_time="Sun, 29 Jun 2003 13:41:28 GMT"/>
! <signal name="drag_leave" handler="on_drawingarea1_drag_leave" last_modification_time="Sun, 29 Jun 2003 13:41:34 GMT"/>
! <signal name="key_press_event" handler="on_drawingarea1_key_press_event" last_modification_time="Sun, 29 Jun 2003 13:41:45 GMT"/>
! <signal name="show" handler="on_drawingarea1_show" last_modification_time="Sun, 29 Jun 2003 13:42:02 GMT"/>
! <signal name="destroy_event" handler="gtk_main_quit" last_modification_time="Sun, 29 Jun 2003 13:42:10 GMT"/>
! <signal name="button_release_event" handler="on_drawingarea1_button_release_event" last_modification_time="Sun, 29 Jun 2003 13:42:29 GMT"/>
! <signal name="expose_event" handler="on_MainDrawingArea_expose_event" last_modification_time="Sun, 29 Jun 2003 17:07:59 GMT"/>
! </widget>
! </child>
</widget>
<packing>
Index: translation
===================================================================
RCS file: /cvsroot/morphix/mcp2/translation,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** translation 10 Nov 2003 02:03:59 -0000 1.1.1.1
--- translation 1 Dec 2003 21:25:59 -0000 1.2
***************
*** 5,7 ****
*/
! gchar *s = N_("Morphix Configuration Panel");
--- 5,7 ----
*/
! gchar *s = N_("Morphix Control Panel");
|
|
From: <cog...@us...> - 2003-11-23 22:59:36
|
Update of /cvsroot/morphix/gpppoe-conf/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14874/src
Modified Files:
callbacks.c interface.c
Log Message:
Changed default option of Synchronous connections to off.
Index: callbacks.c
===================================================================
RCS file: /cvsroot/morphix/gpppoe-conf/src/callbacks.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** callbacks.c 23 Nov 2003 22:56:28 -0000 1.3
--- callbacks.c 23 Nov 2003 22:59:33 -0000 1.4
***************
*** 29,33 ****
acc.ethif = "eth0";
acc.conn_type = "persist";
! acc.sync = 1;
acc.echo_interval = 20;
acc.echo_retries = 20;
--- 29,33 ----
acc.ethif = "eth0";
acc.conn_type = "persist";
! acc.sync = 0;
acc.echo_interval = 20;
acc.echo_retries = 20;
Index: interface.c
===================================================================
RCS file: /cvsroot/morphix/gpppoe-conf/src/interface.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** interface.c 22 Sep 2003 22:35:22 -0000 1.2
--- interface.c 23 Nov 2003 22:59:33 -0000 1.3
***************
*** 54,58 ****
gtk_widget_show (label13);
gtk_box_pack_start (GTK_BOX (vbox6), label13, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label13), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (label13), TRUE);
--- 54,57 ----
***************
*** 156,160 ****
gtk_widget_show (label1);
gtk_box_pack_start (GTK_BOX (vbMain), label1, TRUE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label1), GTK_JUSTIFY_LEFT);
table1 = gtk_table_new (4, 2, FALSE);
--- 155,158 ----
***************
*** 169,173 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label2), 0, 0.5);
--- 167,170 ----
***************
*** 177,181 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label4), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label4), 0, 0.5);
--- 174,177 ----
***************
*** 185,189 ****
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label3), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label3), 0, 0.5);
--- 181,184 ----
***************
*** 193,197 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label5), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label5), 0, 0.5);
--- 188,191 ----
***************
*** 351,355 ****
gtk_frame_set_label_widget (GTK_FRAME (frame1), label9);
gtk_label_set_use_markup (GTK_LABEL (label9), TRUE);
- gtk_label_set_justify (GTK_LABEL (label9), GTK_JUSTIFY_LEFT);
hbox3 = gtk_hbox_new (FALSE, 0);
--- 345,348 ----
***************
*** 360,364 ****
gtk_widget_show (label11);
gtk_box_pack_start (GTK_BOX (hbox3), label11, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label11), GTK_JUSTIFY_LEFT);
gtk_misc_set_padding (GTK_MISC (label11), 2, 0);
--- 353,356 ----
***************
*** 480,484 ****
gtk_widget_show (label14);
gtk_box_pack_start (GTK_BOX (vbox9), label14, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label14), GTK_JUSTIFY_LEFT);
vbox11 = gtk_vbox_new (FALSE, 15);
--- 472,475 ----
***************
*** 493,497 ****
gtk_widget_show (label18);
gtk_box_pack_start (GTK_BOX (hbox5), label18, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label18), GTK_JUSTIFY_LEFT);
cmbAccounts = gtk_combo_new ();
--- 484,487 ----
***************
*** 516,520 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label15), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label15), 0, 0.5);
--- 506,509 ----
***************
*** 524,528 ****
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
- gtk_label_set_justify (GTK_LABEL (label16), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label16), 0, 0.5);
--- 513,516 ----
***************
*** 548,552 ****
gtk_widget_show (label17);
gtk_box_pack_start (GTK_BOX (hbox4), label17, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label17), GTK_JUSTIFY_LEFT);
entFirmware = gtk_entry_new ();
--- 536,539 ----
***************
*** 669,673 ****
gtk_box_pack_start (GTK_BOX (hbox10), label29, FALSE, FALSE, 0);
gtk_label_set_use_markup (GTK_LABEL (label29), TRUE);
- gtk_label_set_justify (GTK_LABEL (label29), GTK_JUSTIFY_LEFT);
hbox8 = gtk_hbox_new (FALSE, 12);
--- 656,659 ----
***************
*** 678,682 ****
gtk_widget_show (label26);
gtk_box_pack_start (GTK_BOX (hbox8), label26, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label26), GTK_JUSTIFY_LEFT);
sbInterval_adj = gtk_adjustment_new (20, 0, 100, 1, 10, 10);
--- 664,667 ----
***************
*** 689,693 ****
gtk_widget_show (label27);
gtk_box_pack_start (GTK_BOX (hbox8), label27, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label27), GTK_JUSTIFY_LEFT);
hbox9 = gtk_hbox_new (FALSE, 12);
--- 674,677 ----
***************
*** 698,702 ****
gtk_widget_show (label28);
gtk_box_pack_start (GTK_BOX (hbox9), label28, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label28), GTK_JUSTIFY_LEFT);
sbRetries_adj = gtk_adjustment_new (20, 1, 100, 1, 10, 10);
--- 682,685 ----
|
Update of /cvsroot/morphix/gpppoe-conf
In directory sc8-pr-cvs1:/tmp/cvs-serv13891
Modified Files:
ChangeLog Makefile Makefile.in aclocal.m4 config.h config.log
config.status configure configure.in
Log Message:
Changed function for reading and testing account files (in speedtouch section).
Index: ChangeLog
===================================================================
RCS file: /cvsroot/morphix/gpppoe-conf/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ChangeLog 22 Sep 2003 22:35:21 -0000 1.2
--- ChangeLog 23 Nov 2003 22:56:27 -0000 1.3
***************
*** 1,2 ****
--- 1,4 ----
+ 0.2.1 - Minor bugfix
+ - Changed contents dir function to glib one
0.2 - Advanced Options
- Better work on the account file and in the pppoe options (from rp-pppoe script)
Index: Makefile
===================================================================
RCS file: /cvsroot/morphix/gpppoe-conf/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile 22 Sep 2003 22:35:21 -0000 1.2
--- Makefile 23 Nov 2003 22:56:27 -0000 1.3
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.7.9 from Makefile.am.
! # Makefile. Generated from Makefile.in by configure.
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
! # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 12,55 ****
- SHELL = /bin/sh
srcdir = .
top_srcdir = .
! prefix = /usr/local
! exec_prefix = ${prefix}
!
! bindir = ${exec_prefix}/bin
! sbindir = ${exec_prefix}/sbin
! libexecdir = ${exec_prefix}/libexec
! datadir = ${prefix}/share
! sysconfdir = ${prefix}/etc
! sharedstatedir = ${prefix}/com
! localstatedir = ${prefix}/var
! libdir = ${exec_prefix}/lib
! infodir = ${prefix}/info
! mandir = ${prefix}/man
! includedir = ${prefix}/include
! oldincludedir = /usr/include
!
! DESTDIR =
!
! pkgdatadir = $(datadir)/gpppoe-account
! pkglibdir = $(libdir)/gpppoe-account
! pkgincludedir = $(includedir)/gpppoe-account
!
top_builddir = .
! ACLOCAL = aclocal-1.4
! AUTOCONF = autoconf
! AUTOMAKE = automake-1.4
! AUTOHEADER = autoheader
!
INSTALL = /usr/bin/install -c
! INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
! INSTALL_DATA = ${INSTALL} -m 644
! INSTALL_SCRIPT = ${INSTALL}
! transform = s,x,x,
!
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 14,33 ----
srcdir = .
top_srcdir = .
! pkgdatadir = $(datadir)/gpppoe-conf
! pkglibdir = $(libdir)/gpppoe-conf
! pkgincludedir = $(includedir)/gpppoe-conf
top_builddir = .
! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = /usr/bin/install -c
! install_sh_DATA = $(install_sh) -c -m 644
! install_sh_PROGRAM = $(install_sh) -c
! install_sh_SCRIPT = $(install_sh) -c
! INSTALL_HEADER = $(INSTALL_DATA)
! transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 58,81 ****
PRE_UNINSTALL = :
POST_UNINSTALL = :
! host_alias =
! host_triplet = @host@
CATALOGS =
CATOBJEXT = .gmo
CC = gcc
DATADIRNAME = share
GETTEXT_PACKAGE = pppoe-account
GMOFILES =
GMSGFMT = /usr/bin/msgfmt
! HAVE_LIB = @HAVE_LIB@
INSTOBJEXT = .mo
INTLLIBS =
! LIB = @LIB@
! LTLIB = @LTLIB@
MAINT =
! MAKEINFO = makeinfo
MKINSTALLDIRS = ./mkinstalldirs
! PACKAGE = gpppoe-account
PACKAGE_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
PACKAGE_LIBS = -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
PKG_CONFIG = /usr/bin/pkg-config
POFILES =
--- 36,92 ----
PRE_UNINSTALL = :
POST_UNINSTALL = :
! ACLOCAL = ${SHELL} /home/tiago/workspace/gpppoe-conf/missing --run aclocal-1.7
! AMDEP_FALSE = #
! AMDEP_TRUE =
! AMTAR = ${SHELL} /home/tiago/workspace/gpppoe-conf/missing --run tar
! AUTOCONF = ${SHELL} /home/tiago/workspace/gpppoe-conf/missing --run autoconf
! AUTOHEADER = ${SHELL} /home/tiago/workspace/gpppoe-conf/missing --run autoheader
! AUTOMAKE = ${SHELL} /home/tiago/workspace/gpppoe-conf/missing --run automake-1.7
! AWK = mawk
CATALOGS =
CATOBJEXT = .gmo
CC = gcc
+ CCDEPMODE = depmode=gcc3
+ CFLAGS = -g -O2
+ CPP = gcc -E
+ CPPFLAGS =
+ CYGPATH_W = echo
DATADIRNAME = share
+ DEFS = -DHAVE_CONFIG_H
+ DEPDIR = .deps
+ ECHO_C =
+ ECHO_N = -n
+ ECHO_T =
+ EGREP = grep -E
+ EXEEXT =
GETTEXT_PACKAGE = pppoe-account
GMOFILES =
GMSGFMT = /usr/bin/msgfmt
! INSTALL_DATA = ${INSTALL} -m 644
! INSTALL_PROGRAM = ${INSTALL}
! INSTALL_SCRIPT = ${INSTALL}
! INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
INSTOBJEXT = .mo
INTLLIBS =
! LDFLAGS =
! LIBOBJS =
! LIBS =
! LTLIBOBJS =
MAINT =
! MAINTAINER_MODE_FALSE = #
! MAINTAINER_MODE_TRUE =
! MAKEINFO = ${SHELL} /home/tiago/workspace/gpppoe-conf/missing --run makeinfo
MKINSTALLDIRS = ./mkinstalldirs
! MSGFMT = /usr/bin/msgfmt
! OBJEXT = o
! PACKAGE = gpppoe-conf
! PACKAGE_BUGREPORT =
PACKAGE_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
PACKAGE_LIBS = -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
+ PACKAGE_NAME =
+ PACKAGE_STRING =
+ PACKAGE_TARNAME =
+ PACKAGE_VERSION =
+ PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
POFILES =
***************
*** 83,151 ****
PO_IN_DATADIR_FALSE =
PO_IN_DATADIR_TRUE =
USE_NLS = yes
! VERSION = 0.2
SUBDIRS = src po
! EXTRA_DIST = autogen.sh pppoe-account.glade pppoe-account.gladep
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
! CONFIG_CLEAN_FILES =
! DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
! Makefile.am Makefile.in NEWS acconfig.h aclocal.m4 config.guess \
! config.h.in config.sub configure configure.in install-sh missing \
! mkinstalldirs
!
! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- TAR = tar
- GZIP_ENV = --best
- all: all-redirect
.SUFFIXES:
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
-
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
- cd $(top_builddir) \
- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
! $(ACLOCAL_M4): configure.in
! cd $(srcdir) && $(ACLOCAL)
! config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
! $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
! config.h: stamp-h
! @if test ! -f $@; then \
! rm -f stamp-h; \
! $(MAKE) stamp-h; \
! else :; fi
! stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
! cd $(top_builddir) \
! && CONFIG_FILES= CONFIG_HEADERS=config.h \
! $(SHELL) ./config.status
! @echo timestamp > stamp-h 2> /dev/null
! $(srcdir)/config.h.in: $(srcdir)/stamp-h.in
@if test ! -f $@; then \
! rm -f $(srcdir)/stamp-h.in; \
! $(MAKE) $(srcdir)/stamp-h.in; \
else :; fi
- $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
- cd $(top_srcdir) && $(AUTOHEADER)
- @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
! mostlyclean-hdr:
! clean-hdr:
distclean-hdr:
! -rm -f config.h
!
! maintainer-clean-hdr:
# This directory's subdirectories are mostly independent; you can cd
--- 94,192 ----
PO_IN_DATADIR_FALSE =
PO_IN_DATADIR_TRUE =
+ SET_MAKE =
+ SHELL = /bin/sh
+ STRIP =
USE_NLS = yes
! VERSION = 0.2.1
! XGETTEXT = /usr/bin/xgettext
! ac_ct_CC = gcc
! ac_ct_STRIP =
! am__fastdepCC_FALSE = #
! am__fastdepCC_TRUE =
! am__include = include
! am__leading_dot = .
! am__quote =
! bindir = ${exec_prefix}/bin
! build_alias =
! datadir = ${prefix}/share
! exec_prefix = ${prefix}
! host_alias =
! includedir = ${prefix}/include
! infodir = ${prefix}/info
! install_sh = /home/tiago/workspace/gpppoe-conf/install-sh
! libdir = ${exec_prefix}/lib
! libexecdir = ${exec_prefix}/libexec
! localstatedir = ${prefix}/var
! mandir = ${prefix}/man
! oldincludedir = /usr/include
! prefix = /usr/local
! program_transform_name = s,x,x,
! sbindir = ${exec_prefix}/sbin
! sharedstatedir = ${prefix}/com
! sysconfdir = ${prefix}/etc
! target_alias =
SUBDIRS = src po
! EXTRA_DIST = \
! autogen.sh \
! pppoe-account.glade \
! pppoe-account.gladep
+ subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
! CONFIG_CLEAN_FILES =
! DIST_SOURCES =
! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
! ps-recursive install-info-recursive uninstall-info-recursive \
! all-recursive install-data-recursive install-exec-recursive \
! installdirs-recursive install-recursive uninstall-recursive \
! check-recursive installcheck-recursive
! DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
! COPYING ChangeLog INSTALL Makefile.am NEWS acconfig.h \
! aclocal.m4 config.h.in configure configure.in depcomp \
! install-sh missing mkinstalldirs
! DIST_SUBDIRS = $(SUBDIRS)
! all: config.h
! $(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
! am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
! configure.lineno
! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && \
! $(AUTOMAKE) --gnu Makefile
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
! cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
! $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
! $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
! $(ACLOCAL_M4): configure.in
! cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
!
! config.h: stamp-h1
@if test ! -f $@; then \
! rm -f stamp-h1; \
! $(MAKE) stamp-h1; \
else :; fi
! stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
! @rm -f stamp-h1
! cd $(top_builddir) && $(SHELL) ./config.status config.h
! $(srcdir)/config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h
! cd $(top_srcdir) && $(AUTOHEADER)
! touch $(srcdir)/config.h.in
distclean-hdr:
! -rm -f config.h stamp-h1
! uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
***************
*** 155,165 ****
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
!
!
!
! all-recursive install-data-recursive install-exec-recursive \
! installdirs-recursive install-recursive uninstall-recursive \
! check-recursive installcheck-recursive info-recursive dvi-recursive:
! @set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
--- 196,201 ----
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
! $(RECURSIVE_TARGETS):
! @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
***************
*** 181,191 ****
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
! @set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
! rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
! rev="$$subdir $$rev"; \
! test "$$subdir" != "." || dot_seen=yes; \
done; \
! test "$$dot_seen" = "no" && rev=". $$rev"; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
--- 217,232 ----
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
! @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
! case "$@" in \
! distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
! *) list='$(SUBDIRS)' ;; \
! esac; \
! rev=''; for subdir in $$list; do \
! if test "$$subdir" = "."; then :; else \
! rev="$$subdir $$rev"; \
! fi; \
done; \
! rev="$$rev ."; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
***************
*** 203,335 ****
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP)
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! here=`pwd` && cd $(srcdir) \
! && mkid -f$$here/ID $$unique $(LISP)
! TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
! if test "$$subdir" = .; then :; else \
! test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
! fi; \
done; \
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
! mostlyclean-tags:
! clean-tags:
distclean-tags:
! -rm -f TAGS ID
!
! maintainer-clean-tags:
distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
! # This target untars the dist file and tries a VPATH configuration. Then
! # it guarantees that the distribution is self-contained by making another
! # tarfile.
! distcheck: dist
! -rm -rf $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
! mkdir $(distdir)/=build
! mkdir $(distdir)/=inst
! dc_install_base=`cd $(distdir)/=inst && pwd`; \
! cd $(distdir)/=build \
! && ../configure --srcdir=.. --prefix=$$dc_install_base \
! && $(MAKE) $(AM_MAKEFLAGS) \
! && $(MAKE) $(AM_MAKEFLAGS) dvi \
! && $(MAKE) $(AM_MAKEFLAGS) check \
! && $(MAKE) $(AM_MAKEFLAGS) install \
! && $(MAKE) $(AM_MAKEFLAGS) installcheck \
! && $(MAKE) $(AM_MAKEFLAGS) dist
! -rm -rf $(distdir)
! @banner="$(distdir).tar.gz is ready for distribution"; \
! dashes=`echo "$$banner" | sed s/./=/g`; \
! echo "$$dashes"; \
! echo "$$banner"; \
! echo "$$dashes"
! dist: distdir
! -chmod -R a+r $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
! -rm -rf $(distdir)
! dist-all: distdir
! -chmod -R a+r $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
! -rm -rf $(distdir)
distdir: $(DISTFILES)
! -rm -rf $(distdir)
mkdir $(distdir)
! -chmod 777 $(distdir)
! here=`cd $(top_builddir) && pwd`; \
! top_distdir=`cd $(distdir) && pwd`; \
! distdir=`cd $(distdir) && pwd`; \
! cd $(top_srcdir) \
! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
! @for file in $(DISTFILES); do \
! d=$(srcdir); \
if test -d $$d/$$file; then \
! cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
! for subdir in $(SUBDIRS); do \
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \
|| exit 1; \
! chmod 777 $(distdir)/$$subdir; \
! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
|| exit 1; \
fi; \
done
! $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
! info-am:
! info: info-recursive
! dvi-am:
! dvi: dvi-recursive
check-am: all-am
check: check-recursive
! installcheck-am:
! installcheck: installcheck-recursive
! all-recursive-am: config.h
! $(MAKE) $(AM_MAKEFLAGS) all-recursive
! install-exec-am:
install-exec: install-exec-recursive
-
- install-data-am: install-data-local
install-data: install-data-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
- install: install-recursive
- uninstall-am:
- uninstall: uninstall-recursive
- all-am: Makefile config.h
- all-redirect: all-recursive-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs: installdirs-recursive
- installdirs-am:
-
mostlyclean-generic:
--- 244,465 ----
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
+ ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ ETAGS = etags
+ ETAGSFLAGS =
+
+ CTAGS = ctags
+ CTAGSFLAGS =
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique
! TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
+ if (etags --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ else \
+ include_option=--include; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
! if test "$$subdir" = .; then :; else \
! test -f $$subdir/TAGS && \
! tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
! fi; \
done; \
! list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)$$tags$$unique" \
! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! $$tags $$unique
! ctags: CTAGS
! CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
! tags=; \
! here=`pwd`; \
! list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
! test -z "$(CTAGS_ARGS)$$tags$$unique" \
! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
! $$tags $$unique
! GTAGS:
! here=`$(am__cd) $(top_builddir) && pwd` \
! && cd $(top_srcdir) \
! && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ top_distdir = .
distdir = $(PACKAGE)-$(VERSION)
! am__remove_distdir = \
! { test ! -d $(distdir) \
! || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
! && rm -fr $(distdir); }; }
!
! GZIP_ENV = --best
! distuninstallcheck_listfiles = find . -type f -print
! distcleancheck_listfiles = find . -type f -print
!
distdir: $(DISTFILES)
! $(am__remove_distdir)
mkdir $(distdir)
! $(mkinstalldirs) $(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"; \
! $(mkinstalldirs) "$(distdir)$$dir"; \
! else \
! dir=''; \
! fi; \
if test -d $$d/$$file; then \
! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! fi; \
! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
fi; \
done
! list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \
|| exit 1; \
! (cd $$subdir && \
! $(MAKE) $(AM_MAKEFLAGS) \
! top_distdir="$(top_distdir)" \
! distdir=../$(distdir)/$$subdir \
! distdir) \
|| exit 1; \
fi; \
done
! $(MAKE) $(AM_MAKEFLAGS) \
! top_distdir="$(top_distdir)" distdir="$(distdir)" \
! dist-hook
! -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 $(SHELL) $(install_sh) -c -m a+r {} {} \; \
! || chmod -R a+r $(distdir)
! dist-gzip: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! $(am__remove_distdir)
!
! dist dist-all: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! $(am__remove_distdir)
!
! # This target untars the dist file and tries a VPATH configuration. Then
! # it guarantees that the distribution is self-contained by making another
! # tarfile.
! distcheck: dist
! $(am__remove_distdir)
! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
! chmod -R a-w $(distdir); chmod a+w $(distdir)
! mkdir $(distdir)/_build
! mkdir $(distdir)/_inst
! chmod a-w $(distdir)
! dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
! && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
! && cd $(distdir)/_build \
! && ../configure --srcdir=.. --prefix="$$dc_install_base" \
! $(DISTCHECK_CONFIGURE_FLAGS) \
! && $(MAKE) $(AM_MAKEFLAGS) \
! && $(MAKE) $(AM_MAKEFLAGS) dvi \
! && $(MAKE) $(AM_MAKEFLAGS) check \
! && $(MAKE) $(AM_MAKEFLAGS) install \
! && $(MAKE) $(AM_MAKEFLAGS) installcheck \
! && $(MAKE) $(AM_MAKEFLAGS) uninstall \
! && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
! distuninstallcheck \
! && chmod -R a-w "$$dc_install_base" \
! && ({ \
! (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
! distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
! } || { rm -rf "$$dc_destdir"; exit 1; }) \
! && rm -rf "$$dc_destdir" \
! && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
! && rm -f $(distdir).tar.gz \
! && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
! $(am__remove_distdir)
! @echo "$(distdir).tar.gz is ready for distribution" | \
! sed 'h;s/./=/g;p;x;p;x'
! distuninstallcheck:
! @cd $(distuninstallcheck_dir) \
! && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
! || { echo "ERROR: files left after uninstall:" ; \
! if test -n "$(DESTDIR)"; then \
! echo " (check DESTDIR support)"; \
! fi ; \
! $(distuninstallcheck_listfiles) ; \
! exit 1; } >&2
! distcleancheck: distclean
! @if test '$(srcdir)' = . ; then \
! echo "ERROR: distcleancheck can only run from a VPATH build" ; \
! exit 1 ; \
! fi
! @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
! || { echo "ERROR: files left in build directory after distclean:" ; \
! $(distcleancheck_listfiles) ; \
! exit 1; } >&2
check-am: all-am
check: check-recursive
! all-am: Makefile config.h
! installdirs: installdirs-recursive
! installdirs-am:
! install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
+ uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
***************
*** 337,378 ****
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
! -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic
! mostlyclean: mostlyclean-recursive
! clean-am: clean-hdr clean-tags clean-generic mostlyclean-am
! clean: clean-recursive
! distclean-am: distclean-hdr distclean-tags distclean-generic clean-am
! distclean: distclean-recursive
! -rm -f config.status
! maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \
! maintainer-clean-generic distclean-am
! @echo "This command is intended for maintainers to use;"
! @echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-recursive
! -rm -f config.status
! .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
! install-data-recursive uninstall-data-recursive install-exec-recursive \
! uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
! all-recursive check-recursive installcheck-recursive info-recursive \
! dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
! maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
! dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
! install-exec-am install-exec install-data-local install-data-am \
! install-data install-am install uninstall-am uninstall all-redirect \
! all-am all installdirs-am installdirs mostlyclean-generic \
! distclean-generic clean-generic maintainer-clean-generic clean \
! mostlyclean distclean maintainer-clean
--- 467,540 ----
distclean-generic:
! -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! clean: clean-recursive
! clean-am: clean-generic mostlyclean-am
! distclean: distclean-recursive
! -rm -f $(am__CONFIG_DISTCLEAN_FILES)
! -rm -f Makefile
! distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
! dvi: dvi-recursive
! dvi-am:
! info: info-recursive
! info-am:
!
! install-data-am: install-data-local
!
! install-exec-am:
!
! install-info: install-info-recursive
!
! install-man:
!
! installcheck-am:
maintainer-clean: maintainer-clean-recursive
! -rm -f $(am__CONFIG_DISTCLEAN_FILES)
! -rm -rf $(top_srcdir)/autom4te.cache
! -rm -f Makefile
! maintainer-clean-am: distclean-am maintainer-clean-generic
! mostlyclean: mostlyclean-recursive
!
! mostlyclean-am: mostlyclean-generic
!
! pdf: pdf-recursive
!
! pdf-am:
!
! ps: ps-recursive
!
! ps-am:
!
! uninstall-am: uninstall-info-am
!
! uninstall-info: uninstall-info-recursive
!
! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
! clean-generic clean-recursive ctags ctags-recursive dist \
! dist-all dist-gzip distcheck distclean distclean-generic \
! distclean-hdr distclean-recursive distclean-tags distcleancheck \
! distdir distuninstallcheck dvi dvi-am dvi-recursive info \
! info-am info-recursive install install-am install-data \
! install-data-am install-data-local install-data-recursive \
! install-exec install-exec-am install-exec-recursive \
! install-info install-info-am install-info-recursive install-man \
! install-recursive install-strip installcheck installcheck-am \
! installdirs installdirs-am installdirs-recursive \
! maintainer-clean maintainer-clean-generic \
! maintainer-clean-recursive mostlyclean mostlyclean-generic \
! mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
! ps-recursive tags tags-recursive uninstall uninstall-am \
! uninstall-info-am uninstall-info-recursive uninstall-recursive
***************
*** 397,401 ****
done \
fi
-
# 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.
--- 559,562 ----
Index: Makefile.in
===================================================================
RCS file: /cvsroot/morphix/gpppoe-conf/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.in 1 Sep 2003 19:53:23 -0000 1.1.1.1
--- Makefile.in 23 Nov 2003 22:56:27 -0000 1.2
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.7.9 from Makefile.am.
! # @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
! # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 11,55 ****
# PARTICULAR PURPOSE.
!
! SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-
- bindir = @bindir@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
- sysconfdir = @sysconfdir@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
- libdir = @libdir@
- infodir = @infodir@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
-
- DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-
top_builddir = .
! ACLOCAL = @ACLOCAL@
! AUTOCONF = @AUTOCONF@
! AUTOMAKE = @AUTOMAKE@
! AUTOHEADER = @AUTOHEADER@
!
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
! INSTALL_DATA = @INSTALL_DATA@
! INSTALL_SCRIPT = @INSTALL_SCRIPT@
! transform = @program_transform_name@
!
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 13,33 ----
# 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
! INSTALL_HEADER = $(INSTALL_DATA)
! transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 58,81 ****
PRE_UNINSTALL = :
POST_UNINSTALL = :
! host_alias = @host_alias@
! host_triplet = @host@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
DATADIRNAME = @DATADIRNAME@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
! HAVE_LIB = @HAVE_LIB@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
! LIB = @LIB@
! LTLIB = @LTLIB@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
PACKAGE = @PACKAGE@
PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
PACKAGE_LIBS = @PACKAGE_LIBS@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
--- 36,92 ----
PRE_UNINSTALL = :
POST_UNINSTALL = :
! ACLOCAL = @ACLOCAL@
! AMDEP_FALSE = @AMDEP_FALSE@
! AMDEP_TRUE = @AMDEP_TRUE@
! AMTAR = @AMTAR@
! AUTOCONF = @AUTOCONF@
! AUTOHEADER = @AUTOHEADER@
! AUTOMAKE = @AUTOMAKE@
! AWK = @AWK@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
! INSTALL_DATA = @INSTALL_DATA@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@
! INSTALL_SCRIPT = @INSTALL_SCRIPT@
! INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
! LDFLAGS = @LDFLAGS@
! LIBOBJS = @LIBOBJS@
! LIBS = @LIBS@
! LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
PACKAGE_LIBS = @PACKAGE_LIBS@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
***************
*** 83,151 ****
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
SUBDIRS = src po
! EXTRA_DIST = autogen.sh pppoe-account.glade pppoe-account.gladep
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
! CONFIG_CLEAN_FILES =
! DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
! Makefile.am Makefile.in NEWS acconfig.h aclocal.m4 config.guess \
! config.h.in config.sub configure configure.in install-sh missing \
! mkinstalldirs
!
! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- TAR = tar
- GZIP_ENV = --best
- all: all-redirect
.SUFFIXES:
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
-
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
- cd $(top_builddir) \
- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
! $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
! cd $(srcdir) && $(ACLOCAL)
! config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
! $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
! config.h: stamp-h
! @if test ! -f $@; then \
! rm -f stamp-h; \
! $(MAKE) stamp-h; \
! else :; fi
! stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
! cd $(top_builddir) \
! && CONFIG_FILES= CONFIG_HEADERS=config.h \
! $(SHELL) ./config.status
! @echo timestamp > stamp-h 2> /dev/null
! $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
@if test ! -f $@; then \
! rm -f $(srcdir)/stamp-h.in; \
! $(MAKE) $(srcdir)/stamp-h.in; \
else :; fi
- $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
- cd $(top_srcdir) && $(AUTOHEADER)
- @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
! mostlyclean-hdr:
! clean-hdr:
distclean-hdr:
! -rm -f config.h
!
! maintainer-clean-hdr:
# This directory's subdirectories are mostly independent; you can cd
--- 94,192 ----
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ XGETTEXT = @XGETTEXT@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_STRIP = @ac_ct_STRIP@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ bindir = @bindir@
+ build_alias = @build_alias@
+ datadir = @datadir@
+ exec_prefix = @exec_prefix@
+ host_alias = @host_alias@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
SUBDIRS = src po
! EXTRA_DIST = \
! autogen.sh \
! pppoe-account.glade \
! pppoe-account.gladep
+ subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
! CONFIG_CLEAN_FILES =
! DIST_SOURCES =
! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
! ps-recursive install-info-recursive uninstall-info-recursive \
! all-recursive install-data-recursive install-exec-recursive \
! installdirs-recursive install-recursive uninstall-recursive \
! check-recursive installcheck-recursive
! DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
! COPYING ChangeLog INSTALL Makefile.am NEWS acconfig.h \
! aclocal.m4 config.h.in configure configure.in depcomp \
! install-sh missing mkinstalldirs
! DIST_SUBDIRS = $(SUBDIRS)
! all: config.h
! $(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
! am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
! configure.lineno
! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && \
! $(AUTOMAKE) --gnu Makefile
! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
! cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
! $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
! $(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
! $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
! cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
!
! config.h: stamp-h1
@if test ! -f $@; then \
! rm -f stamp-h1; \
! $(MAKE) stamp-h1; \
else :; fi
! stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
! @rm -f stamp-h1
! cd $(top_builddir) && $(SHELL) ./config.status config.h
! $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h
! cd $(top_srcdir) && $(AUTOHEADER)
! touch $(srcdir)/config.h.in
distclean-hdr:
! -rm -f config.h stamp-h1
! uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
***************
*** 155,165 ****
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
!
! @SET_MAKE@
!
! all-recursive install-data-recursive install-exec-recursive \
! installdirs-recursive install-recursive uninstall-recursive \
! check-recursive installcheck-recursive info-recursive dvi-recursive:
! @set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
--- 196,201 ----
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
! $(RECURSIVE_TARGETS):
! @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
***************
*** 181,191 ****
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
! @set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
! rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
! rev="$$subdir $$rev"; \
! test "$$subdir" != "." || dot_seen=yes; \
done; \
! test "$$dot_seen" = "no" && rev=". $$rev"; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
--- 217,232 ----
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
! @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
! case "$@" in \
! distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
! *) list='$(SUBDIRS)' ;; \
! esac; \
! rev=''; for subdir in $$list; do \
! if test "$$subdir" = "."; then :; else \
! rev="$$subdir $$rev"; \
! fi; \
done; \
! rev="$$rev ."; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
***************
*** 203,335 ****
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP)
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! here=`pwd` && cd $(srcdir) \
! && mkid -f$$here/ID $$unique $(LISP)
! TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
! if test "$$subdir" = .; then :; else \
! test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
! fi; \
done; \
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
! mostlyclean-tags:
! clean-tags:
distclean-tags:
! -rm -f TAGS ID
!
! maintainer-clean-tags:
distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
! # This target untars the dist file and tries a VPATH configuration. Then
! # it guarantees that the distribution is self-contained by making another
! # tarfile.
! distcheck: dist
! -rm -rf $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
! mkdir $(distdir)/=build
! mkdir $(distdir)/=inst
! dc_install_base=`cd $(distdir)/=inst && pwd`; \
! cd $(distdir)/=build \
! && ../configure --srcdir=.. --prefix=$$dc_install_base \
! && $(MAKE) $(AM_MAKEFLAGS) \
! && $(MAKE) $(AM_MAKEFLAGS) dvi \
! && $(MAKE) $(AM_MAKEFLAGS) check \
! && $(MAKE) $(AM_MAKEFLAGS) install \
! && $(MAKE) $(AM_MAKEFLAGS) installcheck \
! && $(MAKE) $(AM_MAKEFLAGS) dist
! -rm -rf $(distdir)
! @banner="$(distdir).tar.gz is ready for distribution"; \
! dashes=`echo "$$banner" | sed s/./=/g`; \
! echo "$$dashes"; \
! echo "$$banner"; \
! echo "$$dashes"
! dist: distdir
! -chmod -R a+r $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
! -rm -rf $(distdir)
! dist-all: distdir
! -chmod -R a+r $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
! -rm -rf $(distdir)
distdir: $(DISTFILES)
! -rm -rf $(distdir)
mkdir $(distdir)
! -chmod 777 $(distdir)
! here=`cd $(top_builddir) && pwd`; \
! top_distdir=`cd $(distdir) && pwd`; \
! distdir=`cd $(distdir) && pwd`; \
! cd $(top_srcdir) \
! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
! @for file in $(DISTFILES); do \
! d=$(srcdir); \
if test -d $$d/$$file; then \
! cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
! for subdir in $(SUBDIRS); do \
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \
|| exit 1; \
! chmod 777 $(distdir)/$$subdir; \
! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
|| exit 1; \
fi; \
done
! $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
! info-am:
! info: info-recursive
! dvi-am:
! dvi: dvi-recursive
check-am: all-am
check: check-recursive
! installcheck-am:
! installcheck: installcheck-recursive
! all-recursive-am: config.h
! $(MAKE) $(AM_MAKEFLAGS) all-recursive
! install-exec-am:
install-exec: install-exec-recursive
-
- install-data-am: install-data-local
install-data: install-data-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
- install: install-recursive
- uninstall-am:
- uninstall: uninstall-recursive
- all-am: Makefile config.h
- all-redirect: all-recursive-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs: installdirs-recursive
- installdirs-am:
-
mostlyclean-generic:
--- 244,465 ----
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
+ ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ ETAGS = etags
+ ETAGSFLAGS =
+
+ CTAGS = ctags
+ CTAGSFLAGS =
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique
! TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
+ if (etags --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ else \
+ include_option=--include; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
! if test "$$subdir" = .; then :; else \
! test -f $$subdir/TAGS && \
! tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
! fi; \
done; \
! list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)$$tags$$unique" \
! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! $$tags $$unique
! ctags: CTAGS
! CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
! tags=; \
! here=`pwd`; \
! list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
! test -z "$(CTAGS_ARGS)$$tags$$unique" \
! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
! $$tags $$unique
! GTAGS:
! here=`$(am__cd) $(top_builddir) && pwd` \
! && cd $(top_srcdir) \
! && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ top_distdir = .
distdir = $(PACKAGE)-$(VERSION)
! am__remove_distdir = \
! { test ! -d $(distdir) \
! || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
! && rm -fr $(distdir); }; }
!
! GZIP_ENV = --best
! distuninstallcheck_listfiles = find . -type f -print
! distcleancheck_listfiles = find . -type f -print
!
distdir: $(DISTFILES)
! $(am__remove_distdir)
mkdir $(distdir)
! $(mkinstalldirs) $(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"; \
! $(mkinstalldirs) "$(distdir)$$dir"; \
! else \
! dir=''; \
! fi; \
if test -d $$d/$$file; then \
! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! fi; \
! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
fi; \
done
! list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \
|| exit 1; \
! (cd $$subdir && \
! $(MAKE) $(AM_MAKEFLAGS) \
! top_distdir="$(top_distdir)" \
! distdir=../$(distdir)/$$subdir \
! distdir) \
|| exit 1; \
fi; \
done
! $(MAKE) $(AM_MAKEFLAGS) \
! top_distdir="$(top_distdir)" distdir="$(distdir)" \
! dist-hook
! -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 $(SHELL) $(install_sh) -c -m a+r {} {} \; \
! || chmod -R a+r $(distdir)
! dist-gzip: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! $(am__remove_distdir)
!
! dist dist-all: distdir
! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! $(am__remove_distdir)
!
! # This target untars the dist file and tries a VPATH configuration. Then
! # it guarantees that the distribution is self-contained by making another
! # tarfile.
! distcheck: dist
! $(am__remove_distdir)
! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
! chmod -R a-w $(distdir); chmod a+w $(distdir)
! mkdir $(distdir)/_build
! mkdir $(distdir)/_inst
! chmod a-w $(distdir)
! dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
! && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
! && cd $(distdir)/_build \
! && ../configure --srcdir=.. --prefix="$$dc_install_base" \
! $(DISTCHECK_CONFIGURE_FLAGS) \
! && $(MAKE) $(AM_MAKEFLAGS) \
! && $(MAKE) $(AM_MAKEFLAGS) dvi \
! && $(MAKE) $(AM_MAKEFLAGS) check \
! && $(MAKE) $(AM_MAKEFLAGS) install \
! && $(MAKE) $(AM_MAKEFLAGS) installcheck \
! && $(MAKE) $(AM_MAKEFLAGS) uninstall \
! && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
! distuninstallcheck \
! && chmod -R a-w "$$dc_install_base" \
! && ({ \
! (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
! distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
! } || { rm -rf "$$dc_destdir"; exit 1; }) \
! && rm -rf "$$dc_destdir" \
! && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
! && rm -f $(distdir).tar.gz \
! && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
! $(am__remove_distdir)
! @echo "$(distdir).tar.gz is ready for distribution" | \
! sed 'h;s/./=/g;p;x;p;x'
! distuninstallcheck:
! @cd $(distuninstallcheck_dir) \
! && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
! || { echo "ERROR: files left after uninstall:" ; \
! if test -n "$(DESTDIR)"; then \
! echo " (check DESTDIR support)"; \
! fi ; \
! $(distuninstallcheck_listfiles) ; \
! exit 1; } >&2
! distcleancheck: distclean
! @if test '$(srcdir)' = . ; then \
! echo "ERROR: distcleancheck can only run from a VPATH build" ; \
! exit 1 ; \
! fi
! @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
! || { echo "ERROR: files left in build directory after distclean:" ; \
! $(distcleancheck_listfiles) ; \
! exit 1; } >&2
check-am: all-am
check: check-recursive
! all-am: Makefile config.h
! installdirs: installdirs-recursive
! installdirs-am:
! install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
+ uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
***************
*** 337,378 ****
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
! -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic
! mostlyclean: mostlyclean-recursive
! clean-am: clean-hdr clean-tags clean-generic mostlyclean-am
! clean: clean-recursive
! distclean-am: distclean-hdr distclean-tags distclean-generic clean-am
! distclean: distclean-recursive
! -rm -f config.status
! maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \
! maintainer-clean-generic distclean-am
! @echo "This command is intended for maintainers to use;"
! @echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-recursive
! -rm -f config.status
! .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
! install-data-recursive uninstall-data-recursive install-exec-recursive \
! uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
! all-recursive check-recursive installcheck-recursive info-recursive \
! dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
! maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
! dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
! install-exec-am install-exec install-data-local install-data-am \
! install-data install-am install uninstall-am uninstall all-redirect \
! all-am all installdirs-am installdirs mostlyclean-generic \
! distclean-generic clean-generic maintainer-clean-generic clean \
! mostlyclean distclean maintainer-clean
--- 467,540 ----
distclean-generic:
! -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! clean: clean-recursive
! clean-am: clean-generic mostlyclean-am
! distclean: distclean-recursive
! -rm -f $(am__CONFIG_DISTCLEAN_FILES)
! -rm -f Makefile
! distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
! dvi: dvi-recursive
! dvi-am:
! info: info-recursive
! info-am:
!
! install-data-am: install-data-local
!
! install-exec-am:
!
! install-info: install-info-recursive
!
! install-man:
!
! installcheck-am:
maintainer-clean: maintainer-clean-recursive
! -rm -f $(am__CONFIG_DISTCLEAN_FILES)
! -rm -rf $(top_srcdir)/autom4te.cache
! -rm -f Makefile
! maintainer-clean-am: distclean-am maintainer-clean-generic
! mostlyclean: mostlyclean-recursive
!
! mostlyclean-am: mostlyclean-generic
!
! pdf: pdf-recursive
!
! pdf-am:
!
! ps: ps-recursive
!
! ps-am:
!
! uninstall-am: uninstall-info-am
!
! uninstall-info: uninstall-info-recursive
!
! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
! clean-generic clean-recursive ctags ctags-recursive dist \
! dist-all dist-gzip distcheck distclean distclean-generic \
! distclean-hdr distclean-recursive distclean-tags distcleancheck \
! distdir distuninstallcheck dvi dvi-am dvi-recursive info \
! info-am info-recursive install install-am install-data \
! install-data-am install-data-local install-data-recursive \
! install-exec install-exec-am install-exec-recursive \
! install-info install-info-am install-info-recursive install-man \
! install-recursive install-strip installcheck installcheck-am \
! installdirs installdirs-am installdirs-recursive \
! maintainer-clean maintainer-clean-generic \
! maintainer-clean-recursive mostlyclean mostlyclean-generic \
! mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
! ps-recursive tags tags-recursive uninstall uninstall-am \
! uninstall-info-am uninstall-info-recursive uninstall-recursive
***************
*** 397,401 ****
done \
fi
-
# 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.
--- 559,562 ----
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/morphix/gpppoe-conf/aclocal.m4,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** aclocal.m4 1 Sep 2003 19:53:20 -0000 1.1.1.1
--- aclocal.m4 23 Nov 2003 22:56:27 -0000 1.2
***************
*** 1,866 ****
! dnl aclocal.m4 generated automatically by aclocal 1.4-p6
!
! dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
!
! dnl This program is distributed in the hope that it will be useful,
! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
[...1915 lines suppressed...]
AC_MSG_RESULT([none needed])
else
! AC_MSG_RESULT($am_cv_prog_cc_stdc)
fi
case "x$am_cv_prog_cc_stdc" in
--- 1024,1028 ----
AC_MSG_RESULT([none needed])
else
! AC_MSG_RESULT([$am_cv_prog_cc_stdc])
fi
case "x$am_cv_prog_cc_stdc" in
***************
*** 1122,1125 ****
--- 1031,1036 ----
esac
])
+
+ AU_DEFUN([fp_PROG_CC_STDC], [AM_PROG_CC_STDC])
Index: config.h
===================================================================
RCS file: /cvsroot/morphix/gpppoe-conf/config.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config.h 22 Sep 2003 22:35:21 -0000 1.2
--- config.h 23 Nov 2003 22:56:27 -0000 1.3
***************
*** 55,59 ****
/* Name of package */
! #define PACKAGE "gpppoe-account"
/* Define to the address where bug reports for this package should be sent. */
--- 55,59 ----
/* Name of package */
! #define PACKAGE "gpppoe-conf"
/* Define to the address where bug reports for this package should be sent. */
***************
*** 76,78 ****
/* Version number of package */
! #define VERSION "0.2"
--- 76,78 ----
/* Version number of package */
! #define VERSION "0.2.1"
Index: config.log
===================================================================
RCS file: /cvsroot/morphix/gpppoe-conf/config.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config.log 22 Sep 2003 22:35:21 -0000 1.2
--- config.log 23 Nov 2003 22:56:27 -0000 1.3
***************
*** 3,7 ****
It was created by configure, which was
! generated by GNU Autoconf 2.57. Invocation command line was
$ ./configure --enable-maintainer-mode
--- 3,7 ----
It was created by configure, which was
! generated by GNU Autoconf 2.58. Invocation command l...
[truncated message content] |
|
From: <cog...@us...> - 2003-11-23 22:56:32
|
Update of /cvsroot/morphix/gpppoe-conf/src
In directory sc8-pr-cvs1:/tmp/cvs-serv13891/src
Modified Files:
Makefile Makefile.in callbacks.c
Log Message:
Changed function for reading and testing account files (in speedtouch section).
Index: Makefile
===================================================================
RCS file: /cvsroot/morphix/gpppoe-conf/src/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile 22 Sep 2003 22:35:22 -0000 1.2
--- Makefile 23 Nov 2003 22:56:28 -0000 1.3
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.7.9 from Makefile.am.
! # src/Makefile. Generated from Makefile.in by configure.
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
! # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 12,55 ****
- SHELL = /bin/sh
srcdir = .
top_srcdir = ..
! prefix = /usr/local
! exec_prefix = ${prefix}
!
! bindir = ${exec_prefix}/bin
! sbindir = ${exec_prefix}/sbin
! libexecdir = ${exec_prefix}/libexec
! datadir = ${prefix}/share
! sysconfdir = ${prefix}/etc
! sharedstatedir = ${prefix}/com
! localstatedir = ${prefix}/var
! libdir = ${exec_prefix}/lib
! infodir = ${prefix}/info
! mandir = ${prefix}/man
! includedir = ${prefix}/include
! oldincludedir = /usr/include
!
! DESTDIR =
!
! pkgdatadir = $(datadir)/gpppoe-account
! pkglibdir = $(libdir)/gpppoe-account
! pkgincludedir = $(includedir)/gpppoe-account
!
top_builddir = ..
! ACLOCAL = aclocal-1.4
! AUTOCONF = autoconf
! AUTOMAKE = automake-1.4
! AUTOHEADER = autoheader
!
INSTALL = /usr/bin/install -c
! INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
! INSTALL_DATA = ${INSTALL} -m 644
! INSTALL_SCRIPT = ${INSTALL}
! transform = s,x,x,
!
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 14,33 ----
srcdir = .
top_srcdir = ..
! pkgdatadir = $(datadir)/gpppoe-conf
! pkglibdir = $(libdir)/gpppoe-conf
! pkgincludedir = $(includedir)/gpppoe-conf
top_builddir = ..
! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = /usr/bin/install -c
! install_sh_DATA = $(install_sh) -c -m 644
! install_sh_PROGRAM = $(install_sh) -c
! install_sh_SCRIPT = $(install_sh) -c
! INSTALL_HEADER = $(INSTALL_DATA)
! transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 58,81 ****
PRE_UNINSTALL = :
POST_UNINSTALL = :
! host_alias =
! host_triplet = @host@
CATALOGS =
CATOBJEXT = .gmo
CC = gcc
DATADIRNAME = share
GETTEXT_PACKAGE = pppoe-account
GMOFILES =
GMSGFMT = /usr/bin/msgfmt
! HAVE_LIB = @HAVE_LIB@
INSTOBJEXT = .mo
INTLLIBS =
! LIB = @LIB@
! LTLIB = @LTLIB@
MAINT =
! MAKEINFO = makeinfo
MKINSTALLDIRS = ./mkinstalldirs
! PACKAGE = gpppoe-account
PACKAGE_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
PACKAGE_LIBS = -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
PKG_CONFIG = /usr/bin/pkg-config
POFILES =
--- 36,92 ----
PRE_UNINSTALL = :
POST_UNINSTALL = :
! ACLOCAL = ${SHELL} /home/tiago/workspace/gpppoe-conf/missing --run aclocal-1.7
! AMDEP_FALSE = #
! AMDEP_TRUE =
! AMTAR = ${SHELL} /home/tiago/workspace/gpppoe-conf/missing --run tar
! AUTOCONF = ${SHELL} /home/tiago/workspace/gpppoe-conf/missing --run autoconf
! AUTOHEADER = ${SHELL} /home/tiago/workspace/gpppoe-conf/missing --run autoheader
! AUTOMAKE = ${SHELL} /home/tiago/workspace/gpppoe-conf/missing --run automake-1.7
! AWK = mawk
CATALOGS =
CATOBJEXT = .gmo
CC = gcc
+ CCDEPMODE = depmode=gcc3
+ CFLAGS = -g -O2
+ CPP = gcc -E
+ CPPFLAGS =
+ CYGPATH_W = echo
DATADIRNAME = share
+ DEFS = -DHAVE_CONFIG_H
+ DEPDIR = .deps
+ ECHO_C =
+ ECHO_N = -n
+ ECHO_T =
+ EGREP = grep -E
+ EXEEXT =
GETTEXT_PACKAGE = pppoe-account
GMOFILES =
GMSGFMT = /usr/bin/msgfmt
! INSTALL_DATA = ${INSTALL} -m 644
! INSTALL_PROGRAM = ${INSTALL}
! INSTALL_SCRIPT = ${INSTALL}
! INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
INSTOBJEXT = .mo
INTLLIBS =
! LDFLAGS =
! LIBOBJS =
! LIBS =
! LTLIBOBJS =
MAINT =
! MAINTAINER_MODE_FALSE = #
! MAINTAINER_MODE_TRUE =
! MAKEINFO = ${SHELL} /home/tiago/workspace/gpppoe-conf/missing --run makeinfo
MKINSTALLDIRS = ./mkinstalldirs
! MSGFMT = /usr/bin/msgfmt
! OBJEXT = o
! PACKAGE = gpppoe-conf
! PACKAGE_BUGREPORT =
PACKAGE_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
PACKAGE_LIBS = -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
+ PACKAGE_NAME =
+ PACKAGE_STRING =
+ PACKAGE_TARNAME =
+ PACKAGE_VERSION =
+ PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
POFILES =
***************
*** 83,155 ****
PO_IN_DATADIR_FALSE =
PO_IN_DATADIR_TRUE =
USE_NLS = yes
! VERSION = 0.2
! INCLUDES = -DPACKAGE_DATA_DIR=\""$(datadir)"\" -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
! bin_PROGRAMS = gpppoe-account
! gpppoe_account_SOURCES = main.c support.c support.h interface.c interface.h callbacks.c callbacks.h config-writer.c config-writer.h
! gpppoe_account_LDADD = -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 $(INTLLIBS)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = ../config.h
! CONFIG_CLEAN_FILES =
! PROGRAMS = $(bin_PROGRAMS)
! DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
! CPPFLAGS =
! LDFLAGS =
! LIBS =
! gpppoe_account_OBJECTS = main.o support.o interface.o callbacks.o \
! config-writer.o
! gpppoe_account_DEPENDENCIES =
! gpppoe_account_LDFLAGS =
! CFLAGS = -g -O2
! COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
! LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
! DIST_COMMON = Makefile.am Makefile.in
!
!
! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
! TAR = tar
! GZIP_ENV = --best
! DEP_FILES = .deps/callbacks.P .deps/config-writer.P .deps/interface.P \
! .deps/main.P .deps/support.P
! SOURCES = $(gpppoe_account_SOURCES)
! OBJECTS = $(gpppoe_account_OBJECTS)
- all: all-redirect
.SUFFIXES:
! .SUFFIXES: .S .c .o .s
! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
!
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
! cd $(top_builddir) \
! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
!
!
! mostlyclean-binPROGRAMS:
!
! clean-binPROGRAMS:
! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
!
! distclean-binPROGRAMS:
!
! maintainer-clean-binPROGRAMS:
!
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
! if test -f $$p; then \
! echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
! $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
else :; fi; \
done
--- 94,196 ----
PO_IN_DATADIR_FALSE =
PO_IN_DATADIR_TRUE =
+ SET_MAKE =
+ SHELL = /bin/sh
+ STRIP =
USE_NLS = yes
! VERSION = 0.2.1
! XGETTEXT = /usr/bin/xgettext
! ac_ct_CC = gcc
! ac_ct_STRIP =
! am__fastdepCC_FALSE = #
! am__fastdepCC_TRUE =
! am__include = include
! am__leading_dot = .
! am__quote =
! bindir = ${exec_prefix}/bin
! build_alias =
! datadir = ${prefix}/share
! exec_prefix = ${prefix}
! host_alias =
! includedir = ${prefix}/include
! infodir = ${prefix}/info
! install_sh = /home/tiago/workspace/gpppoe-conf/install-sh
! libdir = ${exec_prefix}/lib
! libexecdir = ${exec_prefix}/libexec
! localstatedir = ${prefix}/var
! mandir = ${prefix}/man
! oldincludedir = /usr/include
! prefix = /usr/local
! program_transform_name = s,x,x,
! sbindir = ${exec_prefix}/sbin
! sharedstatedir = ${prefix}/com
! sysconfdir = ${prefix}/etc
! target_alias =
! INCLUDES = \
! -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
! -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
! -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
! bin_PROGRAMS = gpppoe-conf
! gpppoe_conf_SOURCES = \
! main.c \
! support.c support.h \
! interface.c interface.h \
! callbacks.c callbacks.h \
! config-writer.c config-writer.h
! gpppoe_conf_LDADD = -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 $(INTLLIBS)
! subdir = src
! ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = $(top_builddir)/config.h
! CONFIG_CLEAN_FILES =
! bin_PROGRAMS = gpppoe-conf$(EXEEXT)
! PROGRAMS = $(bin_PROGRAMS)
+ am_gpppoe_conf_OBJECTS = main.$(OBJEXT) support.$(OBJEXT) \
+ interface.$(OBJEXT) callbacks.$(OBJEXT) config-writer.$(OBJEXT)
+ gpppoe_conf_OBJECTS = $(am_gpppoe_conf_OBJECTS)
+ gpppoe_conf_DEPENDENCIES =
+ gpppoe_conf_LDFLAGS =
! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
! depcomp = $(SHELL) $(top_srcdir)/depcomp
! am__depfiles_maybe = depfiles
! DEP_FILES = ./$(DEPDIR)/callbacks.Po \
! ./$(DEPDIR)/config-writer.Po \
! ./$(DEPDIR)/interface.Po ./$(DEPDIR)/main.Po \
! ./$(DEPDIR)/support.Po
! COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
! $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
! LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
! DIST_SOURCES = $(gpppoe_conf_SOURCES)
! DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
! SOURCES = $(gpppoe_conf_SOURCES)
! all: all-am
.SUFFIXES:
! .SUFFIXES: .c .o .obj
! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && \
! $(AUTOMAKE) --gnu src/Makefile
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
! binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
! p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
! if test -f $$p \
! ; then \
! f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
! echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
! $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
else :; fi; \
done
***************
*** 157,292 ****
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
! list='$(bin_PROGRAMS)'; for p in $$list; do \
! rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done
! .s.o:
! $(COMPILE) -c $<
!
! .S.o:
! $(COMPILE) -c $<
mostlyclean-compile:
! -rm -f *.o core *.core
!
! clean-compile:
distclean-compile:
-rm -f *.tab.c
! maintainer-clean-compile:
! gpppoe-account: $(gpppoe_account_OBJECTS) $(gpppoe_account_DEPENDENCIES)
! @rm -f gpppoe-account
! $(LINK) $(gpppoe_account_LDFLAGS) $(gpppoe_account_OBJECTS) $(gpppoe_account_LDADD) $(LIBS)
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP)
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! here=`pwd` && cd $(srcdir) \
! && mkid -f$$here/ID $$unique $(LISP)
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
! mostlyclean-tags:
! clean-tags:
distclean-tags:
! -rm -f TAGS ID
!
! maintainer-clean-tags:
!
! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
! subdir = src
distdir: $(DISTFILES)
! here=`cd $(top_builddir) && pwd`; \
! top_distdir=`cd $(top_distdir) && pwd`; \
! distdir=`cd $(distdir) && pwd`; \
! cd $(top_srcdir) \
! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
! @for file in $(DISTFILES); do \
! d=$(srcdir); \
if test -d $$d/$$file; then \
! cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
-
- DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
- -include $(DEP_FILES)
-
- mostlyclean-depend:
-
- clean-depend:
-
- distclean-depend:
- -rm -rf .deps
-
- maintainer-clean-depend:
-
- %.o: %.c
- @echo '$(COMPILE) -c $<'; \
- $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
- @-cp .deps/$(*F).pp .deps/$(*F).P; \
- tr ' ' '\012' < .deps/$(*F).pp \
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
- >> .deps/$(*F).P; \
- rm .deps/$(*F).pp
-
- %.lo: %.c
- @echo '$(LTCOMPILE) -c $<'; \
- $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
- @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
- < .deps/$(*F).pp > .deps/$(*F).P; \
- tr ' ' '\012' < .deps/$(*F).pp \
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
- >> .deps/$(*F).P; \
- rm -f .deps/$(*F).pp
- info-am:
- info: info-am
- dvi-am:
- dvi: dvi-am
check-am: all-am
check: check-am
! installcheck-am:
! installcheck: installcheck-am
! install-exec-am: install-binPROGRAMS
! install-exec: install-exec-am
! install-data-am:
install-data: install-data-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
- install: install-am
- uninstall-am: uninstall-binPROGRAMS
- uninstall: uninstall-am
- all-am: Makefile $(PROGRAMS)
- all-redirect: all-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
- $(mkinstalldirs) $(DESTDIR)$(bindir)
-
mostlyclean-generic:
--- 198,353 ----
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
! @list='$(bin_PROGRAMS)'; for p in $$list; do \
! f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
! echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
! rm -f $(DESTDIR)$(bindir)/$$f; \
done
! clean-binPROGRAMS:
! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
! gpppoe-conf$(EXEEXT): $(gpppoe_conf_OBJECTS) $(gpppoe_conf_DEPENDENCIES)
! @rm -f gpppoe-conf$(EXEEXT)
! $(LINK) $(gpppoe_conf_LDFLAGS) $(gpppoe_conf_OBJECTS) $(gpppoe_conf_LDADD) $(LIBS)
mostlyclean-compile:
! -rm -f *.$(OBJEXT) core *.core
distclean-compile:
-rm -f *.tab.c
! include ./$(DEPDIR)/callbacks.Po
! include ./$(DEPDIR)/config-writer.Po
! include ./$(DEPDIR)/interface.Po
! include ./$(DEPDIR)/main.Po
! include ./$(DEPDIR)/support.Po
! .c.o:
! if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
! then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
! else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! fi
! # source='$<' object='$@' libtool=no \
! # depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
! # $(CCDEPMODE) $(depcomp) \
! # $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
!
! .c.obj:
! if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
! then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
! else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! fi
! # source='$<' object='$@' libtool=no \
! # depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
! # $(CCDEPMODE) $(depcomp) \
! # $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
! uninstall-info-am:
!
! ETAGS = etags
! ETAGSFLAGS =
!
! CTAGS = ctags
! CTAGSFLAGS =
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)$$tags$$unique" \
! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! $$tags $$unique
! ctags: CTAGS
! CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
! tags=; \
! here=`pwd`; \
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
! test -z "$(CTAGS_ARGS)$$tags$$unique" \
! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
! $$tags $$unique
! GTAGS:
! here=`$(am__cd) $(top_builddir) && pwd` \
! && cd $(top_srcdir) \
! && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
! top_distdir = ..
! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
! @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"; \
! $(mkinstalldirs) "$(distdir)$$dir"; \
! else \
! dir=''; \
! fi; \
if test -d $$d/$$file; then \
! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! fi; \
! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
fi; \
done
check-am: all-am
check: check-am
! all-am: Makefile $(PROGRAMS)
! installdirs:
! $(mkinstalldirs) $(DESTDIR)$(bindir)
! install: install-am
! install-exec: install-exec-am
install-data: install-data-am
+ uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
***************
*** 294,337 ****
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
! -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \
! mostlyclean-tags mostlyclean-depend mostlyclean-generic
! mostlyclean: mostlyclean-am
! clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \
! clean-generic mostlyclean-am
! clean: clean-am
! distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \
! distclean-depend distclean-generic clean-am
! distclean: distclean-am
! maintainer-clean-am: maintainer-clean-binPROGRAMS \
! maintainer-clean-compile maintainer-clean-tags \
! maintainer-clean-depend maintainer-clean-generic \
! distclean-am
! @echo "This command is intended for maintainers to use;"
! @echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
! .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
! maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
! mostlyclean-compile distclean-compile clean-compile \
! maintainer-clean-compile tags mostlyclean-tags distclean-tags \
! clean-tags maintainer-clean-tags distdir mostlyclean-depend \
! distclean-depend clean-depend maintainer-clean-depend info-am info \
! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
! install-exec install-data-am install-data install-am install \
! uninstall-am uninstall all-redirect all-am all installdirs \
! mostlyclean-generic distclean-generic clean-generic \
! maintainer-clean-generic clean mostlyclean distclean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 355,420 ----
distclean-generic:
! -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! clean: clean-am
! clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
! distclean: distclean-am
! -rm -rf ./$(DEPDIR)
! -rm -f Makefile
! distclean-am: clean-am distclean-compile distclean-generic \
! distclean-tags
! dvi: dvi-am
! dvi-am:
! info: info-am
! info-am:
!
! install-data-am:
!
! install-exec-am: install-binPROGRAMS
!
! install-info: install-info-am
!
! install-man:
!
! installcheck-am:
maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
! mostlyclean: mostlyclean-am
!
! mostlyclean-am: mostlyclean-compile mostlyclean-generic
!
! pdf: pdf-am
!
! pdf-am:
+ ps: ps-am
+
+ ps-am:
+
+ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic ctags distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am info \
+ info-am install install-am install-binPROGRAMS install-data \
+ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/morphix/gpppoe-conf/src/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.in 22 Sep 2003 22:35:22 -0000 1.2
--- Makefile.in 23 Nov 2003 22:56:28 -0000 1.3
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.7.9 from Makefile.am.
! # @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
! # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 11,55 ****
# PARTICULAR PURPOSE.
!
! SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-
- bindir = @bindir@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
- sysconfdir = @sysconfdir@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
- libdir = @libdir@
- infodir = @infodir@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
-
- DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-
top_builddir = ..
! ACLOCAL = @ACLOCAL@
! AUTOCONF = @AUTOCONF@
! AUTOMAKE = @AUTOMAKE@
! AUTOHEADER = @AUTOHEADER@
!
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
! INSTALL_DATA = @INSTALL_DATA@
! INSTALL_SCRIPT = @INSTALL_SCRIPT@
! transform = @program_transform_name@
!
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 13,33 ----
# 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
! INSTALL_HEADER = $(INSTALL_DATA)
! transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 58,81 ****
PRE_UNINSTALL = :
POST_UNINSTALL = :
! host_alias = @host_alias@
! host_triplet = @host@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
DATADIRNAME = @DATADIRNAME@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
! HAVE_LIB = @HAVE_LIB@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
! LIB = @LIB@
! LTLIB = @LTLIB@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
PACKAGE = @PACKAGE@
PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
PACKAGE_LIBS = @PACKAGE_LIBS@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
--- 36,92 ----
PRE_UNINSTALL = :
POST_UNINSTALL = :
! ACLOCAL = @ACLOCAL@
! AMDEP_FALSE = @AMDEP_FALSE@
! AMDEP_TRUE = @AMDEP_TRUE@
! AMTAR = @AMTAR@
! AUTOCONF = @AUTOCONF@
! AUTOHEADER = @AUTOHEADER@
! AUTOMAKE = @AUTOMAKE@
! AWK = @AWK@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
! INSTALL_DATA = @INSTALL_DATA@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@
! INSTALL_SCRIPT = @INSTALL_SCRIPT@
! INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
! LDFLAGS = @LDFLAGS@
! LIBOBJS = @LIBOBJS@
! LIBS = @LIBS@
! LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
PACKAGE_LIBS = @PACKAGE_LIBS@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POFILES = @POFILES@
***************
*** 83,155 ****
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
! INCLUDES = -DPACKAGE_DATA_DIR=\""$(datadir)"\" -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" @PACKAGE_CFLAGS@
! bin_PROGRAMS = gpppoe-account
! gpppoe_account_SOURCES = main.c support.c support.h interface.c interface.h callbacks.c callbacks.h config-writer.c config-writer.h
! gpppoe_account_LDADD = @PACKAGE_LIBS@ $(INTLLIBS)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = ../config.h
! CONFIG_CLEAN_FILES =
! PROGRAMS = $(bin_PROGRAMS)
! DEFS = @DEFS@ -I. -I$(srcdir) -I..
! CPPFLAGS = @CPPFLAGS@
! LDFLAGS = @LDFLAGS@
! LIBS = @LIBS@
! gpppoe_account_OBJECTS = main.o support.o interface.o callbacks.o \
! config-writer.o
! gpppoe_account_DEPENDENCIES =
! gpppoe_account_LDFLAGS =
! CFLAGS = @CFLAGS@
! COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
! LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
! DIST_COMMON = Makefile.am Makefile.in
!
!
! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
! TAR = tar
! GZIP_ENV = --best
! DEP_FILES = .deps/callbacks.P .deps/config-writer.P .deps/interface.P \
! .deps/main.P .deps/support.P
! SOURCES = $(gpppoe_account_SOURCES)
! OBJECTS = $(gpppoe_account_OBJECTS)
- all: all-redirect
.SUFFIXES:
! .SUFFIXES: .S .c .o .s
! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
!
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
! cd $(top_builddir) \
! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
!
!
! mostlyclean-binPROGRAMS:
!
! clean-binPROGRAMS:
! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
!
! distclean-binPROGRAMS:
!
! maintainer-clean-binPROGRAMS:
!
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
! if test -f $$p; then \
! echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
! $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
else :; fi; \
done
--- 94,196 ----
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+ XGETTEXT = @XGETTEXT@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_STRIP = @ac_ct_STRIP@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ bindir = @bindir@
+ build_alias = @build_alias@
+ datadir = @datadir@
+ exec_prefix = @exec_prefix@
+ host_alias = @host_alias@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
! INCLUDES = \
! -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
! -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
! @PACKAGE_CFLAGS@
! bin_PROGRAMS = gpppoe-conf
! gpppoe_conf_SOURCES = \
! main.c \
! support.c support.h \
! interface.c interface.h \
! callbacks.c callbacks.h \
! config-writer.c config-writer.h
! gpppoe_conf_LDADD = @PACKAGE_LIBS@ $(INTLLIBS)
! subdir = src
! ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = $(top_builddir)/config.h
! CONFIG_CLEAN_FILES =
! bin_PROGRAMS = gpppoe-conf$(EXEEXT)
! PROGRAMS = $(bin_PROGRAMS)
+ am_gpppoe_conf_OBJECTS = main.$(OBJEXT) support.$(OBJEXT) \
+ interface.$(OBJEXT) callbacks.$(OBJEXT) config-writer.$(OBJEXT)
+ gpppoe_conf_OBJECTS = $(am_gpppoe_conf_OBJECTS)
+ gpppoe_conf_DEPENDENCIES =
+ gpppoe_conf_LDFLAGS =
! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
! depcomp = $(SHELL) $(top_srcdir)/depcomp
! am__depfiles_maybe = depfiles
! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/callbacks.Po \
! @AMDEP_TRUE@ ./$(DEPDIR)/config-writer.Po \
! @AMDEP_TRUE@ ./$(DEPDIR)/interface.Po ./$(DEPDIR)/main.Po \
! @AMDEP_TRUE@ ./$(DEPDIR)/support.Po
! COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
! $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
! LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
! DIST_SOURCES = $(gpppoe_conf_SOURCES)
! DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
! SOURCES = $(gpppoe_conf_SOURCES)
! all: all-am
.SUFFIXES:
! .SUFFIXES: .c .o .obj
! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && \
! $(AUTOMAKE) --gnu src/Makefile
! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
! binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
! p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
! if test -f $$p \
! ; then \
! f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
! echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
! $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
else :; fi; \
done
***************
*** 157,292 ****
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
! list='$(bin_PROGRAMS)'; for p in $$list; do \
! rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done
! .s.o:
! $(COMPILE) -c $<
!
! .S.o:
! $(COMPILE) -c $<
mostlyclean-compile:
! -rm -f *.o core *.core
!
! clean-compile:
distclean-compile:
-rm -f *.tab.c
! maintainer-clean-compile:
! gpppoe-account: $(gpppoe_account_OBJECTS) $(gpppoe_account_DEPENDENCIES)
! @rm -f gpppoe-account
! $(LINK) $(gpppoe_account_LDFLAGS) $(gpppoe_account_OBJECTS) $(gpppoe_account_LDADD) $(LIBS)
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP)
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! here=`pwd` && cd $(srcdir) \
! && mkid -f$$here/ID $$unique $(LISP)
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
! mostlyclean-tags:
! clean-tags:
distclean-tags:
! -rm -f TAGS ID
!
! maintainer-clean-tags:
!
! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
! subdir = src
distdir: $(DISTFILES)
! here=`cd $(top_builddir) && pwd`; \
! top_distdir=`cd $(top_distdir) && pwd`; \
! distdir=`cd $(distdir) && pwd`; \
! cd $(top_srcdir) \
! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
! @for file in $(DISTFILES); do \
! d=$(srcdir); \
if test -d $$d/$$file; then \
! cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
-
- DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
- -include $(DEP_FILES)
-
- mostlyclean-depend:
-
- clean-depend:
-
- distclean-depend:
- -rm -rf .deps
-
- maintainer-clean-depend:
-
- %.o: %.c
- @echo '$(COMPILE) -c $<'; \
- $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
- @-cp .deps/$(*F).pp .deps/$(*F).P; \
- tr ' ' '\012' < .deps/$(*F).pp \
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
- >> .deps/$(*F).P; \
- rm .deps/$(*F).pp
-
- %.lo: %.c
- @echo '$(LTCOMPILE) -c $<'; \
- $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
- @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
- < .deps/$(*F).pp > .deps/$(*F).P; \
- tr ' ' '\012' < .deps/$(*F).pp \
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
- >> .deps/$(*F).P; \
- rm -f .deps/$(*F).pp
- info-am:
- info: info-am
- dvi-am:
- dvi: dvi-am
check-am: all-am
check: check-am
! installcheck-am:
! installcheck: installcheck-am
! install-exec-am: install-binPROGRAMS
! install-exec: install-exec-am
! install-data-am:
install-data: install-data-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
- install: install-am
- uninstall-am: uninstall-binPROGRAMS
- uninstall: uninstall-am
- all-am: Makefile $(PROGRAMS)
- all-redirect: all-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
- $(mkinstalldirs) $(DESTDIR)$(bindir)
-
mostlyclean-generic:
--- 198,353 ----
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
! @list='$(bin_PROGRAMS)'; for p in $$list; do \
! f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
! echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
! rm -f $(DESTDIR)$(bindir)/$$f; \
done
! clean-binPROGRAMS:
! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
! gpppoe-conf$(EXEEXT): $(gpppoe_conf_OBJECTS) $(gpppoe_conf_DEPENDENCIES)
! @rm -f gpppoe-conf$(EXEEXT)
! $(LINK) $(gpppoe_conf_LDFLAGS) $(gpppoe_conf_OBJECTS) $(gpppoe_conf_LDADD) $(LIBS)
mostlyclean-compile:
! -rm -f *.$(OBJEXT) core *.core
distclean-compile:
-rm -f *.tab.c
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config-writer.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interface.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/support.Po@am__quote@
! .c.o:
! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCC_TRUE@ fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
!
! .c.obj:
! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCC_TRUE@ fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
! uninstall-info-am:
!
! ETAGS = etags
! ETAGSFLAGS =
!
! CTAGS = ctags
! CTAGSFLAGS =
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)$$tags$$unique" \
! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! $$tags $$unique
! ctags: CTAGS
! CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
! tags=; \
! here=`pwd`; \
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
! test -z "$(CTAGS_ARGS)$$tags$$unique" \
! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
! $$tags $$unique
! GTAGS:
! here=`$(am__cd) $(top_builddir) && pwd` \
! && cd $(top_srcdir) \
! && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
! top_distdir = ..
! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
! @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"; \
! $(mkinstalldirs) "$(distdir)$$dir"; \
! else \
! dir=''; \
! fi; \
if test -d $$d/$$file; then \
! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! fi; \
! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
fi; \
done
check-am: all-am
check: check-am
! all-am: Makefile $(PROGRAMS)
! installdirs:
! $(mkinstalldirs) $(DESTDIR)$(bindir)
! install: install-am
! install-exec: install-exec-am
install-data: install-data-am
+ uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
***************
*** 294,337 ****
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
! -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \
! mostlyclean-tags mostlyclean-depend mostlyclean-generic
! mostlyclean: mostlyclean-am
! clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \
! clean-generic mostlyclean-am
! clean: clean-am
! distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \
! distclean-depend distclean-generic clean-am
! distclean: distclean-am
! maintainer-clean-am: maintainer-clean-binPROGRAMS \
! maintainer-clean-compile maintainer-clean-tags \
! maintainer-clean-depend maintainer-clean-generic \
! distclean-am
! @echo "This command is intended for maintainers to use;"
! @echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
! .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
! maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
! mostlyclean-compile distclean-compile clean-compile \
! maintainer-clean-compile tags mostlyclean-tags distclean-tags \
! clean-tags maintainer-clean-tags distdir mostlyclean-depend \
! distclean-depend clean-depend maintainer-clean-depend info-am info \
! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
! install-exec install-data-am install-data install-am install \
! uninstall-am uninstall all-redirect all-am all installdirs \
! mostlyclean-generic distclean-generic clean-generic \
! maintainer-clean-generic clean mostlyclean distclean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 355,420 ----
distclean-generic:
! -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! clean: clean-am
! clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
! distclean: distclean-am
! -rm -rf ./$(DEPDIR)
! -rm -f Makefile
! distclean-am: clean-am distclean-compile distclean-generic \
! distclean-tags
! dvi: dvi-am
! dvi-am:
! info: info-am
! info-am:
!
! install-data-am:
!
! install-exec-am: install-binPROGRAMS
!
! install-info: install-info-am
!
! install-man:
!
! installcheck-am:
maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
! mostlyclean: mostlyclean-am
!
! mostlyclean-am: mostlyclean-compile mostlyclean-generic
!
! pdf: pdf-am
!
! pdf-am:
+ ps: ps-am
+
+ ps-am:
+
+ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic ctags distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am info \
+ info-am install install-am install-binPROGRAMS install-data \
+ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: callbacks.c
===================================================================
RCS file: /cvsroot/morphix/gpppoe-conf/src/callbacks.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** callbacks.c 22 Sep 2003 22:35:22 -0000 1.2
--- callbacks.c 23 Nov 2003 22:56:28 -0000 1.3
***************
*** 35,39 ****
speedtouch.account = "pppoe_account";
! speedtouch.firmware = "/usr/share/mgmt.o";
speedtouch.vpi = 0;
speedtouch.vci = 35;
--- 35,39 ----
speedtouch.account = "pppoe_account";
! speedtouch.firmware = "/usr/share/speedtouch/mgmt.o";
speedtouch.vpi = 0;
speedtouch.vci = 35;
***************
*** 74,89 ****
// Combo box is created:
GtkWidget *cmbAccounts = lookup_widget(GTK_WIDGET(wndSpeedtouch), "cmbAccounts");
! static DIR *accounts = NULL;
! struct dirent *entry;
GList *lst_accounts = NULL;
! if(accounts == NULL)
! accounts = opendir("/etc/ppp/peers");
! else
! rewinddir(accounts);
! while( (entry = readdir(accounts)) != NULL) {
! if(entry->d_type == DT_REG) {
! lst_accounts = g_list_append(lst_accounts, entry->d_name);
! }
}
gtk_combo_set_popdown_strings (GTK_COMBO (cmbAccounts), lst_accounts);
}
--- 74,90 ----
// Combo box is created:
GtkWidget *cmbAccounts = lookup_widget(GTK_WIDGET(wndSpeedtouch), "cmbAccounts");
! GDir *accounts = NULL;
GList *lst_accounts = NULL;
! accounts = g_dir_open("/etc/ppp/peers", 0, NULL);
! gchar *abs_file = NULL, *name = NULL;
!
! while( (name = (gchar *) g_dir_read_name(accounts)) != NULL) {
! abs_file = g_strconcat("/etc/ppp/peers/", name, NULL);
! if(g_file_test(abs_file, G_FILE_TEST_IS_REGULAR))
! lst_accounts = g_list_append(lst_accounts, g_strdup(name));
! g_free(abs_file);
}
+ g_dir_close(accounts);
+
gtk_combo_set_popdown_strings (GTK_COMBO (cmbAccounts), lst_accounts);
}
|
|
From: <cog...@us...> - 2003-11-23 22:56:31
|
Update of /cvsroot/morphix/gpppoe-conf/autom4te.cache
In directory sc8-pr-cvs1:/tmp/cvs-serv13891/autom4te.cache
Modified Files:
output.0 requests traces.0
Log Message:
Changed function for reading and testing account files (in speedtouch section).
Index: output.0
===================================================================
RCS file: /cvsroot/morphix/gpppoe-conf/autom4te.cache/output.0,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** output.0 22 Sep 2003 22:35:22 -0000 1.2
--- output.0 23 Nov 2003 22:56:27 -0000 1.3
***************
*** 1,8 ****
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
! @%:@ Generated by GNU Autoconf 2.57.
@%:@
! @%:@ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
! @%:@ Free Software Foundation, Inc.
@%:@ This configure script is free software; the Free Software Foundation
@%:@ gives unlimited permission to copy, distribute and modify it.
--- 1,7 ----
@%:@! /bin/sh
[...4003 lines suppressed...]
! echo X"$as_dir" |
! sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
! /^X\(\/\/\)[^/].*/{ s//\1/; q; }
! /^X\(\/\/\)$/{ s//\1/; q; }
! /^X\(\/\).*/{ s//\1/; q; }
! s/.*/./; q'`
! done
! test ! -n "$as_dirs" || mkdir $as_dirs
! fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
! echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
! { (exit 1); exit 1; }; }; }
!
! # echo "creating $dirpart/$file"
! echo '# dummy' > "$dirpart/$file"
! done
! done
! ;;
! default-1 ) case "$CONFIG_FILES" in *po/Makefile.in*)
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
esac ;;
Index: requests
===================================================================
RCS file: /cvsroot/morphix/gpppoe-conf/autom4te.cache/requests,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** requests 22 Sep 2003 22:35:22 -0000 1.2
--- requests 23 Nov 2003 22:56:27 -0000 1.3
***************
*** 1,3 ****
! # This file was created by autom4te.
# It contains the lists of macros which have been traced.
# It can be safely removed.
--- 1,3 ----
! # This file was generated by Autom4te Wed Nov 19 23:55:15 PST 2003.
# It contains the lists of macros which have been traced.
# It can be safely removed.
***************
*** 17,40 ****
{
'm4_pattern_forbid' => 1,
! 'AC_TYPE_OFF_T' => 1,
'AC_C_VOLATILE' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1,
- 'AC_HEADER_TIME' => 1,
'AC_FUNC_WAIT3' => 1,
! 'AM_AUTOMAKE_VERSION' => 1,
! 'AC_STRUCT_TM' => 1,
'AC_FUNC_LSTAT' => 1,
! 'AC_TYPE_MODE_T' => 1,
'AC_FUNC_GETMNTENT' => 1,
'AC_FUNC_STRTOD' => 1,
'AC_CHECK_HEADERS' => 1,
'AC_FUNC_STRNLEN' => 1,
'AC_PROG_CXX' => 1,
'AC_PATH_X' => 1,
'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
'AC_PROG_AWK' => 1,
'AC_HEADER_STDC' => 1,
'AC_HEADER_MAJOR' => 1,
--- 17,43 ----
{
'm4_pattern_forbid' => 1,
! 'AC_CONFIG_LIBOBJ_DIR' => 1,
'AC_C_VOLATILE' => 1,
+ 'AC_TYPE_OFF_T' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1,
'AC_FUNC_WAIT3' => 1,
! 'AC_HEADER_TIME' => 1,
'AC_FUNC_LSTAT' => 1,
! 'AC_STRUCT_TM' => 1,
! 'AM_AUTOMAKE_VERSION' => 1,
'AC_FUNC_GETMNTENT' => 1,
+ 'AC_TYPE_MODE_T' => 1,
'AC_FUNC_STRTOD' => 1,
'AC_CHECK_HEADERS' => 1,
'AC_FUNC_STRNLEN' => 1,
+ 'm4_sinclude' => 1,
'AC_PROG_CXX' => 1,
'AC_PATH_X' => 1,
'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
'AC_PROG_AWK' => 1,
+ '_m4_warn' => 1,
'AC_HEADER_STDC' => 1,
'AC_HEADER_MAJOR' => 1,
***************
*** 46,59 ****
'AC_TYPE_SIGNAL' => 1,
'AC_TYPE_UID_T' => 1,
- 'AC_CONFIG_AUX_DIR' => 1,
'AC_PROG_MAKE_SET' => 1,
'm4_pattern_allow' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1,
- 'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_FORK' => 1,
! 'AC_FUNC_VPRINTF' => 1,
'AC_FUNC_STRCOLL' => 1,
'AC_PROG_YACC' => 1,
'AC_INIT' => 1,
--- 49,63 ----
'AC_TYPE_SIGNAL' => 1,
'AC_TYPE_UID_T' => 1,
'AC_PROG_MAKE_SET' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
'm4_pattern_allow' => 1,
+ 'sinclude' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1,
'AC_FUNC_FORK' => 1,
! 'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_STRCOLL' => 1,
+ 'AC_FUNC_VPRINTF' => 1,
'AC_PROG_YACC' => 1,
'AC_INIT' => 1,
***************
*** 71,74 ****
--- 75,79 ----
'AC_FUNC_REALLOC' => 1,
'AC_TYPE_SIZE_T' => 1,
+ 'AC_CONFIG_LINKS' => 1,
'AC_CHECK_TYPES' => 1,
'AC_CHECK_MEMBERS' => 1,
***************
*** 76,86 ****
'AC_FUNC_UTIME_NULL' => 1,
'AC_FUNC_SELECT_ARGTYPES' => 1,
- 'AC_FUNC_STRFTIME' => 1,
'AC_HEADER_STAT' => 1,
! 'AC_C_INLINE' => 1,
'AC_PROG_CPP' => 1,
! 'AC_TYPE_PID_T' => 1,
! 'AC_C_CONST' => 1,
'AC_PROG_LEX' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
--- 81,92 ----
'AC_FUNC_UTIME_NULL' => 1,
'AC_FUNC_SELECT_ARGTYPES' => 1,
'AC_HEADER_STAT' => 1,
! 'AC_FUNC_STRFTIME' => 1,
'AC_PROG_CPP' => 1,
! 'AC_C_INLINE' => 1,
! 'AM_ENABLE_MULTILIB' => 1,
'AC_PROG_LEX' => 1,
+ 'AC_C_CONST' => 1,
+ 'AC_TYPE_PID_T' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
***************
*** 96,111 ****
'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1,
- 'AM_CONDITIONAL' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
'AC_FUNC_MKTIME' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1,
- 'AC_FUNC_MEMCMP' => 1,
'AC_PROG_LN_S' => 1,
'm4_include' => 1,
'AC_HEADER_DIRENT' => 1,
'AC_CHECK_FUNCS' => 1
}
! ], 'Request' )
);
--- 102,117 ----
'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1,
'AC_FUNC_MKTIME' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AM_CONDITIONAL' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1,
'AC_PROG_LN_S' => 1,
+ 'AC_FUNC_MEMCMP' => 1,
'm4_include' => 1,
'AC_HEADER_DIRENT' => 1,
'AC_CHECK_FUNCS' => 1
}
! ], 'Autom4te::Request' )
);
Index: traces.0
===================================================================
RCS file: /cvsroot/morphix/gpppoe-conf/autom4te.cache/traces.0,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** traces.0 22 Sep 2003 22:35:22 -0000 1.2
--- traces.0 23 Nov 2003 22:56:27 -0000 1.3
***************
*** 1,2 ****
--- 1,3 ----
+ m4trace:aclocal.m4:43: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
m4trace:configure.in:3: -1- AC_INIT([configure.in])
m4trace:configure.in:3: -1- m4_pattern_forbid([^_?A[CHUM]_])
***************
*** 52,68 ****
m4trace:configure.in:3: -1- AC_SUBST([ECHO_T])
m4trace:configure.in:3: -1- AC_SUBST([LIBS])
! m4trace:configure.in:4: -1- AM_INIT_AUTOMAKE([gpppoe-account], [0.2])
! m4trace:configure.in:4: -1- AM_AUTOMAKE_VERSION([1.4-p6])
m4trace:configure.in:4: -1- AC_PROG_INSTALL
m4trace:configure.in:4: -1- AC_SUBST([INSTALL_PROGRAM])
m4trace:configure.in:4: -1- AC_SUBST([INSTALL_SCRIPT])
m4trace:configure.in:4: -1- AC_SUBST([INSTALL_DATA])
! m4trace:configure.in:4: -1- AC_SUBST([PACKAGE])
! m4trace:configure.in:4: -1- AC_SUBST([VERSION])
! m4trace:configure.in:4: -2- AC_DEFINE_TRACE_LITERAL([PACKAGE])
! m4trace:configure.in:4: -2- AH_OUTPUT([PACKAGE], [/* Name of package */
#undef PACKAGE])
! m4trace:configure.in:4: -2- AC_DEFINE_TRACE_LITERAL([VERSION])
! m4trace:configure.in:4: -2- AH_OUTPUT([VERSION], [/* Version number of package */
#undef VERSION])
m4trace:configure.in:4: -1- AC_SUBST([ACLOCAL])
--- 53,70 ----
m4trace:configure.in:3: -1- AC_SUBST([ECHO_T])
m4trace:configure.in:3: -1- AC_SUBST([LIBS])
! m4trace:configure.in:4: -1- AM_INIT_AUTOMAKE([gpppoe-conf], [0.2.1])
! m4trace:configure.in:4: -1- AM_AUTOMAKE_VERSION([1.7.9])
m4trace:configure.in:4: -1- AC_PROG_INSTALL
m4trace:configure.in:4: -1- AC_SUBST([INSTALL_PROGRAM])
m4trace:configure.in:4: -1- AC_SUBST([INSTALL_SCRIPT])
m4trace:configure.in:4: -1- AC_SUBST([INSTALL_DATA])
! m4trace:configure.in:4: -1- AC_SUBST([CYGPATH_W])
! m4trace:configure.in:4: -1- AC_SUBST([PACKAGE], [gpppoe-conf])
! m4trace:configure.in:4: -1- AC_SUBST([VERSION], [0.2.1])
! m4trace:configure.in:4: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
! m4trace:configure.in:4: -1- AH_OUTPUT([PACKAGE], [/* Name of package */
#undef PACKAGE])
! m4trace:configure.in:4: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
! m4trace:configure.in:4: -1- AH_OUTPUT([VERSION], [/* Version number of package */
#undef VERSION])
m4trace:configure.in:4: -1- AC_SUBST([ACLOCAL])
***************
*** 71,76 ****
--- 73,89 ----
m4trace:configure.in:4: -1- AC_SUBST([AUTOHEADER])
m4trace:configure.in:4: -1- AC_SUBST([MAKEINFO])
+ m4trace:configure.in:4: -1- AC_SUBST([AMTAR])
+ m4trace:configure.in:4: -1- AC_SUBST([install_sh])
+ m4trace:configure.in:4: -1- AC_SUBST([STRIP])
+ m4trace:configure.in:4: -1- AC_SUBST([ac_ct_STRIP])
+ m4trace:configure.in:4: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
+ m4trace:configure.in:4: -1- AC_PROG_AWK
+ m4trace:configure.in:4: -1- AC_SUBST([AWK])
m4trace:configure.in:4: -1- AC_PROG_MAKE_SET
m4trace:configure.in:4: -1- AC_SUBST([SET_MAKE])
+ m4trace:configure.in:4: -1- AC_SUBST([am__leading_dot])
+ m4trace:configure.in:5: -1- _m4_warn([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete.
+ You should run autoupdate.], [aclocal.m4:860: AM_CONFIG_HEADER is expanded from...
+ configure.in:5: the top level])
m4trace:configure.in:5: -1- AC_CONFIG_HEADERS([config.h])
m4trace:configure.in:6: -1- AM_MAINTAINER_MODE
***************
*** 94,97 ****
--- 107,123 ----
m4trace:configure.in:8: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
m4trace:configure.in:8: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
+ m4trace:configure.in:8: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
+ m4trace:configure.in:8: -1- AC_SUBST([am__include])
+ m4trace:configure.in:8: -1- AC_SUBST([am__quote])
+ m4trace:configure.in:8: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+ m4trace:configure.in:8: -1- AC_SUBST([AMDEP_TRUE])
+ m4trace:configure.in:8: -1- AC_SUBST([AMDEP_FALSE])
+ m4trace:configure.in:8: -1- AC_SUBST([AMDEPBACKSLASH])
+ m4trace:configure.in:8: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
+ m4trace:configure.in:8: -1- AM_CONDITIONAL([am__fastdepCC], [
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
+ m4trace:configure.in:8: -1- AC_SUBST([am__fastdepCC_TRUE])
+ m4trace:configure.in:8: -1- AC_SUBST([am__fastdepCC_FALSE])
m4trace:configure.in:9: -1- AC_PROG_CC
m4trace:configure.in:9: -1- AC_SUBST([CC])
***************
*** 106,109 ****
--- 132,146 ----
m4trace:configure.in:9: -1- AC_SUBST([CC])
m4trace:configure.in:9: -1- AC_SUBST([ac_ct_CC])
+ m4trace:configure.in:9: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
+ m4trace:configure.in:9: -1- AM_CONDITIONAL([am__fastdepCC], [
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
+ m4trace:configure.in:9: -1- AC_SUBST([am__fastdepCC_TRUE])
+ m4trace:configure.in:9: -1- AC_SUBST([am__fastdepCC_FALSE])
+ m4trace:configure.in:10: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+ You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
+ autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
+ aclocal.m4:1032: AM_PROG_CC_STDC is expanded from...
+ configure.in:10: the top level])
m4trace:configure.in:11: -1- AC_HEADER_STDC
m4trace:configure.in:11: -1- AC_PROG_CPP
***************
*** 126,130 ****
#undef HAVE_LOCALE_H])
m4trace:configure.in:24: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
! inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default])
m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H])
--- 163,167 ----
#undef HAVE_LOCALE_H])
m4trace:configure.in:24: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
! inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default])
m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H])
***************
*** 145,152 ****
--- 182,206 ----
m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H])
+ m4trace:configure.in:24: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+ You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
+ autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
+ autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
+ aclocal.m4:1149: GLIB_LC_MESSAGES is expanded from...
+ aclocal.m4:1444: GLIB_GNU_GETTEXT is expanded from...
+ aclocal.m4:1473: AM_GLIB_GNU_GETTEXT is expanded from...
+ configure.in:24: the top level])
m4trace:configure.in:24: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LC_MESSAGES])
m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_LC_MESSAGES], [/* Define if your <locale.h> file defines LC_MESSAGES. */
#undef HAVE_LC_MESSAGES])
m4trace:configure.in:24: -1- AC_SUBST([USE_NLS])
+ m4trace:configure.in:24: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+ You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
+ autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
+ autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
+ autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
+ aclocal.m4:1361: GLIB_WITH_NLS is expanded from...
+ aclocal.m4:1444: GLIB_GNU_GETTEXT is expanded from...
+ aclocal.m4:1473: AM_GLIB_GNU_GETTEXT is expanded from...
+ configure.in:24: the top level])
m4trace:configure.in:24: -1- AC_CHECK_FUNCS([bind_textdomain_codeset])
m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */
***************
*** 169,175 ****
--- 223,249 ----
m4trace:configure.in:24: -1- AC_SUBST([GMSGFMT], [$ac_cv_path_GMSGFMT])
m4trace:configure.in:24: -1- AC_SUBST([XGETTEXT])
+ m4trace:configure.in:24: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+ You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
+ autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
+ aclocal.m4:1361: GLIB_WITH_NLS is expanded from...
+ aclocal.m4:1444: GLIB_GNU_GETTEXT is expanded from...
+ aclocal.m4:1473: AM_GLIB_GNU_GETTEXT is expanded from...
+ configure.in:24: the top level])
m4trace:configure.in:24: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_NLS])
m4trace:configure.in:24: -1- AH_OUTPUT([ENABLE_NLS], [/* always defined to indicate that i18n is enabled */
#undef ENABLE_NLS])
+ m4trace:configure.in:24: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete.
+ You should run autoupdate.], [autoconf/status.m4:318: AC_OUTPUT_COMMANDS is expanded from...
+ aclocal.m4:1361: GLIB_WITH_NLS is expanded from...
+ aclocal.m4:1444: GLIB_GNU_GETTEXT is expanded from...
+ aclocal.m4:1473: AM_GLIB_GNU_GETTEXT is expanded from...
+ configure.in:24: the top level])
+ m4trace:configure.in:24: -3- _m4_warn([obsolete], [The macro `_AC_OUTPUT_COMMANDS_CNT' is obsolete.
+ You should run autoupdate.], [autoconf/status.m4:321: _AC_OUTPUT_COMMANDS_CNT is expanded from...
+ autoconf/status.m4:318: AC_OUTPUT_COMMANDS is expanded from...
+ aclocal.m4:1361: GLIB_WITH_NLS is expanded from...
+ aclocal.m4:1444: GLIB_GNU_GETTEXT is expanded from...
+ aclocal.m4:1473: AM_GLIB_GNU_GETTEXT is expanded from...
+ configure.in:24: the top level])
m4trace:configure.in:24: -1- AC_SUBST([CATALOGS])
m4trace:configure.in:24: -1- AC_SUBST([CATOBJEXT])
***************
*** 188,191 ****
--- 262,267 ----
po/Makefile.in
])
+ m4trace:configure.in:30: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+ You should run autoupdate.], [])
m4trace:configure.in:30: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
m4trace:configure.in:30: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
|
|
From: <cog...@us...> - 2003-11-23 22:56:31
|
Update of /cvsroot/morphix/gpppoe-conf/po In directory sc8-pr-cvs1:/tmp/cvs-serv13891/po Modified Files: Makefile Makefile.in pppoe-account.pot Log Message: Changed function for reading and testing account files (in speedtouch section). Index: Makefile =================================================================== RCS file: /cvsroot/morphix/gpppoe-conf/po/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 22 Sep 2003 22:35:22 -0000 1.2 --- Makefile 23 Nov 2003 22:56:27 -0000 1.3 *************** *** 14,19 **** GETTEXT_PACKAGE = pppoe-account ! PACKAGE = gpppoe-account ! VERSION = 0.2 SHELL = /bin/sh --- 14,19 ---- GETTEXT_PACKAGE = pppoe-account ! PACKAGE = gpppoe-conf ! VERSION = 0.2.1 SHELL = /bin/sh Index: Makefile.in =================================================================== RCS file: /cvsroot/morphix/gpppoe-conf/po/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 22 Sep 2003 22:35:22 -0000 1.2 --- Makefile.in 23 Nov 2003 22:56:27 -0000 1.3 *************** *** 14,19 **** GETTEXT_PACKAGE = pppoe-account ! PACKAGE = gpppoe-account ! VERSION = 0.2 SHELL = /bin/sh --- 14,19 ---- GETTEXT_PACKAGE = pppoe-account ! PACKAGE = gpppoe-conf ! VERSION = 0.2.1 SHELL = /bin/sh Index: pppoe-account.pot =================================================================== RCS file: /cvsroot/morphix/gpppoe-conf/po/pppoe-account.pot,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** pppoe-account.pot 1 Sep 2003 19:53:46 -0000 1.1.1.1 --- pppoe-account.pot 23 Nov 2003 22:56:27 -0000 1.2 *************** *** 9,13 **** "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2003-09-01 14:44+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" --- 9,13 ---- "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" ! "POT-Creation-Date: 2003-11-23 21:53-0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" *************** *** 17,114 **** "Content-Transfer-Encoding: 8bit\n" ! #: src/interface.c:48 src/interface.c:498 msgid "PPPoE Account Wizard" msgstr "" ! #: src/interface.c:55 msgid "Welcome to the PPPoE account wizard. Please select an option." msgstr "" ! #: src/interface.c:67 msgid "Create an account" msgstr "" ! #: src/interface.c:74 msgid "Configure Speedtouch modem" msgstr "" ! #: src/interface.c:160 src/interface.c:336 msgid "PPPoE account wizard" msgstr "" ! #: src/interface.c:168 msgid "Create a new PPPoE account" msgstr "" ! #: src/interface.c:181 msgid "Username:" msgstr "" ! #: src/interface.c:190 msgid "Password (retype):" msgstr "" ! #: src/interface.c:199 msgid "Password:" msgstr "" ! #: src/interface.c:208 msgid "Account:" msgstr "" ! #: src/interface.c:223 msgid "adsl-pppoe" msgstr "" ! #: src/interface.c:231 msgid "us...@is..." msgstr "" ! #: src/interface.c:344 ! msgid "Select your account details" msgstr "" ! #: src/interface.c:361 ! msgid "Persist" msgstr "" ! #: src/interface.c:368 msgid "Demand" msgstr "" ! #: src/interface.c:375 msgid "Normal" msgstr "" ! #: src/interface.c:382 ! msgid "Select the connection type:" msgstr "" ! #: src/interface.c:393 msgid "Ethernet device:" msgstr "" ! #: src/interface.c:404 msgid "eth0" msgstr "" ! #: src/interface.c:506 msgid "Configure your Speedtouch modem" msgstr "" ! #: src/interface.c:522 msgid "Select an account:" msgstr "" ! #: src/interface.c:547 msgid "VPI" msgstr "" ! #: src/interface.c:556 msgid "VCI" msgstr "" ! #: src/interface.c:586 msgid "Firmware" msgstr "" --- 17,175 ---- "Content-Transfer-Encoding: 8bit\n" ! #: src/interface.c:47 src/interface.c:472 msgid "PPPoE Account Wizard" msgstr "" ! #: src/interface.c:53 msgid "Welcome to the PPPoE account wizard. Please select an option." msgstr "" ! #: src/interface.c:63 msgid "Create an account" msgstr "" ! #: src/interface.c:69 msgid "Configure Speedtouch modem" msgstr "" ! #: src/interface.c:148 src/interface.c:311 src/interface.c:652 msgid "PPPoE account wizard" msgstr "" ! #: src/interface.c:155 msgid "Create a new PPPoE account" msgstr "" ! #: src/interface.c:166 msgid "Username:" msgstr "" ! #: src/interface.c:174 msgid "Password (retype):" msgstr "" ! #: src/interface.c:182 msgid "Password:" msgstr "" ! #: src/interface.c:190 msgid "Account:" msgstr "" ! #: src/interface.c:203 msgid "adsl-pppoe" msgstr "" ! #: src/interface.c:210 msgid "us...@is..." msgstr "" ! #: src/interface.c:328 ! msgid "Persist" msgstr "" ! #: src/interface.c:331 ! msgid "When the connection is dropped pppd tries to connect again." msgstr "" ! #: src/interface.c:335 msgid "Demand" msgstr "" ! #: src/interface.c:338 ! msgid "" ! "The connection is brought up whenever you need it and after a idle time it's " ! "terminated." ! msgstr "" ! ! #: src/interface.c:342 msgid "Normal" msgstr "" ! #: src/interface.c:345 ! msgid "" ! "On normal connections pppd daemon won't try to reconnect when the connection " ! "is terminated." msgstr "" ! #: src/interface.c:349 ! msgid "<b>Select the connection type:</b>" ! msgstr "" ! ! #: src/interface.c:359 msgid "Ethernet device:" msgstr "" ! #: src/interface.c:368 msgid "eth0" msgstr "" ! #: src/interface.c:370 ! msgid "This computer acts as a gateway" ! msgstr "" ! ! #: src/interface.c:373 ! msgid "" ! "Causes pppoe to clamp the TCP maximum segment size to 1412. This avoids " ! "having to set the MTU on all the clients of the LAN." ! msgstr "" ! ! #: src/interface.c:393 ! msgid "Advanced" ! msgstr "" ! ! #: src/interface.c:479 msgid "Configure your Speedtouch modem" msgstr "" ! #: src/interface.c:492 msgid "Select an account:" msgstr "" ! #: src/interface.c:513 msgid "VPI" msgstr "" ! #: src/interface.c:521 msgid "VCI" msgstr "" ! #: src/interface.c:547 msgid "Firmware" + msgstr "" + + #: src/interface.c:667 + msgid "<b>Advanced options:</b>" + msgstr "" + + #: src/interface.c:677 + msgid "LCP echo interval:" + msgstr "" + + #: src/interface.c:686 + msgid "pppd will send an echo-request frame to the server every \"n\" seconds." + msgstr "" + + #: src/interface.c:688 + msgid "seconds" + msgstr "" + + #: src/interface.c:697 + msgid "LCP failure retries:" + msgstr "" + + #: src/interface.c:706 + msgid "" + "If the peer does not replies to \"n\" to echo-request frames the connection " + "will be terminated." + msgstr "" + + #: src/interface.c:708 + msgid "Use synchronous PPP encapsulation" + msgstr "" + + #: src/interface.c:711 + msgid "" + "Reduces the CPU overhead time, however it may be unreliable on slow machines." msgstr "" |
|
From: <ale...@us...> - 2003-11-07 00:43:21
|
Update of /cvsroot/morphix/langconf/lists In directory sc8-pr-cvs1:/tmp/cvs-serv17419/lists Added Files: locale-list Log Message: moved locale-list, more install-fixes --- NEW FILE: locale-list --- af_ZA 8859-15 lat0-sun16 Afrikaans (South Africa) sq_AL.UTF-8 utf8 latarcyrheb-sun16 Albanian ar_DZ.UTF-8 utf8 latarcyrheb-sun16 Arabic (Algeria) ar_BH.UTF-8 utf8 latarcyrheb-sun16 Arabic (Bahrain) ar_EG.UTF-8 utf8 latarcyrheb-sun16 Arabic (Egypt) ar_IN utf8 latarcyrheb-sun16 Arabic (India) ar_IQ.UTF-8 utf8 latarcyrheb-sun16 Arabic (Iraq) ar_JO.UTF-8 utf8 latarcyrheb-sun16 Arabic (Jordan) ar_KW.UTF-8 utf8 latarcyrheb-sun16 Arabic (Kuwait) ar_LB.UTF-8 utf8 latarcyrheb-sun16 Arabic (Lebanon) ar_LY.UTF-8 utf8 latarcyrheb-sun16 Arabic (Libyan Arab Jamahiriya) ar_MA.UTF-8 utf8 latarcyrheb-sun16 Arabic (Morocco) ar_OM.UTF-8 utf8 latarcyrheb-sun16 Arabic (Oman) ar_QA.UTF-8 utf8 latarcyrheb-sun16 Arabic (Qatar) ar_SA.UTF-8 utf8 latarcyrheb-sun16 Arabic (Saudi Arabia) ar_SD.UTF-8 utf8 latarcyrheb-sun16 Arabic (Sudan) ar_SY.UTF-8 utf8 latarcyrheb-sun16 Arabic (Syrian Arab Republic) ar_TN.UTF-8 utf8 latarcyrheb-sun16 Arabic (Tunisia) ar_AE.UTF-8 utf8 latarcyrheb-sun16 Arabic (United Arab Emirates) ar_YE.UTF-8 utf8 latarcyrheb-sun16 Arabic (Yemen) eu_ES.UTF-8 utf8 latarcyrheb-sun16 Basque (Spain) be_BY.UTF-8 utf8 latarcyrheb-sun16 Belarusian bs_BA 8859-2 lat2-sun16 Bosnian (Bosnia and Herzegowina) br_FR 8859-15 lat0-sun16 Breton (France) bg_BG.UTF-8 utf8 latarcyrheb-sun16 Bulgarian - ÐÑлгаÑÑки ca_ES.UTF-8@euro utf8 latarcyrheb-sun16 Catalan (Spain) zh_HK.UTF-8 utf8 latarcyrheb-sun16 Chinese (Hong Kong) zh_CN.GB18030 8859-15 lat0-sun16 Chinese (P.R. of China) - ä¸æ(ç®ä½) zh_TW.UTF-8 utf8 lat0-sun16 Chinese (Taiwan) - ç¹é«ä¸æ kw_GB.UTF-8 utf8 latarcyrheb-sun16 Cornish (Britain) hr_HR.UTF-8 utf8 latarcyrheb-sun16 Croatian cs_CZ.UTF-8 utf8 latarcyrheb-sun16 Czech - Äeská republika da_DK.UTF-8 utf8 latarcyrheb-sun16 Danish - Dansk nl_BE.UTF-8@euro utf8 latarcyrheb-sun16 Dutch (Belgium) nl_NL.UTF-8@euro utf8 latarcyrheb-sun16 Dutch (Netherlands) en_AU.UTF-8 utf8 latarcyrheb-sun16 English (Australia) en_BW.UTF-8 utf8 latarcyrheb-sun16 English (Botswana) en_CA.UTF-8 utf8 latarcyrheb-sun16 English (Canada) en_DK.UTF-8 utf8 latarcyrheb-sun16 English (Denmark) en_GB.UTF-8 utf8 latarcyrheb-sun16 English (Great Britain) en_HK.UTF-8 utf8 latarcyrheb-sun16 English (Hong Kong) en_IN utf8 latarcyrheb-sun16 English (India) en_IE.UTF-8@euro utf8 latarcyrheb-sun16 English (Ireland) en_NZ.UTF-8 utf8 latarcyrheb-sun16 English (New Zealand) en_PH.UTF-8 utf8 latarcyrheb-sun16 English (Philippines) en_SG.UTF-8 utf8 latarcyrheb-sun16 English (Singapore) en_ZA.UTF-8 utf8 latarcyrheb-sun16 English (South Africa) en_US.UTF-8 utf8 latarcyrheb-sun16 English (USA) en_ZW.UTF-8 utf8 latarcyrheb-sun16 English (Zimbabwe) et_EE.UTF-8 utf8 latarcyrheb-sun16 Estonian fo_FO.UTF-8 utf8 latarcyrheb-sun16 Faroese (Faroe Islands) fi_FI.UTF-8@euro utf8 latarcyrheb-sun16 Finnish fr_BE.UTF-8@euro utf8 latarcyrheb-sun16 French (Belgium) fr_CA.UTF-8 utf8 latarcyrheb-sun16 French (Canada) fr_FR.UTF-8 utf8 latarcyrheb-sun16 French (France) - Français fr_LU.UTF-8@euro utf8 latarcyrheb-sun16 French (Luxemburg) fr_CH.UTF-8 utf8 latarcyrheb-sun16 French (Switzerland) gl_ES.UTF-8@euro utf8 latarcyrheb-sun16 Galician (Spain) de_AT.UTF-8@euro utf8 latarcyrheb-sun16 German (Austria) de_BE.UTF-8@euro utf8 latarcyrheb-sun16 German (Belgium) de_DE.UTF-8@euro utf8 latarcyrheb-sun16 German (Germany) - Deutsch de_LU.UTF-8@euro utf8 latarcyrheb-sun16 German (Luxemburg) de_CH.UTF-8 utf8 latarcyrheb-sun16 German (Switzerland) el_GR.UTF-8 utf8 latarcyrheb-sun16 Greek kl_GL.UTF-8 utf8 latarcyrheb-sun16 Greenlandic (Greenland) he_IL.UTF-8 utf8 latarcyrheb-sun16 Hebrew (Israel) hi_IN utf8 latarcyrheb-sun16 Hindi (India) hu_HU.UTF-8 utf8 latarcyrheb-sun16 Hungarian is_IS.UTF-8 utf8 latarcyrheb-sun16 Icelandic - Ãslenska id_ID.UTF-8 utf8 latarcyrheb-sun16 Indonesian ga_IE.UTF-8@euro utf8 latarcyrheb-sun16 Irish it_IT.UTF-8@euro utf8 latarcyrheb-sun16 Italian (Italy) Italiano it_CH.UTF-8 utf8 latarcyrheb-sun16 Italian (Switzerland) ja_JP.UTF-8 utf8 lat0-sun16 Japanese - æ¥æ¬èª ko_KR.UTF-8 utf8 lat0-sun16 Korean (Republic of Korea) - íêµì´ lo_LA.UTF-8 utf8 latarcyrheb-sun16 Lao (Laos) lv_LV.UTF-8 utf8 latarcyrheb-sun16 Latvian (Latvia) lt_LT.UTF-8 utf8 latarcyrheb-sun16 Lithuanian mk_MK.UTF-8 utf8 latarcyrheb-sun16 Macedonian ms_MY.UTF-8 utf8 latarcyrheb-sun16 Malay (Malaysia) mt_MT.UTF-8 utf8 latarcyrheb-sun16 Maltese (malta) gv_GB.UTF-8 utf8 latarcyrheb-sun16 Manx Gaelic (Britain) mr_IN utf8 latarcyrheb-sun16 Marathi (India) se_NO utf8 latarcyrheb-sun16 Northern Saami (Norway) no_NO.UTF-8 utf8 latarcyrheb-sun16 Norwegian - Norsk nn_NO.UTF-8 utf8 latarcyrheb-sun16 Norwegian, Nynorsk (Norway) - Norsk oc_FR 8859-15 lat0-sun16 Occitan (France) fa_IR utf8 latarcyrheb-sun16 Persian (Iran) pl_PL.UTF-8 utf8 latarcyrheb-sun16 Polish pt_BR.UTF-8 utf8 latarcyrheb-sun16 Portuguese (Brasil) pt_PT.UTF-8@euro utf8 latarcyrheb-sun16 Portuguese (Portugal) - Português ro_RO.UTF-8 utf8 latarcyrheb-sun16 Romanian ru_RU.UTF-8 utf8 latarcyrheb-sun16 Russian - Ð ÑÑÑкий ru_UA.UTF-8 utf8 latarcyrheb-sun16 Russian (Ukraine) sr_YU.UTF-8@cyrillic utf8 latarcyrheb-sun16 Serbian (Yugoslavia) sk_SK.UTF-8 utf8 latarcyrheb-sun16 Slovak sl_SI.UTF-8 utf8 latarcyrheb-sun16 Slovenian (Slovenia) - slovenÅ¡Äina es_AR.UTF-8 utf8 latarcyrheb-sun16 Spanish (Argentina) es_BO.UTF-8 utf8 latarcyrheb-sun16 Spanish (Bolivia) es_CL.UTF-8 utf8 latarcyrheb-sun16 Spanish (Chile) es_CO.UTF-8 utf8 latarcyrheb-sun16 Spanish (Colombia) es_CR.UTF-8 utf8 latarcyrheb-sun16 Spanish (Costa Rica) es_DO.UTF-8 utf8 latarcyrheb-sun16 Spanish (Dominican Republic) es_SV.UTF-8 utf8 latarcyrheb-sun16 Spanish (El Salvador) es_EC.UTF-8 utf8 latarcyrheb-sun16 Spanish (Equador) es_GT.UTF-8 utf8 latarcyrheb-sun16 Spanish (Guatemala) es_HN.UTF-8 utf8 latarcyrheb-sun16 Spanish (Honduras) es_MX.UTF-8 utf8 latarcyrheb-sun16 Spanish (Mexico) es_NI.UTF-8 utf8 latarcyrheb-sun16 Spanish (Nicaragua) es_PA.UTF-8 utf8 latarcyrheb-sun16 Spanish (Panama) es_PY.UTF-8 utf8 latarcyrheb-sun16 Spanish (Paraguay) es_PE.UTF-8 utf8 latarcyrheb-sun16 Spanish (Peru) es_PR.UTF-8 utf8 latarcyrheb-sun16 Spanish (Puerto Rico) es_ES.UTF-8@euro utf8 latarcyrheb-sun16 Spanish (Spain) - Español es_US.UTF-8 utf8 latarcyrheb-sun16 Spanish (USA) es_UY.UTF-8 utf8 latarcyrheb-sun16 Spanish (Uruguay) es_VE.UTF-8 utf8 latarcyrheb-sun16 Spanish (Venezuela) sv_FI.UTF-8@euro utf8 latarcyrheb-sun16 Swedish (Finland) sv_SE.UTF-8 utf8 latarcyrheb-sun16 Swedish (Sweden) - Svenska tl_PH 8859-15 lat0-sun16 Tagalog (Philipines) ta_IN utf8 latarcyrheb-sun16 Tamil (India) te_IN utf8 latarcyrheb-sun16 Telgu (India) th_TH.UTF-8 utf8 latarcyrheb-sun16 Thai tr_TR.UTF-8 utf8 latarcyrheb-sun16 Turkish uk_UA.UTF-8 utf8 latarcyrheb-sun16 Ukrainian ur_PK utf8 latarcyrheb-sun16 Urdu (Pakistan) uz_UZ 8859-15 lat0-sun16 Uzbek (Uzbekistan) wa_BE@euro 8859-15 lat0-sun16 Walloon (Belgium) |
1 message has been excluded from this view by a project administrator.
