gEDA-cvs: CVS update: Makefile.am

[cvspsrv@xxxxxxxx]

  User: pcjc2   
  Date: 07/02/11 18:59:08

  Modified:    .        Tag: noscreen Makefile.am globals.c gschlas.c
                        parsecmd.c
  Added:       .        Tag: noscreen s_util.c
  Log:
  Sync with trunc
  
  
  
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.6.1   +1 -1      eda/geda/gaf/utils/gschlas/Makefile.am
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/utils/gschlas/Makefile.am,v
  retrieving revision 1.2
  retrieving revision 1.2.6.1
  diff -u -b -r1.2 -r1.2.6.1
  --- Makefile.am	25 Aug 2003 03:53:04 -0000	1.2
  +++ Makefile.am	11 Feb 2007 23:59:08 -0000	1.2.6.1
  @@ -5,7 +5,7 @@
   # don't forget all *.h files */
   gschlas_SOURCES = \
   		i_vars.c g_rc.c g_register.c globals.c \
  -		gschlas.c parsecmd.c 
  +		gschlas.c s_util.c parsecmd.c 
   
   
   INCLUDES = @GSCHLAS_CFLAGS@ 
  
  
  
  1.6.6.1   +3 -1      eda/geda/gaf/utils/gschlas/globals.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: globals.c
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/utils/gschlas/globals.c,v
  retrieving revision 1.6
  retrieving revision 1.6.6.1
  diff -u -b -r1.6 -r1.6.6.1
  --- globals.c	27 Nov 2005 00:15:12 -0000	1.6
  +++ globals.c	11 Feb 2007 23:59:08 -0000	1.6.6.1
  @@ -59,7 +59,6 @@
   void (*pin_draw_func)() = o_pin_recalc;
   void (*select_func)() = o_select_dummy;
   void (*x_log_update_func)() = NULL;
  -void (*quit_func)() = gschlas_quit;
   /* void (*variable_set_func)() = i_vars_set; */
   void (*variable_set_func)() = NULL;
   int (*load_newer_backup_func)()  = NULL;
  @@ -77,5 +76,8 @@
   int verbose_mode=FALSE;
   int interactive_mode=FALSE;
   int quiet_mode=FALSE;
  +int embed_mode=FALSE; 
  +int unembed_mode=FALSE;
  +
   
   
  
  
  
  1.17.6.1  +8 -0      eda/geda/gaf/utils/gschlas/gschlas.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: gschlas.c
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/utils/gschlas/gschlas.c,v
  retrieving revision 1.17
  retrieving revision 1.17.6.1
  diff -u -b -r1.17 -r1.17.6.1
  --- gschlas.c	7 Sep 2006 02:41:29 -0000	1.17
  +++ gschlas.c	11 Feb 2007 23:59:08 -0000	1.17.6.1
  @@ -155,6 +155,14 @@
     
     if (!quiet_mode) s_log_message("\n");
   
  +  if (embed_mode) {
  +    s_util_embed(pr_current, TRUE);
  +  }
  +
  +  if (unembed_mode) {
  +    s_util_embed(pr_current, FALSE);
  +  }	
  +
     /* save all the opened files */
     s_page_save_all(pr_current);
   
  
  
  
  1.2.6.1   +18 -1     eda/geda/gaf/utils/gschlas/parsecmd.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: parsecmd.c
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/utils/gschlas/parsecmd.c,v
  retrieving revision 1.2
  retrieving revision 1.2.6.1
  diff -u -b -r1.2 -r1.2.6.1
  --- parsecmd.c	7 Feb 2005 23:57:14 -0000	1.2
  +++ parsecmd.c	11 Feb 2007 23:59:08 -0000	1.2.6.1
  @@ -36,7 +36,7 @@
   #include <dmalloc.h>
   #endif
   
  -#define OPTIONS "hqv"
  +#define OPTIONS "hqveu"
   
   #ifndef OPTARG_IN_UNISTD
   extern char *optarg;
  @@ -47,6 +47,8 @@
   void usage(char *cmd)
   {
       printf("Usage: %s [OPTIONS] filename1 ... filenameN\n", cmd);
  +    printf("  -e  		Embed all components/pictures\n");
  +    printf("  -u  		Unembed all components/pictures\n");
       printf("  -q  		Quiet mode\n");
       printf("  -v  		Verbose mode on\n");
       printf("  -h  		This message\n");
  @@ -69,6 +71,14 @@
   	    quiet_mode = TRUE;
   	    break;
   
  +	case 'e':
  +	    embed_mode = TRUE;
  +	    break;
  +
  +	case 'u':
  +	    unembed_mode = TRUE;
  +	    break;
  +
   	case 'h':
   	    usage(argv[0]);
   	    break;
  @@ -84,5 +94,12 @@
   	verbose_mode = FALSE;
       }
   
  +    if (embed_mode && unembed_mode) {
  +	fprintf(stderr, 
  +	        "Cannot specify both -e and -u at the same time (ignoring both flags)\n");	
  +	embed_mode = FALSE;
  +	unembed_mode = FALSE;
  +    }
  +
       return (optind);
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +0 -0      eda/geda/gaf/utils/gschlas/s_util.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  
  
  


_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs