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...> - 2004-03-07 23:37:08
|
Update of /cvsroot/morphix/mcp/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30807/debian Log Message: Directory /cvsroot/morphix/mcp/debian added to the repository |
|
From: <ale...@us...> - 2004-03-07 23:31:26
|
Update of /cvsroot/morphix/mcp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29266 Added Files: morphix-control-panel Log Message: adding morphix-control-panel to cvs --- NEW FILE: morphix-control-panel --- #!/bin/sh mcp /usr/share/mcp/data/main-mcp/ |
|
From: <ale...@us...> - 2004-03-07 23:22:16
|
Update of /cvsroot/morphix/mcp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27119 Modified Files: Makefile Makefile.am Makefile.in config.log config.status mcp.glade Log Message: mcp updates Index: Makefile =================================================================== RCS file: /cvsroot/morphix/mcp/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 2 Mar 2004 23:41:05 -0000 1.3 --- Makefile 7 Mar 2004 22:58:23 -0000 1.4 *************** *** 46,53 **** CATALOGS = CATOBJEXT = .gmo ! CC = gcc CCDEPMODE = depmode=gcc3 CFLAGS = -g -O2 ! CPP = gcc -E CPPFLAGS = CYGPATH_W = echo --- 46,53 ---- CATALOGS = CATOBJEXT = .gmo ! CC = i386-linux-gcc CCDEPMODE = depmode=gcc3 CFLAGS = -g -O2 ! CPP = i386-linux-gcc -E CPPFLAGS = CYGPATH_W = echo *************** *** 73,79 **** LIBS = LTLIBOBJS = ! MAINT = ! MAINTAINER_MODE_FALSE = # ! MAINTAINER_MODE_TRUE = MAKEINFO = makeinfo MKINSTALLDIRS = ./mkinstalldirs --- 73,79 ---- LIBS = LTLIBOBJS = ! MAINT = # ! MAINTAINER_MODE_FALSE = ! MAINTAINER_MODE_TRUE = # MAKEINFO = makeinfo MKINSTALLDIRS = ./mkinstalldirs *************** *** 100,104 **** VERSION = 0.1 XGETTEXT = /usr/bin/xgettext ! ac_ct_CC = gcc ac_ct_STRIP = am__fastdepCC_FALSE = # --- 100,104 ---- VERSION = 0.1 XGETTEXT = /usr/bin/xgettext ! ac_ct_CC = ac_ct_STRIP = am__fastdepCC_FALSE = # *************** *** 108,124 **** am__quote = bindir = ${exec_prefix}/bin ! build_alias = datadir = ${prefix}/share exec_prefix = ${prefix} ! host_alias = includedir = ${prefix}/include ! infodir = ${prefix}/info install_sh = /root/morphix/mcp/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 --- 108,124 ---- am__quote = bindir = ${exec_prefix}/bin ! build_alias = i386-linux datadir = ${prefix}/share exec_prefix = ${prefix} ! host_alias = i386-linux includedir = ${prefix}/include ! infodir = ${prefix}/share/info install_sh = /root/morphix/mcp/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localstatedir = ${prefix}/var ! mandir = ${prefix}/share/man oldincludedir = /usr/include ! prefix = /usr program_transform_name = s,x,x, sbindir = ${exec_prefix}/sbin *************** *** 147,153 **** 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 --- 147,153 ---- check-recursive installcheck-recursive DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ ! COPYING ChangeLog INSTALL Makefile.am NEWS TODO acconfig.h \ ! aclocal.m4 config.guess config.h.in config.sub configure \ ! configure.in depcomp install-sh missing mkinstalldirs DIST_SUBDIRS = $(SUBDIRS) all: config.h *************** *** 158,173 **** 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) --- 158,173 ---- 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) *************** *** 182,186 **** 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 --- 182,186 ---- 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 *************** *** 549,552 **** --- 549,556 ---- done \ fi + if test -d $(srcdir)/data; then \ + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data; \ + cp -a $(srcdir)/data/* $(DESTDIR)$(pkgdatadir)/data; \ + fi dist-hook: *************** *** 559,562 **** --- 563,570 ---- done \ fi + if test -d data; then \ + mkdir $(distdir)/data; \ + cp -a $(srcdir)/data/* $(DESTDIR)$(pkgdatadir)/data; \ + 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. Index: Makefile.am =================================================================== RCS file: /cvsroot/morphix/mcp/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.am 1 Sep 2003 19:25:15 -0000 1.1.1.1 --- Makefile.am 7 Mar 2004 22:58:24 -0000 1.2 *************** *** 18,21 **** --- 18,25 ---- done \ fi + if test -d $(srcdir)/data; then \ + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data; \ + cp -a $(srcdir)/data/* $(DESTDIR)$(pkgdatadir)/data; \ + fi dist-hook: *************** *** 28,30 **** done \ fi ! --- 32,37 ---- done \ fi ! if test -d data; then \ ! mkdir $(distdir)/data; \ ! cp -a $(srcdir)/data/* $(DESTDIR)$(pkgdatadir)/data; \ ! fi Index: Makefile.in =================================================================== RCS file: /cvsroot/morphix/mcp/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.in 2 Mar 2004 23:41:05 -0000 1.3 --- Makefile.in 7 Mar 2004 22:58:24 -0000 1.4 *************** *** 147,153 **** 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 --- 147,153 ---- check-recursive installcheck-recursive DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ ! COPYING ChangeLog INSTALL Makefile.am NEWS TODO acconfig.h \ ! aclocal.m4 config.guess config.h.in config.sub configure \ ! configure.in depcomp install-sh missing mkinstalldirs DIST_SUBDIRS = $(SUBDIRS) all: config.h *************** *** 549,552 **** --- 549,556 ---- done \ fi + if test -d $(srcdir)/data; then \ + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data; \ + cp -a $(srcdir)/data/* $(DESTDIR)$(pkgdatadir)/data; \ + fi dist-hook: *************** *** 559,562 **** --- 563,570 ---- done \ fi + if test -d data; then \ + mkdir $(distdir)/data; \ + cp -a $(srcdir)/data/* $(DESTDIR)$(pkgdatadir)/data; \ + 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. Index: config.log =================================================================== RCS file: /cvsroot/morphix/mcp/config.log,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** config.log 2 Mar 2004 23:41:05 -0000 1.4 --- config.log 7 Mar 2004 22:58:24 -0000 1.5 *************** *** 5,9 **** generated by GNU Autoconf 2.58. Invocation command line was ! $ ./configure --enable-maintainer-mode ## --------- ## --- 5,9 ---- generated by GNU Autoconf 2.58. Invocation command line was ! $ ./configure --host=i386-linux --build=i386-linux --prefix=/usr --mandir=${prefix}/share/man --infodir=${prefix}/share/info ## --------- ## *************** *** 54,66 **** configure:1537: result: yes configure:1703: checking whether to enable maintainer-specific portions of Makefiles ! configure:1712: result: yes configure:1740: checking for style of include used by make configure:1768: result: GNU ! configure:1839: checking for gcc ! configure:1855: found /usr/bin/gcc ! configure:1865: result: gcc configure:2109: checking for C compiler version ! configure:2112: gcc --version </dev/null >&5 ! gcc (GCC) 3.3.2 (Debian) Copyright (C) 2003 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO --- 54,66 ---- configure:1537: result: yes configure:1703: checking whether to enable maintainer-specific portions of Makefiles ! configure:1712: result: no configure:1740: checking for style of include used by make configure:1768: result: GNU ! configure:1801: checking for i386-linux-gcc ! configure:1817: found /usr/bin/i386-linux-gcc ! configure:1827: result: i386-linux-gcc configure:2109: checking for C compiler version ! configure:2112: i386-linux-gcc --version </dev/null >&5 ! i386-linux-gcc (GCC) 3.3.2 (Debian) Copyright (C) 2003 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO *************** *** 68,72 **** configure:2115: $? = 0 ! configure:2117: gcc -v </dev/null >&5 Reading specs from /usr/lib/gcc-lib/i486-linux/3.3.2/specs Configured with: ../src/configure -v --enable-languages=c,c++,java,f77,pascal,objc,ada,treelang --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-gxx-include-dir=/usr/include/c++/3.3 --enable-shared --with-system-zlib --enable-nls --without-included-gettext --enable-__cxa_atexit --enable-clocale=gnu --enable-debug --enable-java-gc=boehm --enable-java-awt=xlib --enable-objc-gc i486-linux --- 68,72 ---- configure:2115: $? = 0 ! configure:2117: i386-linux-gcc -v </dev/null >&5 Reading specs from /usr/lib/gcc-lib/i486-linux/3.3.2/specs Configured with: ../src/configure -v --enable-languages=c,c++,java,f77,pascal,objc,ada,treelang --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-gxx-include-dir=/usr/include/c++/3.3 --enable-shared --with-system-zlib --enable-nls --without-included-gettext --enable-__cxa_atexit --enable-clocale=gnu --enable-debug --enable-java-gc=boehm --enable-java-awt=xlib --enable-objc-gc i486-linux *************** *** 74,82 **** gcc version 3.3.2 (Debian) configure:2120: $? = 0 ! configure:2122: gcc -V </dev/null >&5 ! gcc: `-V' option must have argument configure:2125: $? = 1 configure:2148: checking for C compiler default output file name ! configure:2151: gcc conftest.c >&5 configure:2154: $? = 0 configure:2200: result: a.out --- 74,82 ---- gcc version 3.3.2 (Debian) configure:2120: $? = 0 ! configure:2122: i386-linux-gcc -V </dev/null >&5 ! i386-linux-gcc: `-V' option must have argument configure:2125: $? = 1 configure:2148: checking for C compiler default output file name ! configure:2151: i386-linux-gcc conftest.c >&5 configure:2154: $? = 0 configure:2200: result: a.out *************** *** 88,100 **** configure:2240: result: no configure:2243: checking for suffix of executables ! configure:2245: gcc -o conftest conftest.c >&5 configure:2248: $? = 0 configure:2273: result: configure:2279: checking for suffix of object files ! configure:2300: gcc -c conftest.c >&5 configure:2303: $? = 0 configure:2325: result: o configure:2329: checking whether we are using the GNU C compiler ! configure:2353: gcc -c conftest.c >&5 configure:2359: $? = 0 configure:2362: test -z || test ! -s conftest.err --- 88,100 ---- configure:2240: result: no configure:2243: checking for suffix of executables ! configure:2245: i386-linux-gcc -o conftest conftest.c >&5 configure:2248: $? = 0 configure:2273: result: configure:2279: checking for suffix of object files ! configure:2300: i386-linux-gcc -c conftest.c >&5 configure:2303: $? = 0 configure:2325: result: o configure:2329: checking whether we are using the GNU C compiler ! configure:2353: i386-linux-gcc -c conftest.c >&5 configure:2359: $? = 0 configure:2362: test -z || test ! -s conftest.err *************** *** 103,108 **** configure:2371: $? = 0 configure:2384: result: yes ! configure:2390: checking whether gcc accepts -g ! configure:2411: gcc -c -g conftest.c >&5 configure:2417: $? = 0 configure:2420: test -z || test ! -s conftest.err --- 103,108 ---- configure:2371: $? = 0 configure:2384: result: yes ! configure:2390: checking whether i386-linux-gcc accepts -g ! configure:2411: i386-linux-gcc -c -g conftest.c >&5 configure:2417: $? = 0 configure:2420: test -z || test ! -s conftest.err *************** *** 111,116 **** configure:2429: $? = 0 configure:2440: result: yes ! configure:2457: checking for gcc option to accept ANSI C ! configure:2527: gcc -c -g -O2 conftest.c >&5 configure:2533: $? = 0 configure:2536: test -z || test ! -s conftest.err --- 111,116 ---- configure:2429: $? = 0 configure:2440: result: yes ! configure:2457: checking for i386-linux-gcc option to accept ANSI C ! configure:2527: i386-linux-gcc -c -g -O2 conftest.c >&5 configure:2533: $? = 0 configure:2536: test -z || test ! -s conftest.err *************** *** 119,123 **** configure:2545: $? = 0 configure:2563: result: none needed ! configure:2581: gcc -c -g -O2 conftest.c >&5 conftest.c:2: error: parse error before "me" configure:2587: $? = 1 --- 119,123 ---- configure:2545: $? = 0 configure:2563: result: none needed ! configure:2581: i386-linux-gcc -c -g -O2 conftest.c >&5 conftest.c:2: error: parse error before "me" configure:2587: $? = 1 *************** *** 126,133 **** | choke me | #endif ! configure:2719: checking dependency style of gcc configure:2802: result: gcc3 configure:2821: checking for strerror in -lcposix ! configure:2851: gcc -o conftest -g -O2 conftest.c -lcposix >&5 /usr/bin/ld: cannot find -lcposix collect2: ld returned 1 exit status --- 126,133 ---- | choke me | #endif ! configure:2719: checking dependency style of i386-linux-gcc configure:2802: result: gcc3 configure:2821: checking for strerror in -lcposix ! configure:2851: i386-linux-gcc -o conftest -g -O2 conftest.c -lcposix >&5 /usr/bin/ld: cannot find -lcposix collect2: ld returned 1 exit status *************** *** 160,168 **** | } configure:2882: result: no ! configure:2936: checking for gcc ! configure:2962: result: gcc configure:3206: checking for C compiler version ! configure:3209: gcc --version </dev/null >&5 ! gcc (GCC) 3.3.2 (Debian) Copyright (C) 2003 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO --- 160,168 ---- | } configure:2882: result: no ! configure:2898: checking for i386-linux-gcc ! configure:2924: result: i386-linux-gcc configure:3206: checking for C compiler version ! configure:3209: i386-linux-gcc --version </dev/null >&5 ! i386-linux-gcc (GCC) 3.3.2 (Debian) Copyright (C) 2003 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO *************** *** 170,174 **** configure:3212: $? = 0 ! configure:3214: gcc -v </dev/null >&5 Reading specs from /usr/lib/gcc-lib/i486-linux/3.3.2/specs Configured with: ../src/configure -v --enable-languages=c,c++,java,f77,pascal,objc,ada,treelang --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-gxx-include-dir=/usr/include/c++/3.3 --enable-shared --with-system-zlib --enable-nls --without-included-gettext --enable-__cxa_atexit --enable-clocale=gnu --enable-debug --enable-java-gc=boehm --enable-java-awt=xlib --enable-objc-gc i486-linux --- 170,174 ---- configure:3212: $? = 0 ! configure:3214: i386-linux-gcc -v </dev/null >&5 Reading specs from /usr/lib/gcc-lib/i486-linux/3.3.2/specs Configured with: ../src/configure -v --enable-languages=c,c++,java,f77,pascal,objc,ada,treelang --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-gxx-include-dir=/usr/include/c++/3.3 --enable-shared --with-system-zlib --enable-nls --without-included-gettext --enable-__cxa_atexit --enable-clocale=gnu --enable-debug --enable-java-gc=boehm --enable-java-awt=xlib --enable-objc-gc i486-linux *************** *** 176,189 **** gcc version 3.3.2 (Debian) configure:3217: $? = 0 ! configure:3219: gcc -V </dev/null >&5 ! gcc: `-V' option must have argument configure:3222: $? = 1 configure:3225: checking whether we are using the GNU C compiler configure:3280: result: yes ! configure:3286: checking whether gcc accepts -g configure:3336: result: yes ! configure:3353: checking for gcc option to accept ANSI C configure:3459: result: none needed ! configure:3477: gcc -c -g -O2 conftest.c >&5 conftest.c:2: error: parse error before "me" configure:3483: $? = 1 --- 176,189 ---- gcc version 3.3.2 (Debian) configure:3217: $? = 0 ! configure:3219: i386-linux-gcc -V </dev/null >&5 ! i386-linux-gcc: `-V' option must have argument configure:3222: $? = 1 configure:3225: checking whether we are using the GNU C compiler configure:3280: result: yes ! configure:3286: checking whether i386-linux-gcc accepts -g configure:3336: result: yes ! configure:3353: checking for i386-linux-gcc option to accept ANSI C configure:3459: result: none needed ! configure:3477: i386-linux-gcc -c -g -O2 conftest.c >&5 conftest.c:2: error: parse error before "me" configure:3483: $? = 1 *************** *** 192,199 **** | choke me | #endif ! configure:3615: checking dependency style of gcc configure:3698: result: gcc3 ! configure:3718: checking for gcc option to accept ANSI C ! configure:3781: gcc -c -g -O2 conftest.c >&5 configure:3787: $? = 0 configure:3790: test -z || test ! -s conftest.err --- 192,199 ---- | choke me | #endif ! configure:3615: checking dependency style of i386-linux-gcc configure:3698: result: gcc3 ! configure:3718: checking for i386-linux-gcc option to accept ANSI C ! configure:3781: i386-linux-gcc -c -g -O2 conftest.c >&5 configure:3787: $? = 0 configure:3790: test -z || test ! -s conftest.err *************** *** 203,209 **** configure:3814: result: none needed configure:3830: checking how to run the C preprocessor ! configure:3865: gcc -E conftest.c configure:3871: $? = 0 ! configure:3903: gcc -E conftest.c conftest.c:11:28: ac_nonexistent.h: No such file or directory configure:3909: $? = 1 --- 203,209 ---- configure:3814: result: none needed configure:3830: checking how to run the C preprocessor ! configure:3865: i386-linux-gcc -E conftest.c configure:3871: $? = 0 ! configure:3903: i386-linux-gcc -E conftest.c conftest.c:11:28: ac_nonexistent.h: No such file or directory configure:3909: $? = 1 *************** *** 220,227 **** | /* end confdefs.h. */ | #include <ac_nonexistent.h> ! configure:3948: result: gcc -E ! configure:3972: gcc -E conftest.c configure:3978: $? = 0 ! configure:4010: gcc -E conftest.c conftest.c:11:28: ac_nonexistent.h: No such file or directory configure:4016: $? = 1 --- 220,227 ---- | /* end confdefs.h. */ | #include <ac_nonexistent.h> ! configure:3948: result: i386-linux-gcc -E ! configure:3972: i386-linux-gcc -E conftest.c configure:3978: $? = 0 ! configure:4010: i386-linux-gcc -E conftest.c conftest.c:11:28: ac_nonexistent.h: No such file or directory configure:4016: $? = 1 *************** *** 241,245 **** configure:4070: result: grep -E configure:4075: checking for ANSI C header files ! configure:4100: gcc -c -g -O2 conftest.c >&5 configure:4106: $? = 0 configure:4109: test -z || test ! -s conftest.err --- 241,245 ---- configure:4070: result: grep -E configure:4075: checking for ANSI C header files ! configure:4100: i386-linux-gcc -c -g -O2 conftest.c >&5 configure:4106: $? = 0 configure:4109: test -z || test ! -s conftest.err *************** *** 247,251 **** configure:4115: test -s conftest.o configure:4118: $? = 0 ! configure:4204: gcc -o conftest -g -O2 conftest.c >&5 configure:4207: $? = 0 configure:4209: ./conftest --- 247,251 ---- configure:4115: test -s conftest.o configure:4118: $? = 0 ! configure:4204: i386-linux-gcc -o conftest -g -O2 conftest.c >&5 configure:4207: $? = 0 configure:4209: ./conftest *************** *** 262,266 **** configure:4310: result: -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 configure:4362: checking for sys/types.h ! configure:4378: gcc -c -g -O2 conftest.c >&5 configure:4384: $? = 0 configure:4387: test -z || test ! -s conftest.err --- 262,266 ---- configure:4310: result: -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 configure:4362: checking for sys/types.h ! configure:4378: i386-linux-gcc -c -g -O2 conftest.c >&5 configure:4384: $? = 0 configure:4387: test -z || test ! -s conftest.err *************** *** 270,274 **** configure:4407: result: yes configure:4362: checking for sys/stat.h ! configure:4378: gcc -c -g -O2 conftest.c >&5 configure:4384: $? = 0 configure:4387: test -z || test ! -s conftest.err --- 270,274 ---- configure:4407: result: yes configure:4362: checking for sys/stat.h ! configure:4378: i386-linux-gcc -c -g -O2 conftest.c >&5 configure:4384: $? = 0 configure:4387: test -z || test ! -s conftest.err *************** *** 278,282 **** configure:4407: result: yes configure:4362: checking for stdlib.h ! configure:4378: gcc -c -g -O2 conftest.c >&5 configure:4384: $? = 0 configure:4387: test -z || test ! -s conftest.err --- 278,282 ---- configure:4407: result: yes configure:4362: checking for stdlib.h ! configure:4378: i386-linux-gcc -c -g -O2 conftest.c >&5 configure:4384: $? = 0 configure:4387: test -z || test ! -s conftest.err *************** *** 286,290 **** configure:4407: result: yes configure:4362: checking for string.h ! configure:4378: gcc -c -g -O2 conftest.c >&5 configure:4384: $? = 0 configure:4387: test -z || test ! -s conftest.err --- 286,290 ---- configure:4407: result: yes configure:4362: checking for string.h ! configure:4378: i386-linux-gcc -c -g -O2 conftest.c >&5 configure:4384: $? = 0 configure:4387: test -z || test ! -s conftest.err *************** *** 294,298 **** configure:4407: result: yes configure:4362: checking for memory.h ! configure:4378: gcc -c -g -O2 conftest.c >&5 configure:4384: $? = 0 configure:4387: test -z || test ! -s conftest.err --- 294,298 ---- configure:4407: result: yes configure:4362: checking for memory.h ! configure:4378: i386-linux-gcc -c -g -O2 conftest.c >&5 configure:4384: $? = 0 configure:4387: test -z || test ! -s conftest.err *************** *** 302,306 **** configure:4407: result: yes configure:4362: checking for strings.h ! configure:4378: gcc -c -g -O2 conftest.c >&5 configure:4384: $? = 0 configure:4387: test -z || test ! -s conftest.err --- 302,306 ---- configure:4407: result: yes configure:4362: checking for strings.h ! configure:4378: i386-linux-gcc -c -g -O2 conftest.c >&5 configure:4384: $? = 0 configure:4387: test -z || test ! -s conftest.err *************** *** 310,314 **** configure:4407: result: yes configure:4362: checking for inttypes.h ! configure:4378: gcc -c -g -O2 conftest.c >&5 configure:4384: $? = 0 configure:4387: test -z || test ! -s conftest.err --- 310,314 ---- configure:4407: result: yes configure:4362: checking for inttypes.h ! configure:4378: i386-linux-gcc -c -g -O2 conftest.c >&5 configure:4384: $? = 0 configure:4387: test -z || test ! -s conftest.err *************** *** 318,322 **** configure:4407: result: yes configure:4362: checking for stdint.h ! configure:4378: gcc -c -g -O2 conftest.c >&5 configure:4384: $? = 0 configure:4387: test -z || test ! -s conftest.err --- 318,322 ---- configure:4407: result: yes configure:4362: checking for stdint.h ! configure:4378: i386-linux-gcc -c -g -O2 conftest.c >&5 configure:4384: $? = 0 configure:4387: test -z || test ! -s conftest.err *************** *** 326,330 **** configure:4407: result: yes configure:4362: checking for unistd.h ! configure:4378: gcc -c -g -O2 conftest.c >&5 configure:4384: $? = 0 configure:4387: test -z || test ! -s conftest.err --- 326,330 ---- configure:4407: result: yes configure:4362: checking for unistd.h ! configure:4378: i386-linux-gcc -c -g -O2 conftest.c >&5 configure:4384: $? = 0 configure:4387: test -z || test ! -s conftest.err *************** *** 334,338 **** configure:4407: result: yes configure:4434: checking locale.h usability ! configure:4446: gcc -c -g -O2 conftest.c >&5 configure:4452: $? = 0 configure:4455: test -z || test ! -s conftest.err --- 334,338 ---- configure:4407: result: yes configure:4434: checking locale.h usability ! configure:4446: i386-linux-gcc -c -g -O2 conftest.c >&5 configure:4452: $? = 0 configure:4455: test -z || test ! -s conftest.err *************** *** 342,346 **** configure:4474: result: yes configure:4478: checking locale.h presence ! configure:4488: gcc -E conftest.c configure:4494: $? = 0 configure:4514: result: yes --- 342,346 ---- configure:4474: result: yes configure:4478: checking locale.h presence ! configure:4488: i386-linux-gcc -E conftest.c configure:4494: $? = 0 configure:4514: result: yes *************** *** 348,352 **** configure:4556: result: yes configure:4570: checking for LC_MESSAGES ! configure:4591: gcc -o conftest -g -O2 conftest.c >&5 configure:4597: $? = 0 configure:4600: test -z || test ! -s conftest.err --- 348,352 ---- configure:4556: result: yes configure:4570: checking for LC_MESSAGES ! configure:4591: i386-linux-gcc -o conftest -g -O2 conftest.c >&5 configure:4597: $? = 0 configure:4600: test -z || test ! -s conftest.err *************** *** 356,360 **** configure:4621: result: yes configure:4650: checking libintl.h usability ! configure:4662: gcc -c -g -O2 conftest.c >&5 configure:4668: $? = 0 configure:4671: test -z || test ! -s conftest.err --- 356,360 ---- configure:4621: result: yes configure:4650: checking libintl.h usability ! configure:4662: i386-linux-gcc -c -g -O2 conftest.c >&5 configure:4668: $? = 0 configure:4671: test -z || test ! -s conftest.err *************** *** 364,368 **** configure:4690: result: yes configure:4694: checking libintl.h presence ! configure:4704: gcc -E conftest.c configure:4710: $? = 0 configure:4730: result: yes --- 364,368 ---- configure:4690: result: yes configure:4694: checking libintl.h presence ! configure:4704: i386-linux-gcc -E conftest.c configure:4710: $? = 0 configure:4730: result: yes *************** *** 370,374 **** configure:4772: result: yes configure:4783: checking for dgettext in libc ! configure:4806: gcc -o conftest -g -O2 conftest.c >&5 configure:4812: $? = 0 configure:4815: test -z || test ! -s conftest.err --- 370,374 ---- configure:4772: result: yes configure:4783: checking for dgettext in libc ! configure:4806: i386-linux-gcc -o conftest -g -O2 conftest.c >&5 configure:4812: $? = 0 configure:4815: test -z || test ! -s conftest.err *************** *** 378,382 **** configure:4837: result: yes configure:4845: checking for bind_textdomain_codeset ! configure:4902: gcc -o conftest -g -O2 conftest.c >&5 configure:4908: $? = 0 configure:4911: test -z || test ! -s conftest.err --- 378,382 ---- configure:4837: result: yes configure:4845: checking for bind_textdomain_codeset ! configure:4902: i386-linux-gcc -o conftest -g -O2 conftest.c >&5 configure:4908: $? = 0 configure:4911: test -z || test ! -s conftest.err *************** *** 388,392 **** configure:5327: result: /usr/bin/msgfmt configure:5340: checking for dcgettext ! configure:5397: gcc -o conftest -g -O2 conftest.c >&5 configure:5403: $? = 0 configure:5406: test -z || test ! -s conftest.err --- 388,392 ---- configure:5327: result: /usr/bin/msgfmt configure:5340: checking for dcgettext ! configure:5397: i386-linux-gcc -o conftest -g -O2 conftest.c >&5 configure:5403: $? = 0 configure:5406: test -z || test ! -s conftest.err *************** *** 399,403 **** configure:5479: checking for xgettext configure:5506: result: /usr/bin/xgettext ! configure:5530: gcc -o conftest -g -O2 conftest.c >&5 configure:5536: $? = 0 configure:5539: test -z || test ! -s conftest.err --- 399,403 ---- configure:5479: checking for xgettext configure:5506: result: /usr/bin/xgettext ! configure:5530: i386-linux-gcc -o conftest -g -O2 conftest.c >&5 configure:5536: $? = 0 configure:5539: test -z || test ! -s conftest.err *************** *** 426,430 **** config.status:712: creating po/Makefile.in config.status:816: creating config.h - config.status:936: config.h is unchanged config.status:1116: executing depfiles commands config.status:1116: executing default-1 commands --- 426,429 ---- *************** *** 445,452 **** ac_cv_env_LDFLAGS_set= ac_cv_env_LDFLAGS_value= ! ac_cv_env_build_alias_set= ! ac_cv_env_build_alias_value= ! ac_cv_env_host_alias_set= ! ac_cv_env_host_alias_value= ac_cv_env_target_alias_set= ac_cv_env_target_alias_value= --- 444,451 ---- ac_cv_env_LDFLAGS_set= ac_cv_env_LDFLAGS_value= ! ac_cv_env_build_alias_set=set ! ac_cv_env_build_alias_value=i386-linux ! ac_cv_env_host_alias_set=set ! ac_cv_env_host_alias_value=i386-linux ac_cv_env_target_alias_set= ac_cv_env_target_alias_value= *************** *** 474,479 **** ac_cv_path_install='/usr/bin/install -c' ac_cv_prog_AWK=mawk ! ac_cv_prog_CPP='gcc -E' ! ac_cv_prog_ac_ct_CC=gcc ac_cv_prog_cc_g=yes ac_cv_prog_cc_stdc= --- 473,478 ---- ac_cv_path_install='/usr/bin/install -c' ac_cv_prog_AWK=mawk ! ac_cv_prog_CC=i386-linux-gcc ! ac_cv_prog_CPP='i386-linux-gcc -E' ac_cv_prog_cc_g=yes ac_cv_prog_cc_stdc= *************** *** 502,509 **** CATALOGS='' CATOBJEXT='.gmo' ! CC='gcc' CCDEPMODE='depmode=gcc3' CFLAGS='-g -O2' ! CPP='gcc -E' CPPFLAGS='' CYGPATH_W='echo' --- 501,508 ---- CATALOGS='' CATOBJEXT='.gmo' ! CC='i386-linux-gcc' CCDEPMODE='depmode=gcc3' CFLAGS='-g -O2' ! CPP='i386-linux-gcc -E' CPPFLAGS='' CYGPATH_W='echo' *************** *** 529,535 **** LIBS='' LTLIBOBJS='' ! MAINT='' ! MAINTAINER_MODE_FALSE='#' ! MAINTAINER_MODE_TRUE='' MAKEINFO='makeinfo' MKINSTALLDIRS='./mkinstalldirs' --- 528,534 ---- LIBS='' LTLIBOBJS='' ! MAINT='#' ! MAINTAINER_MODE_FALSE='' ! MAINTAINER_MODE_TRUE='#' MAKEINFO='makeinfo' MKINSTALLDIRS='./mkinstalldirs' *************** *** 556,560 **** VERSION='0.1' XGETTEXT='/usr/bin/xgettext' ! ac_ct_CC='gcc' ac_ct_STRIP='' am__fastdepCC_FALSE='#' --- 555,559 ---- VERSION='0.1' XGETTEXT='/usr/bin/xgettext' ! ac_ct_CC='' ac_ct_STRIP='' am__fastdepCC_FALSE='#' *************** *** 564,580 **** am__quote='' bindir='${exec_prefix}/bin' ! build_alias='' datadir='${prefix}/share' exec_prefix='${prefix}' ! host_alias='' includedir='${prefix}/include' ! infodir='${prefix}/info' install_sh='/root/morphix/mcp/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' --- 563,579 ---- am__quote='' bindir='${exec_prefix}/bin' ! build_alias='i386-linux' datadir='${prefix}/share' exec_prefix='${prefix}' ! host_alias='i386-linux' includedir='${prefix}/include' ! infodir='${prefix}/share/info' install_sh='/root/morphix/mcp/install-sh' libdir='${exec_prefix}/lib' libexecdir='${exec_prefix}/libexec' localstatedir='${prefix}/var' ! mandir='${prefix}/share/man' oldincludedir='/usr/include' ! prefix='/usr' program_transform_name='s,x,x,' sbindir='${exec_prefix}/sbin' *************** *** 613,632 **** configure: exit 0 - - ## ---------------------- ## - ## Running config.status. ## - ## ---------------------- ## - - This file was extended by config.status, which was - generated by GNU Autoconf 2.58. Invocation command line was - - CONFIG_FILES = - CONFIG_HEADERS = - CONFIG_LINKS = - CONFIG_COMMANDS = - $ ./config.status config.h - - on myBox - - config.status:816: creating config.h - config.status:936: config.h is unchanged --- 612,613 ---- Index: config.status =================================================================== RCS file: /cvsroot/morphix/mcp/config.status,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** config.status 2 Mar 2004 23:41:05 -0000 1.3 --- config.status 7 Mar 2004 22:58:24 -0000 1.4 *************** *** 305,309 **** config.status configured by ./configure, generated by GNU Autoconf 2.58, ! with options \"'--enable-maintainer-mode'\" Copyright (C) 2003 Free Software Foundation, Inc. --- 305,309 ---- config.status configured by ./configure, generated by GNU Autoconf 2.58, ! with options \"'--host=i386-linux' '--build=i386-linux' '--prefix=/usr' '--mandir=\${prefix}/share/man' '--infodir=\${prefix}/share/info' 'build_alias=i386-linux' 'host_alias=i386-linux'\" Copyright (C) 2003 Free Software Foundation, Inc. *************** *** 384,389 **** if $ac_cs_recheck; then ! echo "running /bin/sh ./configure " '--enable-maintainer-mode' $ac_configure_extra_args " --no-create --no-recursion" >&6 ! exec /bin/sh ./configure '--enable-maintainer-mode' $ac_configure_extra_args --no-create --no-recursion fi --- 384,389 ---- if $ac_cs_recheck; then ! echo "running /bin/sh ./configure " '--host=i386-linux' '--build=i386-linux' '--prefix=/usr' '--mandir=${prefix}/share/man' '--infodir=${prefix}/share/info' 'build_alias=i386-linux' 'host_alias=i386-linux' $ac_configure_extra_args " --no-create --no-recursion" >&6 ! exec /bin/sh ./configure '--host=i386-linux' '--build=i386-linux' '--prefix=/usr' '--mandir=${prefix}/share/man' '--infodir=${prefix}/share/info' 'build_alias=i386-linux' 'host_alias=i386-linux' $ac_configure_extra_args --no-create --no-recursion fi *************** *** 465,469 **** s,@PACKAGE_BUGREPORT@,,;t t s,@exec_prefix@,${prefix},;t t ! s,@prefix@,/usr/local,;t t s,@program_transform_name@,s,x,x,,;t t s,@bindir@,${exec_prefix}/bin,;t t --- 465,469 ---- s,@PACKAGE_BUGREPORT@,,;t t s,@exec_prefix@,${prefix},;t t ! s,@prefix@,/usr,;t t s,@program_transform_name@,s,x,x,,;t t s,@bindir@,${exec_prefix}/bin,;t t *************** *** 477,484 **** s,@includedir@,${prefix}/include,;t t s,@oldincludedir@,/usr/include,;t t ! s,@infodir@,${prefix}/info,;t t ! s,@mandir@,${prefix}/man,;t t ! s,@build_alias@,,;t t ! s,@host_alias@,,;t t s,@target_alias@,,;t t s,@DEFS@,-DHAVE_CONFIG_H,;t t --- 477,484 ---- s,@includedir@,${prefix}/include,;t t s,@oldincludedir@,/usr/include,;t t ! s,@infodir@,${prefix}/share/info,;t t ! s,@mandir@,${prefix}/share/man,;t t ! s,@build_alias@,i386-linux,;t t ! s,@host_alias@,i386-linux,;t t s,@target_alias@,,;t t s,@DEFS@,-DHAVE_CONFIG_H,;t t *************** *** 506,517 **** s,@SET_MAKE@,,;t t s,@am__leading_dot@,.,;t t ! s,@MAINTAINER_MODE_TRUE@,,;t t ! s,@MAINTAINER_MODE_FALSE@,#,;t t ! s,@MAINT@,,;t t ! s,@CC@,gcc,;t t s,@CFLAGS@,-g -O2,;t t s,@LDFLAGS@,,;t t s,@CPPFLAGS@,,;t t ! s,@ac_ct_CC@,gcc,;t t s,@EXEEXT@,,;t t s,@OBJEXT@,o,;t t --- 506,517 ---- s,@SET_MAKE@,,;t t s,@am__leading_dot@,.,;t t ! s,@MAINTAINER_MODE_TRUE@,#,;t t ! s,@MAINTAINER_MODE_FALSE@,,;t t ! s,@MAINT@,#,;t t ! s,@CC@,i386-linux-gcc,;t t s,@CFLAGS@,-g -O2,;t t s,@LDFLAGS@,,;t t s,@CPPFLAGS@,,;t t ! s,@ac_ct_CC@,,;t t s,@EXEEXT@,,;t t s,@OBJEXT@,o,;t t *************** *** 525,529 **** s,@am__fastdepCC_TRUE@,,;t t s,@am__fastdepCC_FALSE@,#,;t t ! s,@CPP@,gcc -E,;t t s,@EGREP@,grep -E,;t t s,@PKG_CONFIG@,/usr/bin/pkg-config,;t t --- 525,529 ---- s,@am__fastdepCC_TRUE@,,;t t s,@am__fastdepCC_FALSE@,#,;t t ! s,@CPP@,i386-linux-gcc -E,;t t s,@EGREP@,grep -E,;t t s,@PKG_CONFIG@,/usr/bin/pkg-config,;t t Index: mcp.glade =================================================================== RCS file: /cvsroot/morphix/mcp/mcp.glade,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mcp.glade 2 Mar 2004 23:41:05 -0000 1.3 --- mcp.glade 7 Mar 2004 22:58:24 -0000 1.4 *************** *** 5,10 **** <widget class="GtkWindow" id="MainWindow"> - <property name="width_request">400</property> - <property name="height_request">350</property> <property name="visible">True</property> <property name="title" translatable="yes">Morphix Control Panel</property> --- 5,8 ---- *************** *** 12,18 **** <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">False</property> <property name="destroy_with_parent">True</property> <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sun, 29 Jun 2003 22:05:39 GMT"/> --- 10,16 ---- <property name="window_position">GTK_WIN_POS_NONE</property> <property name="modal">False</property> ! <property name="default_width">450</property> ! <property name="default_height">350</property> ! <property name="resizable">True</property> <property name="destroy_with_parent">True</property> <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sun, 29 Jun 2003 22:05:39 GMT"/> *************** *** 27,37 **** <child> ! <widget class="GtkHBox" id="hbox1"> <property name="visible">True</property> ! <property name="homogeneous">False</property> ! <property name="spacing">0</property> <child> ! <widget class="GtkScrolledWindow" id="scrolledwindow1"> <property name="can_focus">True</property> <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> --- 25,36 ---- <child> ! <widget class="GtkHPaned" id="hpaned1"> <property name="visible">True</property> ! <property name="can_focus">True</property> ! <property name="position">1</property> <child> ! <widget class="GtkScrolledWindow" id="scrolledwindow3"> ! <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> *************** *** 53,84 **** </widget> <packing> ! <property name="padding">0</property> ! <property name="expand">False</property> ! <property name="fill">False</property> ! </packing> ! </child> ! ! <child> ! <widget class="GtkVSeparator" id="vseparator1"> ! </widget> ! <packing> ! <property name="padding">5</property> ! <property name="expand">False</property> ! <property name="fill">False</property> </packing> </child> <child> ! <widget class="GtkDrawingArea" id="MainDrawingArea"> <property name="visible">True</property> ! <signal name="destroy_event" handler="gtk_main_quit" last_modification_time="Sun, 29 Jun 2003 13:42:10 GMT"/> ! <signal name="button_press_event" handler="on_MainDrawingArea_button_press_event" last_modification_time="Tue, 17 Feb 2004 16:54:32 GMT"/> ! <signal name="expose_event" handler="on_MainDrawingArea_expose_event" last_modification_time="Tue, 17 Feb 2004 16:54:48 GMT"/> ! <signal name="key_press_event" handler="on_MainDrawingArea_key_press_event" last_modification_time="Thu, 19 Feb 2004 10:05:00 GMT"/> </widget> <packing> ! <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> </packing> </child> --- 52,76 ---- </widget> <packing> ! <property name="shrink">True</property> ! <property name="resize">False</property> </packing> </child> <child> ! <widget class="GtkScrolledWindow" id="scrolledwindow2"> <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> ! <placeholder/> ! </child> </widget> <packing> ! <property name="shrink">True</property> ! <property name="resize">True</property> </packing> </child> |
|
From: <ale...@us...> - 2004-03-07 23:22:16
|
Update of /cvsroot/morphix/mcp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27119/src Modified Files: Makefile Makefile.am Makefile.in Log Message: mcp updates Index: Makefile =================================================================== RCS file: /cvsroot/morphix/mcp/src/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile 3 Mar 2004 21:16:43 -0000 1.6 --- Makefile 7 Mar 2004 22:58:24 -0000 1.7 *************** *** 46,53 **** CATALOGS = CATOBJEXT = .gmo ! CC = gcc CCDEPMODE = depmode=gcc3 CFLAGS = -g -O2 ! CPP = gcc -E CPPFLAGS = CYGPATH_W = echo --- 46,53 ---- CATALOGS = CATOBJEXT = .gmo ! CC = i386-linux-gcc CCDEPMODE = depmode=gcc3 CFLAGS = -g -O2 ! CPP = i386-linux-gcc -E CPPFLAGS = CYGPATH_W = echo *************** *** 73,79 **** LIBS = LTLIBOBJS = ! MAINT = ! MAINTAINER_MODE_FALSE = # ! MAINTAINER_MODE_TRUE = MAKEINFO = makeinfo MKINSTALLDIRS = ./mkinstalldirs --- 73,79 ---- LIBS = LTLIBOBJS = ! MAINT = # ! MAINTAINER_MODE_FALSE = ! MAINTAINER_MODE_TRUE = # MAKEINFO = makeinfo MKINSTALLDIRS = ./mkinstalldirs *************** *** 100,104 **** VERSION = 0.1 XGETTEXT = /usr/bin/xgettext ! ac_ct_CC = gcc ac_ct_STRIP = am__fastdepCC_FALSE = # --- 100,104 ---- VERSION = 0.1 XGETTEXT = /usr/bin/xgettext ! ac_ct_CC = ac_ct_STRIP = am__fastdepCC_FALSE = # *************** *** 108,124 **** am__quote = bindir = ${exec_prefix}/bin ! build_alias = datadir = ${prefix}/share exec_prefix = ${prefix} ! host_alias = includedir = ${prefix}/include ! infodir = ${prefix}/info install_sh = /root/morphix/mcp/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 --- 108,124 ---- am__quote = bindir = ${exec_prefix}/bin ! build_alias = i386-linux datadir = ${prefix}/share exec_prefix = ${prefix} ! host_alias = i386-linux includedir = ${prefix}/include ! infodir = ${prefix}/share/info install_sh = /root/morphix/mcp/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localstatedir = ${prefix}/var ! mandir = ${prefix}/share/man oldincludedir = /usr/include ! prefix = /usr program_transform_name = s,x,x, sbindir = ${exec_prefix}/sbin *************** *** 133,136 **** --- 133,138 ---- + bin_SCRIPTS = morphix-control-panel + bin_PROGRAMS = mcp *************** *** 164,167 **** --- 166,171 ---- mcp_DEPENDENCIES = mcp_LDFLAGS = + SCRIPTS = $(bin_SCRIPTS) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) *************** *** 187,194 **** .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) --- 191,198 ---- .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) *************** *** 219,222 **** --- 223,246 ---- @rm -f mcp$(EXEEXT) $(LINK) $(mcp_LDFLAGS) $(mcp_OBJECTS) $(mcp_LDADD) $(LIBS) + binSCRIPT_INSTALL = $(INSTALL_SCRIPT) + install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \ + $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \ + else :; fi; \ + done + + uninstall-binSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ + rm -f $(DESTDIR)$(bindir)/$$f; \ + done mostlyclean-compile: *************** *** 347,354 **** check-am: all-am check: check-am ! all-am: Makefile $(PROGRAMS) installdirs: ! $(mkinstalldirs) $(DESTDIR)$(bindir) install: install-am install-exec: install-exec-am --- 371,378 ---- check-am: all-am check: check-am ! all-am: Makefile $(PROGRAMS) $(SCRIPTS) installdirs: ! $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) install: install-am install-exec: install-exec-am *************** *** 395,399 **** install-data-am: ! install-exec-am: install-binPROGRAMS install-info: install-info-am --- 419,423 ---- install-data-am: ! install-exec-am: install-binPROGRAMS install-binSCRIPTS install-info: install-info-am *************** *** 420,435 **** 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. --- 444,461 ---- ps-am: ! uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ ! 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-binSCRIPTS 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-binSCRIPTS uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. Index: Makefile.am =================================================================== RCS file: /cvsroot/morphix/mcp/src/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 3 Mar 2004 21:16:43 -0000 1.5 --- Makefile.am 7 Mar 2004 22:58:24 -0000 1.6 *************** *** 6,9 **** --- 6,11 ---- @PACKAGE_CFLAGS@ + bin_SCRIPTS = morphix-control-panel + bin_PROGRAMS = mcp Index: Makefile.in =================================================================== RCS file: /cvsroot/morphix/mcp/src/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.in 3 Mar 2004 21:16:43 -0000 1.6 --- Makefile.in 7 Mar 2004 22:58:24 -0000 1.7 *************** *** 133,136 **** --- 133,138 ---- + bin_SCRIPTS = morphix-control-panel + bin_PROGRAMS = mcp *************** *** 164,167 **** --- 166,171 ---- mcp_DEPENDENCIES = mcp_LDFLAGS = + SCRIPTS = $(bin_SCRIPTS) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) *************** *** 219,222 **** --- 223,246 ---- @rm -f mcp$(EXEEXT) $(LINK) $(mcp_LDFLAGS) $(mcp_OBJECTS) $(mcp_LDADD) $(LIBS) + binSCRIPT_INSTALL = $(INSTALL_SCRIPT) + install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \ + $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \ + else :; fi; \ + done + + uninstall-binSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ + rm -f $(DESTDIR)$(bindir)/$$f; \ + done mostlyclean-compile: *************** *** 347,354 **** check-am: all-am check: check-am ! all-am: Makefile $(PROGRAMS) installdirs: ! $(mkinstalldirs) $(DESTDIR)$(bindir) install: install-am install-exec: install-exec-am --- 371,378 ---- check-am: all-am check: check-am ! all-am: Makefile $(PROGRAMS) $(SCRIPTS) installdirs: ! $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) install: install-am install-exec: install-exec-am *************** *** 395,399 **** install-data-am: ! install-exec-am: install-binPROGRAMS install-info: install-info-am --- 419,423 ---- install-data-am: ! install-exec-am: install-binPROGRAMS install-binSCRIPTS install-info: install-info-am *************** *** 420,435 **** 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. --- 444,461 ---- ps-am: ! uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ ! 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-binSCRIPTS 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-binSCRIPTS uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. |
|
From: <ale...@us...> - 2004-03-07 23:22:15
|
Update of /cvsroot/morphix/mcp/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27119/po Modified Files: Makefile Makefile.in Log Message: mcp updates Index: Makefile =================================================================== RCS file: /cvsroot/morphix/mcp/po/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile 1 Sep 2003 19:25:17 -0000 1.1.1.1 --- Makefile 7 Mar 2004 22:58:24 -0000 1.2 *************** *** 24,28 **** ! prefix = /usr/local exec_prefix = ${prefix} datadir = ${prefix}/share --- 24,28 ---- ! prefix = /usr exec_prefix = ${prefix} datadir = ${prefix}/share *************** *** 37,41 **** MKINSTALLDIRS = $(top_srcdir)/./mkinstalldirs ! CC = gcc GENCAT = @GENCAT@ GMSGFMT = /usr/bin/msgfmt --- 37,41 ---- MKINSTALLDIRS = $(top_srcdir)/./mkinstalldirs ! CC = i386-linux-gcc GENCAT = @GENCAT@ GMSGFMT = /usr/bin/msgfmt Index: Makefile.in =================================================================== RCS file: /cvsroot/morphix/mcp/po/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:25:17 -0000 1.1.1.1 --- Makefile.in 7 Mar 2004 22:58:24 -0000 1.2 *************** *** 24,28 **** ! prefix = /usr/local exec_prefix = ${prefix} datadir = ${prefix}/share --- 24,28 ---- ! prefix = /usr exec_prefix = ${prefix} datadir = ${prefix}/share *************** *** 37,41 **** MKINSTALLDIRS = $(top_srcdir)/./mkinstalldirs ! CC = gcc GENCAT = @GENCAT@ GMSGFMT = /usr/bin/msgfmt --- 37,41 ---- MKINSTALLDIRS = $(top_srcdir)/./mkinstalldirs ! CC = i386-linux-gcc GENCAT = @GENCAT@ GMSGFMT = /usr/bin/msgfmt |
|
From: <ale...@us...> - 2004-03-07 22:33:54
|
Update of /cvsroot/morphix/partitionmorpher In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17527 Modified Files: partitionmorpher.glade Log Message: updated to version 0.2-0 Index: partitionmorpher.glade =================================================================== RCS file: /cvsroot/morphix/partitionmorpher/partitionmorpher.glade,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** partitionmorpher.glade 10 Jan 2004 10:25:31 -0000 1.10 --- partitionmorpher.glade 7 Mar 2004 22:10:01 -0000 1.11 *************** *** 609,613 **** <property name="label" translatable="yes">Begin of free space</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_begin_of_free_space1_activate" last_modification_time="Thu, 06 Mar 2003 23:30:08 GMT"/> </widget> </child> --- 609,612 ---- *************** *** 618,622 **** <property name="label" translatable="yes">End of free space</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_end_of_free_space1_activate" last_modification_time="Thu, 06 Mar 2003 23:30:08 GMT"/> </widget> </child> --- 617,620 ---- *************** *** 2469,2473 **** <property name="label" translatable="yes">ext2</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_ext4_activate" last_modification_time="Sun, 06 Apr 2003 01:16:58 GMT"/> </widget> </child> --- 2467,2470 ---- *************** *** 2478,2482 **** <property name="label" translatable="yes">ext3</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_ext5_activate" last_modification_time="Sun, 06 Apr 2003 01:16:58 GMT"/> </widget> </child> --- 2475,2478 ---- *************** *** 2487,2491 **** <property name="label" translatable="yes">reiserfs</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_reiserfs2_activate" last_modification_time="Sun, 06 Apr 2003 01:16:58 GMT"/> </widget> </child> --- 2483,2486 ---- *************** *** 2496,2500 **** <property name="label" translatable="yes">xfs</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_xfs2_activate" last_modification_time="Sun, 06 Apr 2003 01:16:58 GMT"/> </widget> </child> --- 2491,2494 ---- *************** *** 3076,3080 **** <property name="label" translatable="yes">msdos</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_msdos1_activate" last_modification_time="Mon, 07 Apr 2003 14:59:23 GMT"/> </widget> </child> --- 3070,3073 ---- *************** *** 3091,3095 **** <property name="label" translatable="yes">bsd</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_bsd1_activate" last_modification_time="Mon, 07 Apr 2003 14:59:23 GMT"/> </widget> </child> --- 3084,3087 ---- *************** *** 3100,3104 **** <property name="label" translatable="yes">gpt</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_gpt1_activate" last_modification_time="Mon, 07 Apr 2003 14:59:23 GMT"/> </widget> </child> --- 3092,3095 ---- *************** *** 3109,3113 **** <property name="label" translatable="yes">mac</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_mac1_activate" last_modification_time="Mon, 07 Apr 2003 14:59:23 GMT"/> </widget> </child> --- 3100,3103 ---- *************** *** 3118,3122 **** <property name="label" translatable="yes">mips</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_mips1_activate" last_modification_time="Mon, 07 Apr 2003 14:59:23 GMT"/> </widget> </child> --- 3108,3111 ---- *************** *** 3127,3131 **** <property name="label" translatable="yes">pc98</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_pc1_activate" last_modification_time="Mon, 07 Apr 2003 14:59:23 GMT"/> </widget> </child> --- 3116,3119 ---- *************** *** 3136,3140 **** <property name="label" translatable="yes">sun</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_sun1_activate" last_modification_time="Mon, 07 Apr 2003 14:59:23 GMT"/> </widget> </child> --- 3124,3127 ---- *************** *** 3145,3149 **** <property name="label" translatable="yes">loop</property> <property name="use_underline">True</property> - <signal name="activate" handler="on_loop1_activate" last_modification_time="Mon, 07 Apr 2003 14:59:23 GMT"/> </widget> </child> --- 3132,3135 ---- |
|
From: <ale...@us...> - 2004-03-07 22:33:53
|
Update of /cvsroot/morphix/partitionmorpher/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17527/src Modified Files: callbacks.c callbacks.h interface.c pm_libparted.c ui.c Log Message: updated to version 0.2-0 Index: callbacks.c =================================================================== RCS file: /cvsroot/morphix/partitionmorpher/src/callbacks.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** callbacks.c 15 Feb 2004 14:29:02 -0000 1.16 --- callbacks.c 7 Mar 2004 22:10:02 -0000 1.17 *************** *** 131,137 **** gtk_label_set_text(GTK_LABEL(device_label),partinfo[selected_partition].partname); gtk_label_set_text(GTK_LABEL(fs_label),partinfo[selected_partition].temp_fs_name); ! sprintf(buffer,"%ld MB",partinfo[selected_partition].mb_min_size); gtk_label_set_text(GTK_LABEL(min_size_label),buffer); ! sprintf(buffer,"%ld MB",partinfo[selected_partition].mb_max_size); gtk_label_set_text(GTK_LABEL(max_size_label),buffer); sprintf(buffer,"%ld MB",partinfo[selected_partition].size); --- 131,137 ---- gtk_label_set_text(GTK_LABEL(device_label),partinfo[selected_partition].partname); gtk_label_set_text(GTK_LABEL(fs_label),partinfo[selected_partition].temp_fs_name); ! sprintf(buffer,"%ld MB",partinfo[selected_partition].min_size); gtk_label_set_text(GTK_LABEL(min_size_label),buffer); ! sprintf(buffer,"%ld MB",partinfo[selected_partition].max_size); gtk_label_set_text(GTK_LABEL(max_size_label),buffer); sprintf(buffer,"%ld MB",partinfo[selected_partition].size); *************** *** 221,226 **** } - - void on_treeview1_row_activated (GtkTreeView *treeview, --- 221,224 ---- *************** *** 232,292 **** } - - void - on_linux1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_linux_swap1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_freebsd1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_openbsd1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_netbsd1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_windows__fat32_1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_windows__ntfs_1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - void on_begin_of_free_space1_activate (GtkMenuItem *menuitem, --- 230,233 ---- *************** *** 379,400 **** gtk_tree_view_append_column(GTK_TREE_VIEW(tree),column); - /* (partition start in sectors) */ - /* - renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes( - "Start Sector", - renderer, - "text",PART_START, - 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( - "End Sector", - renderer, - "text",PART_END, - 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( --- 320,323 ---- *************** *** 440,476 **** } - - void - on_ext2_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_ext3_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_reiserfs1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_xfs1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - void on_cancelbutton7_clicked (GtkButton *button, --- 363,366 ---- *************** *** 488,524 **** } - - void - on_ext4_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_ext5_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_reiserfs2_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_xfs2_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - void on_okbutton8_clicked (GtkButton *button, --- 378,381 ---- *************** *** 726,794 **** } - - void - on_msdos1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_bsd1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_gpt1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_mac1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_mips1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_pc1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_sun1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_loop1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - void on_TableOkButton_clicked (GtkButton *button, --- 583,586 ---- *************** *** 835,928 **** } - - void - on_swap1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_none1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_extended1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_logical1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_hfs1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_jfs1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_hp_ufs2_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_sun_ufs2_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_ntfs1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_fat1_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void - on_fat2_activate (GtkMenuItem *menuitem, - gpointer user_data) - { - - } - - - void on_CreateWindow_show (GtkWidget *widget, --- 627,630 ---- Index: callbacks.h =================================================================== RCS file: /cvsroot/morphix/partitionmorpher/src/callbacks.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** callbacks.h 10 Jan 2004 10:25:31 -0000 1.6 --- callbacks.h 7 Mar 2004 22:10:03 -0000 1.7 *************** *** 46,77 **** void - on_linux1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_linux_swap1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_freebsd1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_openbsd1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_netbsd1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_windows__fat32_1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_windows__ntfs_1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void on_begin_of_free_space1_activate (GtkMenuItem *menuitem, gpointer user_data); --- 46,49 ---- *************** *** 102,121 **** void - on_ext2_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_ext3_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_reiserfs1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_xfs1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void on_cancelbutton7_clicked (GtkButton *button, gpointer user_data); --- 74,77 ---- *************** *** 126,145 **** void - on_ext4_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_ext5_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_reiserfs2_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_xfs2_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void on_okbutton8_clicked (GtkButton *button, gpointer user_data); --- 82,85 ---- *************** *** 174,257 **** void - on_msdos1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_bsd1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_gpt1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_mac1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_mips1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_pc1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_sun1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_loop1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void on_TableOkButton_clicked (GtkButton *button, gpointer user_data); void - on_swap1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_none1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_extended1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_logical1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_hfs1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_jfs1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_hp_ufs2_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_sun_ufs2_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_ntfs1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_fat1_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void - on_fat2_activate (GtkMenuItem *menuitem, - gpointer user_data); - - void on_ErrorOkButton_clicked (GtkButton *button, gpointer user_data); --- 114,121 ---- Index: interface.c =================================================================== RCS file: /cvsroot/morphix/partitionmorpher/src/interface.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** interface.c 10 Jan 2004 10:25:31 -0000 1.10 --- interface.c 7 Mar 2004 22:10:03 -0000 1.11 *************** *** 601,610 **** G_CALLBACK (gtk_widget_hide), NULL); - g_signal_connect ((gpointer) begin_of_free_space1, "activate", - G_CALLBACK (on_begin_of_free_space1_activate), - NULL); - g_signal_connect ((gpointer) end_of_free_space1, "activate", - G_CALLBACK (on_end_of_free_space1_activate), - NULL); g_signal_connect ((gpointer) CreatePrimaryRadiobutton, "toggled", G_CALLBACK (on_CreatePrimaryRadiobutton_toggled), --- 601,604 ---- *************** *** 1410,1425 **** G_CALLBACK (gtk_widget_hide), NULL); - g_signal_connect ((gpointer) ext4, "activate", - G_CALLBACK (on_ext4_activate), - NULL); - g_signal_connect ((gpointer) ext5, "activate", - G_CALLBACK (on_ext5_activate), - NULL); - g_signal_connect ((gpointer) reiserfs2, "activate", - G_CALLBACK (on_reiserfs2_activate), - NULL); - g_signal_connect ((gpointer) xfs2, "activate", - G_CALLBACK (on_xfs2_activate), - NULL); g_signal_connect_swapped ((gpointer) cancelbutton8, "clicked", G_CALLBACK (gtk_widget_hide), --- 1404,1407 ---- *************** *** 1771,1798 **** G_CALLBACK (on_TableWindow_show), NULL); - g_signal_connect ((gpointer) msdos1, "activate", - G_CALLBACK (on_msdos1_activate), - NULL); - g_signal_connect ((gpointer) bsd1, "activate", - G_CALLBACK (on_bsd1_activate), - NULL); - g_signal_connect ((gpointer) gpt1, "activate", - G_CALLBACK (on_gpt1_activate), - NULL); - g_signal_connect ((gpointer) mac1, "activate", - G_CALLBACK (on_mac1_activate), - NULL); - g_signal_connect ((gpointer) mips1, "activate", - G_CALLBACK (on_mips1_activate), - NULL); - g_signal_connect ((gpointer) pc1, "activate", - G_CALLBACK (on_pc1_activate), - NULL); - g_signal_connect ((gpointer) sun1, "activate", - G_CALLBACK (on_sun1_activate), - NULL); - g_signal_connect ((gpointer) loop1, "activate", - G_CALLBACK (on_loop1_activate), - NULL); g_signal_connect_swapped ((gpointer) cancelbutton10, "clicked", G_CALLBACK (gtk_widget_hide), --- 1753,1756 ---- Index: pm_libparted.c =================================================================== RCS file: /cvsroot/morphix/partitionmorpher/src/pm_libparted.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** pm_libparted.c 15 Feb 2004 14:29:02 -0000 1.12 --- pm_libparted.c 7 Mar 2004 22:10:03 -0000 1.13 *************** *** 1209,1214 **** --- 1209,1217 ---- partinfo[i].mb_t_end = -1; } + partinfo[i].max_size = (int) pm_partition_max_resize(part); + partinfo[i].min_size = (int) pm_partition_min_resize(part); PedFileSystem *fs = ped_file_system_open(&part->geom); if (fs) { + /* pm_debug("Debug: Checking if partition %s is resizable...\n", partinfo[i].partname); *************** *** 1226,1229 **** --- 1229,1233 ---- pm_debug("Debug: constraint failed! Can'tresize %dth partition\n",i); } + */ ped_file_system_close(fs); // The following two lines shouldn't be necessary since we initialize partinfo[i].label to "" Index: ui.c =================================================================== RCS file: /cvsroot/morphix/partitionmorpher/src/ui.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ui.c 15 Feb 2004 14:29:02 -0000 1.5 --- ui.c 7 Mar 2004 22:10:03 -0000 1.6 *************** *** 274,279 **** gtk_widget_set_sensitive(resize_widget,FALSE); } ! gtk_widget_set_sensitive(move_widget,TRUE); ! gtk_widget_set_sensitive(convert_widget,TRUE); gtk_widget_set_sensitive(delete_widget,TRUE); } --- 274,279 ---- gtk_widget_set_sensitive(resize_widget,FALSE); } ! gtk_widget_set_sensitive(move_widget,FALSE); ! gtk_widget_set_sensitive(convert_widget,FALSE); gtk_widget_set_sensitive(delete_widget,TRUE); } |
|
From: <ale...@us...> - 2004-03-07 22:33:52
|
Update of /cvsroot/morphix/partitionmorpher/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17527/debian Modified Files: changelog control files Log Message: updated to version 0.2-0 Index: changelog =================================================================== RCS file: /cvsroot/morphix/partitionmorpher/debian/changelog,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** changelog 2 Feb 2004 01:42:57 -0000 1.2 --- changelog 7 Mar 2004 22:10:02 -0000 1.3 *************** *** 1,2 **** --- 1,14 ---- + partitionmorpher (2.0-0) unstable; urgency=low + + * bumped the version + + -- Alex de Landgraaf <ale...@xs...> Sun, 7 Mar 2004 22:58:18 +0000 + + partitionmorpher (0.1-4) unstable; urgency=low + + * updated a few bugs/features + + -- Alex de Landgraaf <ale...@xs...> Sun, 7 Mar 2004 22:57:43 +0000 + partitionmorpher (0.1-3) unstable; urgency=low Index: control =================================================================== RCS file: /cvsroot/morphix/partitionmorpher/debian/control,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** control 3 Jan 2004 14:39:43 -0000 1.1 --- control 7 Mar 2004 22:10:02 -0000 1.2 *************** *** 10,14 **** Depends: ${shlibs:Depends}, libc6 (>= 2.3.2-1), libparted1.6-0 (>= 1.6.0), libglib2.0-0, libgtk2.0-0, libpango1.0-0 Recommends: ntfstools, libreiserfs0 ! Description: Graphical Partitioner Partition Magic clone, built for the Morphix project in conjunction with the morphixinstaller. --- 10,14 ---- Depends: ${shlibs:Depends}, libc6 (>= 2.3.2-1), libparted1.6-0 (>= 1.6.0), libglib2.0-0, libgtk2.0-0, libpango1.0-0 Recommends: ntfstools, libreiserfs0 ! Description: graphical stand-alone partitioner for Morphix Partition Magic clone, built for the Morphix project in conjunction with the morphixinstaller. Index: files =================================================================== RCS file: /cvsroot/morphix/partitionmorpher/debian/files,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** files 15 Feb 2004 14:29:02 -0000 1.3 --- files 7 Mar 2004 22:10:02 -0000 1.4 *************** *** 1 **** ! partitionmorpher_0.1-3_i386.deb admin optional --- 1 ---- ! partitionmorpher_2.0-0_i386.deb admin optional |
|
From: <ale...@us...> - 2004-03-07 21:43:05
|
Update of /cvsroot/morphix/morphixinstaller/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6591/src Modified Files: callbacks.c callbacks.h instlib.c interface.c main.c Log Message: updated to 0.2-1 Index: callbacks.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/callbacks.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** callbacks.c 7 Mar 2004 03:40:51 -0000 1.17 --- callbacks.c 7 Mar 2004 21:19:07 -0000 1.18 *************** *** 426,429 **** --- 426,430 ---- gpointer user_data) { + GtkWidget *next = lookup_widget(SelectHarddisk,"okbuttonHarddisk"); // add the list of available harddisks to the combo box if (cmdlineargs.harddisk_set == TRUE) { *************** *** 437,440 **** --- 438,447 ---- else { GList *hdlist = GetHarddiskList(TRUE); + if (hdlist == NULL) { + gtk_widget_set_sensitive(next,FALSE); + } + else { + gtk_widget_set_sensitive(next,TRUE); + } gtk_combo_set_popdown_strings(GTK_COMBO(widget),hdlist); FreeStringList(hdlist); *************** *** 485,490 **** --- 492,504 ---- else { GtkWidget *optionmenu = lookup_widget(SelectRoot,"optionmenuFS2"); + GtkWidget *okbutton = lookup_widget(SelectRoot,"okbuttonRoot"); gtk_option_menu_set_history(GTK_OPTION_MENU(optionmenu),1); GList *list = GetPartList(FALSE,TRUE); /* fluffy rootpart list */ + if (list == NULL) { + gtk_widget_set_sensitive(okbutton,FALSE); + } + else { + gtk_widget_set_sensitive(okbutton,TRUE); + } gtk_combo_set_popdown_strings(GTK_COMBO(widget),list); FreeStringList(list); *************** *** 508,518 **** gpointer user_data) { ! GtkWidget *back = lookup_widget(widget,"BackButton"); ! GtkWidget *quit = lookup_widget(widget,"QuitButton"); ! GtkWidget *label = lookup_widget(widget,"ErrorLabelLabel"); if (ErrorBackButton()) - gtk_widget_hide(back); - else gtk_widget_hide(quit); gtk_label_set_text(GTK_LABEL(label),error_msg); } --- 522,532 ---- gpointer user_data) { ! GtkWidget *back = lookup_widget(widget,"backbuttonErrorLabel"); ! GtkWidget *quit = lookup_widget(widget,"quitbuttonErrorLabel"); ! GtkWidget *label = lookup_widget(widget,"labelErrorLabel"); if (ErrorBackButton()) gtk_widget_hide(quit); + else + gtk_widget_hide(back); gtk_label_set_text(GTK_LABEL(label),error_msg); } *************** *** 693,694 **** --- 707,715 ---- } + void + on_backbuttonErrorLabel_clicked (GtkButton *button, + gpointer user_data) + { + gtk_widget_hide(ErrorLabel); + } + Index: callbacks.h =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/callbacks.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** callbacks.h 7 Mar 2004 03:40:51 -0000 1.7 --- callbacks.h 7 Mar 2004 21:19:07 -0000 1.8 *************** *** 253,254 **** --- 253,262 ---- on_buttonForward_clicked (GtkButton *button, gpointer user_data); + + void + on_LabelBackButton_clicked (GtkButton *button, + gpointer user_data); + + void + on_backbuttonErrorLabel_clicked (GtkButton *button, + gpointer user_data); Index: instlib.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/instlib.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** instlib.c 7 Mar 2004 03:40:51 -0000 1.14 --- instlib.c 7 Mar 2004 21:19:07 -0000 1.15 *************** *** 635,640 **** /* and so is ext3 */ break; - #ifndef EXT_FS_ONLY - case(2): strcpy(modulelist[modulecount++],"reiserfs"); --- 635,638 ---- *************** *** 643,647 **** strcpy(modulelist[modulecount++],"xfs"); break; - #endif default: break; --- 641,644 ---- *************** *** 822,826 **** //TODO: User groups should made customizable in future, // not hardcoded in executable like now ! const gchar user_groups[64] = "dialout,dip,users,games"; gchar *cmdline; --- 819,823 ---- //TODO: User groups should made customizable in future, // not hardcoded in executable like now ! const gchar user_groups[64] = "dialout,dip,games,cdrom,video,audio,users"; gchar *cmdline; Index: interface.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/interface.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** interface.c 7 Mar 2004 03:40:51 -0000 1.15 --- interface.c 7 Mar 2004 21:19:07 -0000 1.16 *************** *** 1875,1882 **** GtkWidget *ErrorLabel; GtkWidget *vbox45; ! GtkWidget *ErrorLabelText; GtkWidget *hbuttonbox11; ! GtkWidget *QuitButton; ! GtkWidget *BackButton; ErrorLabel = gtk_dialog_new (); --- 1875,1882 ---- GtkWidget *ErrorLabel; GtkWidget *vbox45; ! GtkWidget *labelErrorLabel; GtkWidget *hbuttonbox11; ! GtkWidget *quitbuttonErrorLabel; ! GtkWidget *backbuttonErrorLabel; ErrorLabel = gtk_dialog_new (); *************** *** 1889,1898 **** gtk_widget_show (vbox45); ! ErrorLabelText = gtk_label_new_with_mnemonic (_("ErrorLabel")); ! gtk_widget_show (ErrorLabelText); ! gtk_box_pack_end (GTK_BOX (vbox45), ErrorLabelText, FALSE, FALSE, 0); ! gtk_label_set_use_markup (GTK_LABEL (ErrorLabelText), TRUE); ! gtk_label_set_justify (GTK_LABEL (ErrorLabelText), GTK_JUSTIFY_CENTER); ! gtk_label_set_line_wrap (GTK_LABEL (ErrorLabelText), TRUE); hbuttonbox11 = GTK_DIALOG (ErrorLabel)->action_area; --- 1889,1898 ---- gtk_widget_show (vbox45); ! labelErrorLabel = gtk_label_new_with_mnemonic (_("ErrorLabel")); ! gtk_widget_show (labelErrorLabel); ! gtk_box_pack_end (GTK_BOX (vbox45), labelErrorLabel, FALSE, FALSE, 0); ! gtk_label_set_use_markup (GTK_LABEL (labelErrorLabel), TRUE); ! gtk_label_set_justify (GTK_LABEL (labelErrorLabel), GTK_JUSTIFY_CENTER); ! gtk_label_set_line_wrap (GTK_LABEL (labelErrorLabel), TRUE); hbuttonbox11 = GTK_DIALOG (ErrorLabel)->action_area; *************** *** 1900,1929 **** gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox11), GTK_BUTTONBOX_END); ! QuitButton = gtk_button_new_from_stock ("gtk-quit"); ! gtk_widget_show (QuitButton); ! gtk_dialog_add_action_widget (GTK_DIALOG (ErrorLabel), QuitButton, GTK_RESPONSE_CLOSE); ! GTK_WIDGET_SET_FLAGS (QuitButton, GTK_CAN_DEFAULT); ! BackButton = gtk_button_new_from_stock ("gtk-go-back"); ! gtk_widget_show (BackButton); ! gtk_dialog_add_action_widget (GTK_DIALOG (ErrorLabel), BackButton, 0); ! GTK_WIDGET_SET_FLAGS (BackButton, GTK_CAN_DEFAULT); ! g_signal_connect_swapped ((gpointer) ErrorLabel, "show", ! G_CALLBACK (on_ErrorLabel_show), ! GTK_OBJECT (ErrorLabelText)); ! g_signal_connect ((gpointer) QuitButton, "clicked", G_CALLBACK (gtk_main_quit), NULL); /* Store pointers to all widgets, for use by lookup_widget(). */ GLADE_HOOKUP_OBJECT_NO_REF (ErrorLabel, ErrorLabel, "ErrorLabel"); GLADE_HOOKUP_OBJECT_NO_REF (ErrorLabel, vbox45, "vbox45"); ! GLADE_HOOKUP_OBJECT (ErrorLabel, ErrorLabelText, "ErrorLabelText"); GLADE_HOOKUP_OBJECT_NO_REF (ErrorLabel, hbuttonbox11, "hbuttonbox11"); ! GLADE_HOOKUP_OBJECT (ErrorLabel, QuitButton, "QuitButton"); ! GLADE_HOOKUP_OBJECT (ErrorLabel, BackButton, "BackButton"); ! gtk_widget_grab_default (QuitButton); return ErrorLabel; } --- 1900,1932 ---- gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox11), GTK_BUTTONBOX_END); ! quitbuttonErrorLabel = gtk_button_new_from_stock ("gtk-quit"); ! gtk_widget_show (quitbuttonErrorLabel); ! gtk_dialog_add_action_widget (GTK_DIALOG (ErrorLabel), quitbuttonErrorLabel, GTK_RESPONSE_CLOSE); ! GTK_WIDGET_SET_FLAGS (quitbuttonErrorLabel, GTK_CAN_DEFAULT); ! backbuttonErrorLabel = gtk_button_new_from_stock ("gtk-go-back"); ! gtk_widget_show (backbuttonErrorLabel); ! gtk_dialog_add_action_widget (GTK_DIALOG (ErrorLabel), backbuttonErrorLabel, 0); ! GTK_WIDGET_SET_FLAGS (backbuttonErrorLabel, GTK_CAN_DEFAULT); ! g_signal_connect ((gpointer) ErrorLabel, "show", ! G_CALLBACK (on_ErrorLabel_show), ! NULL); ! g_signal_connect ((gpointer) quitbuttonErrorLabel, "clicked", G_CALLBACK (gtk_main_quit), NULL); + g_signal_connect ((gpointer) backbuttonErrorLabel, "clicked", + G_CALLBACK (on_backbuttonErrorLabel_clicked), + NULL); /* Store pointers to all widgets, for use by lookup_widget(). */ GLADE_HOOKUP_OBJECT_NO_REF (ErrorLabel, ErrorLabel, "ErrorLabel"); GLADE_HOOKUP_OBJECT_NO_REF (ErrorLabel, vbox45, "vbox45"); ! GLADE_HOOKUP_OBJECT (ErrorLabel, labelErrorLabel, "labelErrorLabel"); GLADE_HOOKUP_OBJECT_NO_REF (ErrorLabel, hbuttonbox11, "hbuttonbox11"); ! GLADE_HOOKUP_OBJECT (ErrorLabel, quitbuttonErrorLabel, "quitbuttonErrorLabel"); ! GLADE_HOOKUP_OBJECT (ErrorLabel, backbuttonErrorLabel, "backbuttonErrorLabel"); ! gtk_widget_grab_default (quitbuttonErrorLabel); return ErrorLabel; } Index: main.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/main.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** main.c 15 Feb 2004 23:41:51 -0000 1.9 --- main.c 7 Mar 2004 21:19:07 -0000 1.10 *************** *** 112,116 **** } else { ! ErrorLabel = create_ErrorLabel (); } --- 112,116 ---- } else { ! ShowError(_("Sorry, you need to be root to use the Morphix installer")); } |
|
From: <ale...@us...> - 2004-03-07 21:42:55
|
Update of /cvsroot/morphix/morphixinstaller/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6591/debian Modified Files: changelog files Log Message: updated to 0.2-1 Index: changelog =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/debian/changelog,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** changelog 7 Mar 2004 03:40:51 -0000 1.3 --- changelog 7 Mar 2004 21:19:07 -0000 1.4 *************** *** 1,2 **** --- 1,8 ---- + morphixinstaller (0.2-1) unstable; urgency=low + + * fixes for error windows, zero-harddisk, zero-partition fix + + -- Alex de Labdgraaf <ale...@xs...> Sun, 7 Mar 2004 22:00:59 +0000 + morphixinstaller (0.2-0) unstable; urgency=low Index: files =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/debian/files,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** files 7 Mar 2004 03:40:51 -0000 1.3 --- files 7 Mar 2004 21:19:07 -0000 1.4 *************** *** 1 **** ! morphixinstaller_0.2-0_i386.deb admin optional --- 1 ---- ! morphixinstaller_0.2-1_i386.deb admin optional |
|
From: <ale...@us...> - 2004-03-07 21:42:54
|
Update of /cvsroot/morphix/morphixinstaller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6591 Modified Files: morphixinstaller.glade Log Message: updated to 0.2-1 Index: morphixinstaller.glade =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/morphixinstaller.glade,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** morphixinstaller.glade 7 Mar 2004 03:40:51 -0000 1.14 --- morphixinstaller.glade 7 Mar 2004 21:19:07 -0000 1.15 *************** *** 3465,3469 **** <property name="destroy_with_parent">True</property> <property name="has_separator">True</property> ! <signal name="show" handler="on_ErrorLabel_show" object="ErrorLabelText" last_modification_time="Thu, 06 Feb 2003 19:22:22 GMT"/> <child internal-child="vbox"> --- 3465,3469 ---- <property name="destroy_with_parent">True</property> <property name="has_separator">True</property> ! <signal name="show" handler="on_ErrorLabel_show" last_modification_time="Thu, 06 Feb 2003 19:22:22 GMT"/> <child internal-child="vbox"> *************** *** 3479,3483 **** <child> ! <widget class="GtkButton" id="QuitButton"> <property name="visible">True</property> <property name="can_default">True</property> --- 3479,3483 ---- <child> ! <widget class="GtkButton" id="quitbuttonErrorLabel"> <property name="visible">True</property> <property name="can_default">True</property> *************** *** 3493,3497 **** <child> ! <widget class="GtkButton" id="BackButton"> <property name="visible">True</property> <property name="can_default">True</property> --- 3493,3497 ---- <child> ! <widget class="GtkButton" id="backbuttonErrorLabel"> <property name="visible">True</property> <property name="can_default">True</property> *************** *** 3501,3504 **** --- 3501,3505 ---- <property name="relief">GTK_RELIEF_NORMAL</property> <property name="response_id">0</property> + <signal name="clicked" handler="on_backbuttonErrorLabel_clicked" last_modification_time="Sun, 07 Mar 2004 21:44:16 GMT"/> </widget> </child> *************** *** 3513,3517 **** <child> ! <widget class="GtkLabel" id="ErrorLabelText"> <property name="visible">True</property> <property name="label" translatable="yes">ErrorLabel</property> --- 3514,3518 ---- <child> ! <widget class="GtkLabel" id="labelErrorLabel"> <property name="visible">True</property> <property name="label" translatable="yes">ErrorLabel</property> |
|
From: <bms...@us...> - 2004-03-07 18:36:29
|
Update of /cvsroot/morphix/cdpersistent/cdpersistent/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1261/cdpersistent/src Modified Files: Makefile.am Log Message: The correct Makefile.am Index: Makefile.am =================================================================== RCS file: /cvsroot/morphix/cdpersistent/cdpersistent/src/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 7 Mar 2004 17:48:18 -0000 1.1 --- Makefile.am 7 Mar 2004 18:12:46 -0000 1.2 *************** *** 1,30 **** ## Process this file with automake to produce Makefile.in ! SUBDIRS = src po ! EXTRA_DIST = \ ! autogen.sh \ ! cd-persistent.glade \ ! cd-persistent.gladep ! install-data-local: ! @$(NORMAL_INSTALL) ! if test -d $(srcdir)/pixmaps; then \ ! $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \ ! for pixmap in $(srcdir)/pixmaps/*; do \ ! if test -f $$pixmap; then \ ! $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/pixmaps; \ ! fi \ ! done \ ! fi ! dist-hook: ! if test -d pixmaps; then \ ! mkdir $(distdir)/pixmaps; \ ! for pixmap in pixmaps/*; do \ ! if test -f $$pixmap; then \ ! cp -p $$pixmap $(distdir)/pixmaps; \ ! fi \ ! done \ ! fi --- 1,19 ---- ## Process this file with automake to produce Makefile.in ! INCLUDES = \ ! -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ ! -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ ! @PACKAGE_CFLAGS@ ! bin_PROGRAMS = cd-persistent ! cd_persistent_SOURCES = \ ! main.c \ ! support.c support.h \ ! interface.c interface.h \ ! callbacks.c callbacks.h ! cd_persistent_LDFLAGS = -pthread ! ! cd_persistent_LDADD = @PACKAGE_LIBS@ -lcrypt -lgthread-2.0 -lglib-2.0 $(INTLLIBS) |
|
From: <bms...@us...> - 2004-03-07 18:12:06
|
Update of /cvsroot/morphix/cdpersistent/cdpersistent In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28129/cdpersistent Added Files: Makefile.am Makefile.in Log Message: Some make files that were not included --- NEW FILE: Makefile.am --- ## Process this file with automake to produce Makefile.in SUBDIRS = src po EXTRA_DIST = \ autogen.sh \ cd-persistent.glade \ cd-persistent.gladep install-data-local: @$(NORMAL_INSTALL) if test -d $(srcdir)/pixmaps; then \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \ for pixmap in $(srcdir)/pixmaps/*; do \ if test -f $$pixmap; then \ $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/pixmaps; \ fi \ done \ fi dist-hook: if test -d pixmaps; then \ mkdir $(distdir)/pixmaps; \ for pixmap in pixmaps/*; do \ if test -f $$pixmap; then \ cp -p $$pixmap $(distdir)/pixmaps; \ fi \ done \ fi --- NEW FILE: Makefile.in --- # 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, # with or without modifications, as long as this notice is preserved. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY, to the extent permitted by law; without # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # 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 = : POST_INSTALL = : NORMAL_UNINSTALL = : 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@ POSUB = @POSUB@ 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 \ cd-persistent.glade \ cd-persistent.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 # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, # (1) if the variable is set in `config.status', edit `config.status' # (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//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ local_target="$$target-am"; \ else \ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" 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 \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ local_target="$$target-am"; \ else \ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ 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: clean-generic: 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 install-data-local: @$(NORMAL_INSTALL) if test -d $(srcdir)/pixmaps; then \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \ for pixmap in $(srcdir)/pixmaps/*; do \ if test -f $$pixmap; then \ $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/pixmaps; \ fi \ done \ fi dist-hook: if test -d pixmaps; then \ mkdir $(distdir)/pixmaps; \ for pixmap in pixmaps/*; do \ if test -f $$pixmap; then \ cp -p $$pixmap $(distdir)/pixmaps; \ fi \ 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. .NOEXPORT: |
|
From: <bms...@us...> - 2004-03-07 18:11:59
|
Update of /cvsroot/morphix/cdpersistent/cdpersistent/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28129/cdpersistent/src Added Files: Makefile.am Makefile.in Log Message: Some make files that were not included --- NEW FILE: Makefile.am --- ## Process this file with automake to produce Makefile.in SUBDIRS = src po EXTRA_DIST = \ autogen.sh \ cd-persistent.glade \ cd-persistent.gladep install-data-local: @$(NORMAL_INSTALL) if test -d $(srcdir)/pixmaps; then \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \ for pixmap in $(srcdir)/pixmaps/*; do \ if test -f $$pixmap; then \ $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/pixmaps; \ fi \ done \ fi dist-hook: if test -d pixmaps; then \ mkdir $(distdir)/pixmaps; \ for pixmap in pixmaps/*; do \ if test -f $$pixmap; then \ cp -p $$pixmap $(distdir)/pixmaps; \ fi \ done \ fi --- NEW FILE: Makefile.in --- # 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, # with or without modifications, as long as this notice is preserved. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY, to the extent permitted by law; without # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # 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 = : POST_INSTALL = : NORMAL_UNINSTALL = : 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@ POSUB = @POSUB@ 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 \ cd-persistent.glade \ cd-persistent.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 # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, # (1) if the variable is set in `config.status', edit `config.status' # (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//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ local_target="$$target-am"; \ else \ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" 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 \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ local_target="$$target-am"; \ else \ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ 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: clean-generic: 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 install-data-local: @$(NORMAL_INSTALL) if test -d $(srcdir)/pixmaps; then \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \ for pixmap in $(srcdir)/pixmaps/*; do \ if test -f $$pixmap; then \ $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/pixmaps; \ fi \ done \ fi dist-hook: if test -d pixmaps; then \ mkdir $(distdir)/pixmaps; \ for pixmap in pixmaps/*; do \ if test -f $$pixmap; then \ cp -p $$pixmap $(distdir)/pixmaps; \ fi \ 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. .NOEXPORT: |
|
From: Alex de L. <ale...@xs...> - 2004-03-07 17:07:53
|
It's imported, it's just that syncmail doesn't send an email when you import. Try to checkout in a different directory using your developers account, it'll work. anonymous CVS has a day lag behind the developer's. Gotta love sf... Quoting "Brendan M. Sleight" <me...@ba...>: > Hi All, > > I tried an import of a new module. I do not get any import errors :- > No conflicts created by this import > > However I do get an problem :- > Generating notification message... > Traceback (most recent call last): > File "/cvsroot/sitedocs/CVSROOT/cvstools/syncmail", line 322, in ? > main() > File "/cvsroot/sitedocs/CVSROOT/cvstools/syncmail", line 315, in main > blast_mail(subject, people, specs[1:], contextlines, fromhost) > File "/cvsroot/sitedocs/CVSROOT/cvstools/syncmail", line 240, in > blast_mail > print calculate_diff(file, contextlines) > File "/cvsroot/sitedocs/CVSROOT/cvstools/syncmail", line 139, in > calculate_dif f > file, oldrev, newrev = string.split(filespec, ',') > ValueError: unpack list of wrong size > > Full log below. > > I have checked via the anonymous login and via the web-front end and the > import appears not to have worked. > bms@LaLa:/tmp/cvs$ cvs > -d:pserver:ano...@cv...:/cvsroot/morphix checkout > cdpersistent > cvs server: cannot find module `cdpersistent' - ignored > cvs [checkout aborted]: cannot expand modules > bms@LaLa:/tmp/cvs$ > > > I am a cvs newbie, but I can't find where I gone wrong. > > Any suggestions ? > Brendan > > > > bms@LaLa:~/Projects/cdpersistent$ cvs > -d:ext:bms...@cv...:/cvsroot/morphix import -m "Initial > cvs import - Brendan's first _ever_" cdpersistent bmsleight start > The authenticity of host 'cvs.sourceforge.net (66.35.250.207)' can't be > establis hed. > DSA key fingerprint is <snip> > Are you sure you want to continue connecting (yes/no)? y > Please type 'yes' or 'no': yes > Warning: Permanently added 'cvs.sourceforge.net,66.35.250.207' (DSA) to > the list of known hosts. > bms...@cv...'s password: > Warning: No xauth data; using fake authentication data for X11 forwarding. > cvs import: Importing /cvsroot/morphix/cdpersistent/cdpersistent > N cdpersistent/cdpersistent/AUTHORS > N cdpersistent/cdpersistent/ChangeLog > N cdpersistent/cdpersistent/NEWS > N cdpersistent/cdpersistent/README > N cdpersistent/cdpersistent/acconfig.h > N cdpersistent/cdpersistent/autogen.sh > N cdpersistent/cdpersistent/cd-persistent.glade > N cdpersistent/cdpersistent/cd-persistent.gladep > N cdpersistent/cdpersistent/config.h > N cdpersistent/cdpersistent/configure.in > N cdpersistent/cdpersistent/stamp-h.in > cvs import: Importing /cvsroot/morphix/cdpersistent/cdpersistent/pixmaps > N cdpersistent/cdpersistent/pixmaps/logo.gif > cvs import: Importing /cvsroot/morphix/cdpersistent/cdpersistent/po > N cdpersistent/cdpersistent/po/ChangeLog > N cdpersistent/cdpersistent/po/POTFILES.in > cvs import: Importing /cvsroot/morphix/cdpersistent/cdpersistent/src > N cdpersistent/cdpersistent/src/callbacks.c > N cdpersistent/cdpersistent/src/callbacks.h > N cdpersistent/cdpersistent/src/interface.c > N cdpersistent/cdpersistent/src/interface.h > N cdpersistent/cdpersistent/src/main.c > N cdpersistent/cdpersistent/src/support.c > N cdpersistent/cdpersistent/src/support.h > > No conflicts created by this import > > Mailing mor...@li...... > Generating notification message... > Generating notification message... done. > Mailing mor...@li...... > Generating notification message... > Traceback (most recent call last): > File "/cvsroot/sitedocs/CVSROOT/cvstools/syncmail", line 322, in ? > main() > File "/cvsroot/sitedocs/CVSROOT/cvstools/syncmail", line 315, in main > blast_mail(subject, people, specs[1:], contextlines, fromhost) > File "/cvsroot/sitedocs/CVSROOT/cvstools/syncmail", line 240, in > blast_mail > print calculate_diff(file, contextlines) > File "/cvsroot/sitedocs/CVSROOT/cvstools/syncmail", line 139, in > calculate_dif f > file, oldrev, newrev = string.split(filespec, ',') > ValueError: unpack list of wrong size > bms@LaLa:~/Projects/cdpersistent$ > > > ------------------------------------------------------- > This SF.Net email is sponsored by: IBM Linux Tutorials > Free Linux tutorial presented by Daniel Robbins, President and CEO of > GenToo technologies. Learn everything from fundamentals to system > administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click > _______________________________________________ > Morphix-cvs mailing list > Mor...@li... > https://lists.sourceforge.net/lists/listinfo/morphix-cvs > > /------------------------------------------------------------------\ | Alex de Landgraaf | The cure for boredom is curiosity | | Student AI & CS, VU, A'dam | There is no cure for curiosity | | Phone: 06-16844084 | | | GPG: http://am.xs4all.nl/key_alex.asc /'-'\ | | www.alextreme.org & www.morphix.org ( o o ) | \------------------------------------------oOO0--(_)--0OOo---------/ |
|
From: Brendan M. S. <me...@ba...> - 2004-03-07 16:50:13
|
Hi All,
I tried an import of a new module. I do not get any import errors :-
No conflicts created by this import
However I do get an problem :-
Generating notification message...
Traceback (most recent call last):
File "/cvsroot/sitedocs/CVSROOT/cvstools/syncmail", line 322, in ?
main()
File "/cvsroot/sitedocs/CVSROOT/cvstools/syncmail", line 315, in main
blast_mail(subject, people, specs[1:], contextlines, fromhost)
File "/cvsroot/sitedocs/CVSROOT/cvstools/syncmail", line 240, in blast_mail
print calculate_diff(file, contextlines)
File "/cvsroot/sitedocs/CVSROOT/cvstools/syncmail", line 139, in
calculate_dif f
file, oldrev, newrev = string.split(filespec, ',')
ValueError: unpack list of wrong size
Full log below.
I have checked via the anonymous login and via the web-front end and the
import appears not to have worked.
bms@LaLa:/tmp/cvs$ cvs
-d:pserver:ano...@cv...:/cvsroot/morphix checkout
cdpersistent
cvs server: cannot find module `cdpersistent' - ignored
cvs [checkout aborted]: cannot expand modules
bms@LaLa:/tmp/cvs$
I am a cvs newbie, but I can't find where I gone wrong.
Any suggestions ?
Brendan
bms@LaLa:~/Projects/cdpersistent$ cvs
-d:ext:bms...@cv...:/cvsroot/morphix import -m "Initial
cvs import - Brendan's first _ever_" cdpersistent bmsleight start
The authenticity of host 'cvs.sourceforge.net (66.35.250.207)' can't be
establis hed.
DSA key fingerprint is <snip>
Are you sure you want to continue connecting (yes/no)? y
Please type 'yes' or 'no': yes
Warning: Permanently added 'cvs.sourceforge.net,66.35.250.207' (DSA) to
the list of known hosts.
bms...@cv...'s password:
Warning: No xauth data; using fake authentication data for X11 forwarding.
cvs import: Importing /cvsroot/morphix/cdpersistent/cdpersistent
N cdpersistent/cdpersistent/AUTHORS
N cdpersistent/cdpersistent/ChangeLog
N cdpersistent/cdpersistent/NEWS
N cdpersistent/cdpersistent/README
N cdpersistent/cdpersistent/acconfig.h
N cdpersistent/cdpersistent/autogen.sh
N cdpersistent/cdpersistent/cd-persistent.glade
N cdpersistent/cdpersistent/cd-persistent.gladep
N cdpersistent/cdpersistent/config.h
N cdpersistent/cdpersistent/configure.in
N cdpersistent/cdpersistent/stamp-h.in
cvs import: Importing /cvsroot/morphix/cdpersistent/cdpersistent/pixmaps
N cdpersistent/cdpersistent/pixmaps/logo.gif
cvs import: Importing /cvsroot/morphix/cdpersistent/cdpersistent/po
N cdpersistent/cdpersistent/po/ChangeLog
N cdpersistent/cdpersistent/po/POTFILES.in
cvs import: Importing /cvsroot/morphix/cdpersistent/cdpersistent/src
N cdpersistent/cdpersistent/src/callbacks.c
N cdpersistent/cdpersistent/src/callbacks.h
N cdpersistent/cdpersistent/src/interface.c
N cdpersistent/cdpersistent/src/interface.h
N cdpersistent/cdpersistent/src/main.c
N cdpersistent/cdpersistent/src/support.c
N cdpersistent/cdpersistent/src/support.h
No conflicts created by this import
Mailing mor...@li......
Generating notification message...
Generating notification message... done.
Mailing mor...@li......
Generating notification message...
Traceback (most recent call last):
File "/cvsroot/sitedocs/CVSROOT/cvstools/syncmail", line 322, in ?
main()
File "/cvsroot/sitedocs/CVSROOT/cvstools/syncmail", line 315, in main
blast_mail(subject, people, specs[1:], contextlines, fromhost)
File "/cvsroot/sitedocs/CVSROOT/cvstools/syncmail", line 240, in blast_mail
print calculate_diff(file, contextlines)
File "/cvsroot/sitedocs/CVSROOT/cvstools/syncmail", line 139, in
calculate_dif f
file, oldrev, newrev = string.split(filespec, ',')
ValueError: unpack list of wrong size
bms@LaLa:~/Projects/cdpersistent$
|
|
From: <ale...@us...> - 2004-03-07 04:05:19
|
Update of /cvsroot/morphix/morphixinstaller/pixmaps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12824/pixmaps Added Files: dancingpenguin.gif installpenguin.png matty.png Log Message: lets chuck in some pretty pics too --- NEW FILE: dancingpenguin.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: installpenguin.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: matty.png --- (This appears to be a binary file; contents omitted.) |
|
From: <ale...@us...> - 2004-03-07 04:04:29
|
Update of /cvsroot/morphix/morphixinstaller/pixmaps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12743/pixmaps Log Message: Directory /cvsroot/morphix/morphixinstaller/pixmaps added to the repository |
|
From: <ale...@us...> - 2004-03-07 04:04:07
|
Update of /cvsroot/morphix/morphixinstaller/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12564/src Modified Files: callbacks.c callbacks.h instlib.c interface.c ui.c ui.h Log Message: error notifications, install feedback fixes might actually install this time... Index: callbacks.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/callbacks.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** callbacks.c 16 Feb 2004 23:42:12 -0000 1.16 --- callbacks.c 7 Mar 2004 03:40:51 -0000 1.17 *************** *** 54,58 **** extern GtkWidget *SelectPartExpert; - gint global_cdrom_size; /* void --- 54,57 ---- *************** *** 182,199 **** gint sel = gtk_option_menu_get_history(GTK_OPTION_MENU(optionmenu)); SaveSelectedFilesystemType(sel); ! ! do_install_process(); ! ! } ! ! ! void ! on_buttonSmall_clicked (GtkButton *button, ! gpointer user_data) ! { ! } - void on_buttonCancelNoRoot_clicked (GtkButton *button, --- 181,191 ---- gint sel = gtk_option_menu_get_history(GTK_OPTION_MENU(optionmenu)); SaveSelectedFilesystemType(sel); ! SetSavedCdromSize(GetCdromSize()); ! if (CheckSizeRootpartition()) { ! DoInstallProcess(); ! } ! // else let DIP be done from SmallRoot callback } void on_buttonCancelNoRoot_clicked (GtkButton *button, *************** *** 228,232 **** gpointer user_data) { - GtkWidget *label = lookup_widget(widget,"labelRootPassError"); GtkWidget *entry1 = lookup_widget(widget,"entryRoot1"); GtkWidget *entry2 = lookup_widget(widget,"entryRoot2"); --- 220,223 ---- *************** *** 234,244 **** gchar cmdline[256]; - gtk_label_set_text(GTK_LABEL(label),""); - // checks for making sure the passwords are valid and reasonably secure if (strcmp(gtk_entry_get_text(GTK_ENTRY(entry1)),gtk_entry_get_text(GTK_ENTRY(entry2))) != 0) { gtk_entry_set_text(GTK_ENTRY(entry1),""); gtk_entry_set_text(GTK_ENTRY(entry2),""); ! gtk_label_set_text(GTK_LABEL(label),"\nPasswords are not identical!\n\nPlease try again"); return; } --- 225,233 ---- gchar cmdline[256]; // checks for making sure the passwords are valid and reasonably secure if (strcmp(gtk_entry_get_text(GTK_ENTRY(entry1)),gtk_entry_get_text(GTK_ENTRY(entry2))) != 0) { gtk_entry_set_text(GTK_ENTRY(entry1),""); gtk_entry_set_text(GTK_ENTRY(entry2),""); ! ShowErrorBack("Passwords are not identical!\nPlease try again"); return; } *************** *** 246,256 **** gtk_entry_set_text(GTK_ENTRY(entry1),""); gtk_entry_set_text(GTK_ENTRY(entry2),""); ! gtk_label_set_text(GTK_LABEL(label),"\nEnter a password of at least 5 characters\n\nPlease try again"); return; } - - SetRootPassword((gchar *)gtk_entry_get_text(GTK_ENTRY(entry1))); - EnterUser = create_EnterUser (); gtk_widget_show (EnterUser); --- 235,242 ---- gtk_entry_set_text(GTK_ENTRY(entry1),""); gtk_entry_set_text(GTK_ENTRY(entry2),""); ! ShowErrorBack("Enter a password of at least 5 characters\nPlease try again"); return; } SetRootPassword((gchar *)gtk_entry_get_text(GTK_ENTRY(entry1))); EnterUser = create_EnterUser (); gtk_widget_show (EnterUser); *************** *** 494,498 **** SaveSelectedRoot(cmdlineargs.rootpart); SaveSelectedFilesystemTypeString(cmdlineargs.fs); ! do_install_process(); } --- 480,484 ---- SaveSelectedRoot(cmdlineargs.rootpart); SaveSelectedFilesystemTypeString(cmdlineargs.fs); ! DoInstallProcess(); } *************** *** 522,526 **** gpointer user_data) { ! gtk_label_set_text(GTK_LABEL(widget),error_msg); } --- 508,519 ---- gpointer user_data) { ! GtkWidget *back = lookup_widget(widget,"BackButton"); ! GtkWidget *quit = lookup_widget(widget,"QuitButton"); ! GtkWidget *label = lookup_widget(widget,"ErrorLabelLabel"); ! if (ErrorBackButton()) ! gtk_widget_hide(back); ! else ! gtk_widget_hide(quit); ! gtk_label_set_text(GTK_LABEL(label),error_msg); } *************** *** 538,542 **** { GtkWidget *progbar = lookup_widget(widget,"progressbar10"); ! timer = g_timeout_add(1000, (GSourceFunc)progress_timeout,progbar); } --- 531,535 ---- { GtkWidget *progbar = lookup_widget(widget,"progressbar10"); ! timer = g_timeout_add(1000, (GSourceFunc)ProgressTimeout,progbar); } *************** *** 548,559 **** GtkWidget *progbar = lookup_widget(widget,"progressbar11"); GtkWidget *image = lookup_widget(widget,"imageInstallProcess"); ! ! GdkPixbufAnimation *anim = gdk_pixbuf_animation_new_from_file(PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps/dancingpenguin.gif",NULL); ! if (anim != NULL) { ! gtk_image_set_from_animation(GTK_IMAGE(image),anim); ! } ! global_cdrom_size = GetCdromSize(); ! updateInstallLabel(0,(gint)GetCurrentSize(global_cdrom_size)); ! timer = g_timeout_add(10000, (GSourceFunc)progress_timeout_size,progbar); } --- 541,546 ---- GtkWidget *progbar = lookup_widget(widget,"progressbar11"); GtkWidget *image = lookup_widget(widget,"imageInstallProcess"); ! DoAnimation(image,PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps/dancingpenguin.gif"); ! timer = g_timeout_add(10000, (GSourceFunc)ProgressTimeoutSize,progbar); } *************** *** 564,568 **** { GtkWidget *progbar = lookup_widget(widget,"progressbar18"); ! timer = g_timeout_add(1000, (GSourceFunc)progress_timeout,progbar); } --- 551,555 ---- { GtkWidget *progbar = lookup_widget(widget,"progressbar18"); ! timer = g_timeout_add(1000, (GSourceFunc)ProgressTimeout,progbar); } *************** *** 689,690 **** --- 676,694 ---- } + + void + on_buttonBack_clicked (GtkButton *button, + gpointer user_data) + { + gtk_widget_hide(SmallRoot); + } + + + void + on_buttonForward_clicked (GtkButton *button, + gpointer user_data) + { + gtk_widget_hide(SmallRoot); + DoInstallProcess(); + } + Index: callbacks.h =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/callbacks.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** callbacks.h 16 Feb 2004 23:42:12 -0000 1.6 --- callbacks.h 7 Mar 2004 03:40:51 -0000 1.7 *************** *** 241,242 **** --- 241,254 ---- #endif + + void + on_button13_clicked (GtkButton *button, + gpointer user_data); + + void + on_buttonBack_clicked (GtkButton *button, + gpointer user_data); + + void + on_buttonForward_clicked (GtkButton *button, + gpointer user_data); Index: instlib.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/instlib.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** instlib.c 16 Feb 2004 23:42:12 -0000 1.13 --- instlib.c 7 Mar 2004 03:40:51 -0000 1.14 *************** *** 1878,1882 **** gdouble GetCurrentPercentage(gint cdrom_size, gint curr_rootpart_size) { gdouble perc; ! gdouble unpacked_cdrom_size = cdrom_size *2.8; // changed back, as we only need an estimate perc = (gdouble)curr_rootpart_size / unpacked_cdrom_size; --- 1878,1882 ---- gdouble GetCurrentPercentage(gint cdrom_size, gint curr_rootpart_size) { gdouble perc; ! gdouble unpacked_cdrom_size = GetCurrentSize(cdrom_size); // changed back, as we only need an estimate perc = (gdouble)curr_rootpart_size / unpacked_cdrom_size; *************** *** 1884,1887 **** --- 1884,1889 ---- if (perc >= 0.99) return 0.99; + else if (perc < 0) + return 0.0; else return perc; Index: interface.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/interface.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** interface.c 16 Feb 2004 23:42:12 -0000 1.14 --- interface.c 7 Mar 2004 03:40:51 -0000 1.15 *************** *** 59,65 **** gtk_box_pack_start (GTK_BOX (hbox2), vbox1, TRUE, TRUE, 0); ! image33 = create_pixmap (StartScreen, NULL); gtk_widget_show (image33); ! gtk_box_pack_start (GTK_BOX (vbox1), image33, TRUE, TRUE, 0); vseparator2 = gtk_vseparator_new (); --- 59,65 ---- gtk_box_pack_start (GTK_BOX (hbox2), vbox1, TRUE, TRUE, 0); ! image33 = create_pixmap (StartScreen, "installpenguin.png"); gtk_widget_show (image33); ! gtk_box_pack_start (GTK_BOX (vbox1), image33, FALSE, FALSE, 8); vseparator2 = gtk_vseparator_new (); *************** *** 117,120 **** --- 117,121 ---- GLADE_HOOKUP_OBJECT (StartScreen, okbuttonStart, "okbuttonStart"); + gtk_widget_grab_default (okbuttonStart); return StartScreen; } *************** *** 233,243 **** gtk_box_pack_start (GTK_BOX (hbox3), vbox2, TRUE, TRUE, 0); ! image3 = create_pixmap (SelectHarddisk, NULL); gtk_widget_show (image3); ! gtk_box_pack_start (GTK_BOX (vbox2), image3, TRUE, TRUE, 0); label32 = gtk_label_new (_("<b>Harddisk selection</b>\n\nStep:\n1 of 7")); gtk_widget_show (label32); ! gtk_box_pack_start (GTK_BOX (vbox2), label32, FALSE, FALSE, 0); gtk_widget_set_size_request (label32, 51, -1); gtk_label_set_use_markup (GTK_LABEL (label32), TRUE); --- 234,244 ---- gtk_box_pack_start (GTK_BOX (hbox3), vbox2, TRUE, TRUE, 0); ! image3 = create_pixmap (SelectHarddisk, "installpenguin.png"); gtk_widget_show (image3); ! gtk_box_pack_start (GTK_BOX (vbox2), image3, FALSE, FALSE, 8); label32 = gtk_label_new (_("<b>Harddisk selection</b>\n\nStep:\n1 of 7")); gtk_widget_show (label32); ! gtk_box_pack_start (GTK_BOX (vbox2), label32, TRUE, TRUE, 0); gtk_widget_set_size_request (label32, 51, -1); gtk_label_set_use_markup (GTK_LABEL (label32), TRUE); *************** *** 370,373 **** --- 371,376 ---- GLADE_HOOKUP_OBJECT_NO_REF (SelectHarddisk, tooltips, "tooltips"); + gtk_widget_grab_focus (combo_entry1); + gtk_widget_grab_default (okbuttonHarddisk); return SelectHarddisk; } *************** *** 415,425 **** gtk_box_pack_start (GTK_BOX (hbox5), vbox4, TRUE, TRUE, 0); ! image4 = create_pixmap (SelectSwap, NULL); gtk_widget_show (image4); ! gtk_box_pack_start (GTK_BOX (vbox4), image4, TRUE, TRUE, 0); label33 = gtk_label_new (_("<b>Swap selection</b>\n\nStep:\n2 of 7")); gtk_widget_show (label33); ! gtk_box_pack_start (GTK_BOX (vbox4), label33, FALSE, FALSE, 0); gtk_widget_set_size_request (label33, 51, -1); gtk_label_set_use_markup (GTK_LABEL (label33), TRUE); --- 418,428 ---- gtk_box_pack_start (GTK_BOX (hbox5), vbox4, TRUE, TRUE, 0); ! image4 = create_pixmap (SelectSwap, "installpenguin.png"); gtk_widget_show (image4); ! gtk_box_pack_start (GTK_BOX (vbox4), image4, FALSE, FALSE, 8); label33 = gtk_label_new (_("<b>Swap selection</b>\n\nStep:\n2 of 7")); gtk_widget_show (label33); ! gtk_box_pack_start (GTK_BOX (vbox4), label33, TRUE, TRUE, 0); gtk_widget_set_size_request (label33, 51, -1); gtk_label_set_use_markup (GTK_LABEL (label33), TRUE); *************** *** 518,521 **** --- 521,525 ---- GLADE_HOOKUP_OBJECT_NO_REF (SelectSwap, tooltips, "tooltips"); + gtk_widget_grab_focus (combo_entry2); return SelectSwap; } *************** *** 672,682 **** gtk_box_pack_start (GTK_BOX (hbox9), vbox8, TRUE, TRUE, 0); ! image6 = create_pixmap (SelectRoot, NULL); gtk_widget_show (image6); ! gtk_box_pack_start (GTK_BOX (vbox8), image6, TRUE, TRUE, 0); label34 = gtk_label_new (_("<b>Rootpartition selection</b>\n\nStep:\n3 of 7")); gtk_widget_show (label34); ! gtk_box_pack_start (GTK_BOX (vbox8), label34, FALSE, FALSE, 0); gtk_widget_set_size_request (label34, 51, -1); gtk_label_set_use_markup (GTK_LABEL (label34), TRUE); --- 676,686 ---- gtk_box_pack_start (GTK_BOX (hbox9), vbox8, TRUE, TRUE, 0); ! image6 = create_pixmap (SelectRoot, "installpenguin.png"); gtk_widget_show (image6); ! gtk_box_pack_start (GTK_BOX (vbox8), image6, FALSE, FALSE, 8); label34 = gtk_label_new (_("<b>Rootpartition selection</b>\n\nStep:\n3 of 7")); gtk_widget_show (label34); ! gtk_box_pack_start (GTK_BOX (vbox8), label34, TRUE, TRUE, 0); gtk_widget_set_size_request (label34, 51, -1); gtk_label_set_use_markup (GTK_LABEL (label34), TRUE); *************** *** 864,867 **** --- 868,873 ---- GLADE_HOOKUP_OBJECT_NO_REF (SelectRoot, tooltips, "tooltips"); + gtk_widget_grab_focus (combo_entry3); + gtk_widget_grab_default (okbuttonRoot); return SelectRoot; } *************** *** 872,925 **** GtkWidget *SmallRoot; GtkWidget *vbox14; ! GtkWidget *hbox13; ! GtkWidget *vbox15; ! GtkWidget *image8; ! GtkWidget *vseparator8; ! GtkWidget *hbox14; ! GtkWidget *vbox16; ! GtkWidget *label12; GtkWidget *hbuttonbox2; GtkWidget *helpbutton_small; ! GtkWidget *buttonSmall; SmallRoot = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (SmallRoot), _("Morphix Install")); gtk_window_set_position (GTK_WINDOW (SmallRoot), GTK_WIN_POS_CENTER); - gtk_window_set_default_size (GTK_WINDOW (SmallRoot), 640, 480); vbox14 = GTK_DIALOG (SmallRoot)->vbox; gtk_widget_show (vbox14); ! hbox13 = gtk_hbox_new (FALSE, 0); ! gtk_widget_show (hbox13); ! gtk_box_pack_start (GTK_BOX (vbox14), hbox13, TRUE, TRUE, 0); ! ! vbox15 = gtk_vbox_new (FALSE, 0); ! gtk_widget_show (vbox15); ! gtk_box_pack_start (GTK_BOX (hbox13), vbox15, TRUE, TRUE, 0); ! ! image8 = create_pixmap (SmallRoot, NULL); ! gtk_widget_show (image8); ! gtk_box_pack_start (GTK_BOX (vbox15), image8, TRUE, TRUE, 0); ! ! vseparator8 = gtk_vseparator_new (); ! gtk_widget_show (vseparator8); ! gtk_box_pack_start (GTK_BOX (hbox13), vseparator8, FALSE, FALSE, 0); ! ! hbox14 = gtk_hbox_new (FALSE, 0); ! gtk_widget_show (hbox14); ! gtk_box_pack_end (GTK_BOX (hbox13), hbox14, TRUE, FALSE, 0); ! ! vbox16 = gtk_vbox_new (TRUE, 0); ! gtk_widget_show (vbox16); ! gtk_box_pack_start (GTK_BOX (hbox14), vbox16, TRUE, TRUE, 0); ! ! label12 = gtk_label_new (_("The selected rootpartition is smaller\nthan we recommend, make sure the \npartition is bigger than X MB")); ! gtk_widget_show (label12); ! gtk_box_pack_start (GTK_BOX (vbox16), label12, FALSE, FALSE, 0); ! gtk_widget_set_size_request (label12, 400, 200); ! gtk_label_set_justify (GTK_LABEL (label12), GTK_JUSTIFY_CENTER); ! gtk_label_set_line_wrap (GTK_LABEL (label12), TRUE); ! gtk_misc_set_padding (GTK_MISC (label12), 28, 0); hbuttonbox2 = GTK_DIALOG (SmallRoot)->action_area; --- 878,898 ---- GtkWidget *SmallRoot; GtkWidget *vbox14; ! GtkWidget *label55; GtkWidget *hbuttonbox2; GtkWidget *helpbutton_small; ! GtkWidget *buttonBack; ! GtkWidget *buttonForward; SmallRoot = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (SmallRoot), _("Morphix Install")); gtk_window_set_position (GTK_WINDOW (SmallRoot), GTK_WIN_POS_CENTER); vbox14 = GTK_DIALOG (SmallRoot)->vbox; gtk_widget_show (vbox14); ! label55 = gtk_label_new (_("The selected root partition doesn't appear to have enough free space available for a complete Morphix install\n\nYou may continue, but be advised that the install procedure will likely fail.\nYou are advised to go back and select a larger root partition.")); ! gtk_widget_show (label55); ! gtk_box_pack_start (GTK_BOX (vbox14), label55, FALSE, FALSE, 0); ! gtk_label_set_line_wrap (GTK_LABEL (label55), TRUE); hbuttonbox2 = GTK_DIALOG (SmallRoot)->action_area; *************** *** 932,945 **** GTK_WIDGET_SET_FLAGS (helpbutton_small, GTK_CAN_DEFAULT); ! buttonSmall = gtk_button_new_from_stock ("gtk-go-back"); ! gtk_widget_show (buttonSmall); ! gtk_dialog_add_action_widget (GTK_DIALOG (SmallRoot), buttonSmall, GTK_RESPONSE_CLOSE); ! GTK_WIDGET_SET_FLAGS (buttonSmall, GTK_CAN_DEFAULT); g_signal_connect_swapped ((gpointer) helpbutton_small, "clicked", G_CALLBACK (gtk_widget_show), GTK_OBJECT (HelpDialog)); ! g_signal_connect ((gpointer) buttonSmall, "clicked", ! G_CALLBACK (on_buttonSmall_clicked), NULL); --- 905,926 ---- GTK_WIDGET_SET_FLAGS (helpbutton_small, GTK_CAN_DEFAULT); ! buttonBack = gtk_button_new_from_stock ("gtk-go-back"); ! gtk_widget_show (buttonBack); ! gtk_dialog_add_action_widget (GTK_DIALOG (SmallRoot), buttonBack, GTK_RESPONSE_CLOSE); ! GTK_WIDGET_SET_FLAGS (buttonBack, GTK_CAN_DEFAULT); ! ! buttonForward = gtk_button_new_from_stock ("gtk-go-forward"); ! gtk_widget_show (buttonForward); ! gtk_dialog_add_action_widget (GTK_DIALOG (SmallRoot), buttonForward, 0); ! GTK_WIDGET_SET_FLAGS (buttonForward, GTK_CAN_DEFAULT); g_signal_connect_swapped ((gpointer) helpbutton_small, "clicked", G_CALLBACK (gtk_widget_show), GTK_OBJECT (HelpDialog)); ! g_signal_connect ((gpointer) buttonBack, "clicked", ! G_CALLBACK (on_buttonBack_clicked), ! NULL); ! g_signal_connect ((gpointer) buttonForward, "clicked", ! G_CALLBACK (on_buttonForward_clicked), NULL); *************** *** 947,961 **** GLADE_HOOKUP_OBJECT_NO_REF (SmallRoot, SmallRoot, "SmallRoot"); GLADE_HOOKUP_OBJECT_NO_REF (SmallRoot, vbox14, "vbox14"); ! GLADE_HOOKUP_OBJECT (SmallRoot, hbox13, "hbox13"); ! GLADE_HOOKUP_OBJECT (SmallRoot, vbox15, "vbox15"); ! GLADE_HOOKUP_OBJECT (SmallRoot, image8, "image8"); ! GLADE_HOOKUP_OBJECT (SmallRoot, vseparator8, "vseparator8"); ! GLADE_HOOKUP_OBJECT (SmallRoot, hbox14, "hbox14"); ! GLADE_HOOKUP_OBJECT (SmallRoot, vbox16, "vbox16"); ! GLADE_HOOKUP_OBJECT (SmallRoot, label12, "label12"); GLADE_HOOKUP_OBJECT_NO_REF (SmallRoot, hbuttonbox2, "hbuttonbox2"); GLADE_HOOKUP_OBJECT (SmallRoot, helpbutton_small, "helpbutton_small"); ! GLADE_HOOKUP_OBJECT (SmallRoot, buttonSmall, "buttonSmall"); return SmallRoot; } --- 928,939 ---- GLADE_HOOKUP_OBJECT_NO_REF (SmallRoot, SmallRoot, "SmallRoot"); GLADE_HOOKUP_OBJECT_NO_REF (SmallRoot, vbox14, "vbox14"); ! GLADE_HOOKUP_OBJECT (SmallRoot, label55, "label55"); GLADE_HOOKUP_OBJECT_NO_REF (SmallRoot, hbuttonbox2, "hbuttonbox2"); GLADE_HOOKUP_OBJECT (SmallRoot, helpbutton_small, "helpbutton_small"); ! GLADE_HOOKUP_OBJECT (SmallRoot, buttonBack, "buttonBack"); ! GLADE_HOOKUP_OBJECT (SmallRoot, buttonForward, "buttonForward"); + gtk_widget_grab_focus (buttonBack); + gtk_widget_grab_default (buttonBack); return SmallRoot; } *************** *** 1115,1125 **** gtk_box_pack_start (GTK_BOX (hbox20), vbox29, TRUE, TRUE, 0); ! image12 = create_pixmap (EnterHost, NULL); gtk_widget_show (image12); ! gtk_box_pack_start (GTK_BOX (vbox29), image12, TRUE, TRUE, 0); label36 = gtk_label_new (_("<b>Configure\nHostname</b>\n\nStep:\n4 of 7")); gtk_widget_show (label36); ! gtk_box_pack_start (GTK_BOX (vbox29), label36, FALSE, FALSE, 0); gtk_widget_set_size_request (label36, 51, -1); gtk_label_set_use_markup (GTK_LABEL (label36), TRUE); --- 1093,1103 ---- gtk_box_pack_start (GTK_BOX (hbox20), vbox29, TRUE, TRUE, 0); ! image12 = create_pixmap (EnterHost, "installpenguin.png"); gtk_widget_show (image12); ! gtk_box_pack_start (GTK_BOX (vbox29), image12, FALSE, FALSE, 8); label36 = gtk_label_new (_("<b>Configure\nHostname</b>\n\nStep:\n4 of 7")); gtk_widget_show (label36); ! gtk_box_pack_start (GTK_BOX (vbox29), label36, TRUE, TRUE, 0); gtk_widget_set_size_request (label36, 51, -1); gtk_label_set_use_markup (GTK_LABEL (label36), TRUE); *************** *** 1200,1203 **** --- 1178,1183 ---- GLADE_HOOKUP_OBJECT_NO_REF (EnterHost, tooltips, "tooltips"); + gtk_widget_grab_focus (entryHost); + gtk_widget_grab_default (buttonOkHost); return EnterHost; } *************** *** 1243,1253 **** gtk_box_pack_start (GTK_BOX (hbox22), vbox32, TRUE, TRUE, 0); ! image13 = create_pixmap (EnterRoot, NULL); gtk_widget_show (image13); ! gtk_box_pack_start (GTK_BOX (vbox32), image13, TRUE, TRUE, 0); label37 = gtk_label_new (_("<b>Configure\nRootaccount</b>\n\nStep:\n5 of 7")); gtk_widget_show (label37); ! gtk_box_pack_start (GTK_BOX (vbox32), label37, FALSE, FALSE, 0); gtk_widget_set_size_request (label37, 51, -1); gtk_label_set_use_markup (GTK_LABEL (label37), TRUE); --- 1223,1233 ---- gtk_box_pack_start (GTK_BOX (hbox22), vbox32, TRUE, TRUE, 0); ! image13 = create_pixmap (EnterRoot, "installpenguin.png"); gtk_widget_show (image13); ! gtk_box_pack_start (GTK_BOX (vbox32), image13, FALSE, FALSE, 8); label37 = gtk_label_new (_("<b>Configure\nRootaccount</b>\n\nStep:\n5 of 7")); gtk_widget_show (label37); ! gtk_box_pack_start (GTK_BOX (vbox32), label37, TRUE, TRUE, 0); gtk_widget_set_size_request (label37, 51, -1); gtk_label_set_use_markup (GTK_LABEL (label37), TRUE); *************** *** 1355,1358 **** --- 1335,1340 ---- GLADE_HOOKUP_OBJECT (EnterRoot, buttonOkRootPasswd, "buttonOkRootPasswd"); + gtk_widget_grab_focus (entryRoot1); + gtk_widget_grab_default (buttonOkRootPasswd); return EnterRoot; } *************** *** 1405,1415 **** gtk_box_pack_start (GTK_BOX (hbox24), vbox35, TRUE, TRUE, 0); ! image14 = create_pixmap (EnterUser, NULL); gtk_widget_show (image14); ! gtk_box_pack_start (GTK_BOX (vbox35), image14, TRUE, TRUE, 0); label38 = gtk_label_new (_("<b>Configure\nUseraccount</b>\n\nStep:\n6 of 7")); gtk_widget_show (label38); ! gtk_box_pack_start (GTK_BOX (vbox35), label38, FALSE, FALSE, 0); gtk_widget_set_size_request (label38, 51, -1); gtk_label_set_use_markup (GTK_LABEL (label38), TRUE); --- 1387,1397 ---- gtk_box_pack_start (GTK_BOX (hbox24), vbox35, TRUE, TRUE, 0); ! image14 = create_pixmap (EnterUser, "installpenguin.png"); gtk_widget_show (image14); ! gtk_box_pack_start (GTK_BOX (vbox35), image14, FALSE, FALSE, 8); label38 = gtk_label_new (_("<b>Configure\nUseraccount</b>\n\nStep:\n6 of 7")); gtk_widget_show (label38); ! gtk_box_pack_start (GTK_BOX (vbox35), label38, TRUE, TRUE, 0); gtk_widget_set_size_request (label38, 51, -1); gtk_label_set_use_markup (GTK_LABEL (label38), TRUE); *************** *** 1542,1545 **** --- 1524,1529 ---- GLADE_HOOKUP_OBJECT_NO_REF (EnterUser, tooltips, "tooltips"); + gtk_widget_grab_focus (entryUser); + gtk_widget_grab_default (buttonOkUser); return EnterUser; } *************** *** 1595,1605 **** gtk_box_pack_start (GTK_BOX (hbox26), vbox38, TRUE, TRUE, 0); ! image15 = create_pixmap (SelectBoot, NULL); gtk_widget_show (image15); ! gtk_box_pack_start (GTK_BOX (vbox38), image15, TRUE, TRUE, 0); label39 = gtk_label_new (_("<b>Configure\nBootloader</b>\n\nStep:\n7 of 7")); gtk_widget_show (label39); ! gtk_box_pack_start (GTK_BOX (vbox38), label39, FALSE, FALSE, 0); gtk_widget_set_size_request (label39, 51, -1); gtk_label_set_use_markup (GTK_LABEL (label39), TRUE); --- 1579,1589 ---- gtk_box_pack_start (GTK_BOX (hbox26), vbox38, TRUE, TRUE, 0); ! image15 = create_pixmap (SelectBoot, "installpenguin.png"); gtk_widget_show (image15); ! gtk_box_pack_start (GTK_BOX (vbox38), image15, FALSE, FALSE, 8); label39 = gtk_label_new (_("<b>Configure\nBootloader</b>\n\nStep:\n7 of 7")); gtk_widget_show (label39); ! gtk_box_pack_start (GTK_BOX (vbox38), label39, TRUE, TRUE, 0); gtk_widget_set_size_request (label39, 51, -1); gtk_label_set_use_markup (GTK_LABEL (label39), TRUE); *************** *** 1743,1746 **** --- 1727,1732 ---- GLADE_HOOKUP_OBJECT_NO_REF (SelectBoot, tooltips, "tooltips"); + gtk_widget_grab_focus (radiobuttonLILO); + gtk_widget_grab_default (buttonOkBoot); return SelectBoot; } *************** *** 1779,1785 **** gtk_box_pack_start (GTK_BOX (hbox28), vbox41, TRUE, TRUE, 0); ! image16 = create_pixmap (EndScreen, NULL); gtk_widget_show (image16); ! gtk_box_pack_start (GTK_BOX (vbox41), image16, TRUE, TRUE, 0); vseparator16 = gtk_vseparator_new (); --- 1765,1771 ---- gtk_box_pack_start (GTK_BOX (hbox28), vbox41, TRUE, TRUE, 0); ! image16 = create_pixmap (EndScreen, "installpenguin.png"); gtk_widget_show (image16); ! gtk_box_pack_start (GTK_BOX (vbox41), image16, FALSE, FALSE, 8); vseparator16 = gtk_vseparator_new (); *************** *** 1838,1841 **** --- 1824,1829 ---- GLADE_HOOKUP_OBJECT (EndScreen, buttonOkEnd, "buttonOkEnd"); + gtk_widget_grab_focus (buttonOkEnd); + gtk_widget_grab_default (buttonOkEnd); return EndScreen; } *************** *** 1887,1898 **** GtkWidget *ErrorLabel; GtkWidget *vbox45; - GtkWidget *vbox46; - GtkWidget *label31; GtkWidget *ErrorLabelText; GtkWidget *hbuttonbox11; ! GtkWidget *button11; ErrorLabel = gtk_dialog_new (); ! gtk_window_set_title (GTK_WINDOW (ErrorLabel), _("Installation Error")); gtk_window_set_position (GTK_WINDOW (ErrorLabel), GTK_WIN_POS_CENTER); gtk_window_set_default_size (GTK_WINDOW (ErrorLabel), 640, -1); --- 1875,1885 ---- GtkWidget *ErrorLabel; GtkWidget *vbox45; GtkWidget *ErrorLabelText; GtkWidget *hbuttonbox11; ! GtkWidget *QuitButton; ! GtkWidget *BackButton; ErrorLabel = gtk_dialog_new (); ! gtk_window_set_title (GTK_WINDOW (ErrorLabel), _("Morphix Install")); gtk_window_set_position (GTK_WINDOW (ErrorLabel), GTK_WIN_POS_CENTER); gtk_window_set_default_size (GTK_WINDOW (ErrorLabel), 640, -1); *************** *** 1902,1917 **** gtk_widget_show (vbox45); ! vbox46 = gtk_vbox_new (FALSE, 0); ! gtk_widget_show (vbox46); ! gtk_box_pack_end (GTK_BOX (vbox45), vbox46, TRUE, TRUE, 0); ! ! label31 = gtk_label_new (_("An error has occured. \n")); ! gtk_widget_show (label31); ! gtk_box_pack_start (GTK_BOX (vbox46), label31, TRUE, TRUE, 0); ! gtk_label_set_justify (GTK_LABEL (label31), GTK_JUSTIFY_CENTER); ! ! ErrorLabelText = gtk_label_new (""); gtk_widget_show (ErrorLabelText); ! gtk_box_pack_end (GTK_BOX (vbox46), ErrorLabelText, TRUE, TRUE, 0); hbuttonbox11 = GTK_DIALOG (ErrorLabel)->action_area; --- 1889,1898 ---- gtk_widget_show (vbox45); ! ErrorLabelText = gtk_label_new_with_mnemonic (_("ErrorLabel")); gtk_widget_show (ErrorLabelText); ! gtk_box_pack_end (GTK_BOX (vbox45), ErrorLabelText, FALSE, FALSE, 0); ! gtk_label_set_use_markup (GTK_LABEL (ErrorLabelText), TRUE); ! gtk_label_set_justify (GTK_LABEL (ErrorLabelText), GTK_JUSTIFY_CENTER); ! gtk_label_set_line_wrap (GTK_LABEL (ErrorLabelText), TRUE); hbuttonbox11 = GTK_DIALOG (ErrorLabel)->action_area; *************** *** 1919,1931 **** gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox11), GTK_BUTTONBOX_END); ! button11 = gtk_button_new_from_stock ("gtk-quit"); ! gtk_widget_show (button11); ! gtk_dialog_add_action_widget (GTK_DIALOG (ErrorLabel), button11, GTK_RESPONSE_CLOSE); ! GTK_WIDGET_SET_FLAGS (button11, GTK_CAN_DEFAULT); g_signal_connect_swapped ((gpointer) ErrorLabel, "show", G_CALLBACK (on_ErrorLabel_show), GTK_OBJECT (ErrorLabelText)); ! g_signal_connect ((gpointer) button11, "clicked", G_CALLBACK (gtk_main_quit), NULL); --- 1900,1917 ---- gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox11), GTK_BUTTONBOX_END); ! QuitButton = gtk_button_new_from_stock ("gtk-quit"); ! gtk_widget_show (QuitButton); ! gtk_dialog_add_action_widget (GTK_DIALOG (ErrorLabel), QuitButton, GTK_RESPONSE_CLOSE); ! GTK_WIDGET_SET_FLAGS (QuitButton, GTK_CAN_DEFAULT); ! ! BackButton = gtk_button_new_from_stock ("gtk-go-back"); ! gtk_widget_show (BackButton); ! gtk_dialog_add_action_widget (GTK_DIALOG (ErrorLabel), BackButton, 0); ! GTK_WIDGET_SET_FLAGS (BackButton, GTK_CAN_DEFAULT); g_signal_connect_swapped ((gpointer) ErrorLabel, "show", G_CALLBACK (on_ErrorLabel_show), GTK_OBJECT (ErrorLabelText)); ! g_signal_connect ((gpointer) QuitButton, "clicked", G_CALLBACK (gtk_main_quit), NULL); *************** *** 1934,1943 **** GLADE_HOOKUP_OBJECT_NO_REF (ErrorLabel, ErrorLabel, "ErrorLabel"); GLADE_HOOKUP_OBJECT_NO_REF (ErrorLabel, vbox45, "vbox45"); - GLADE_HOOKUP_OBJECT (ErrorLabel, vbox46, "vbox46"); - GLADE_HOOKUP_OBJECT (ErrorLabel, label31, "label31"); GLADE_HOOKUP_OBJECT (ErrorLabel, ErrorLabelText, "ErrorLabelText"); GLADE_HOOKUP_OBJECT_NO_REF (ErrorLabel, hbuttonbox11, "hbuttonbox11"); ! GLADE_HOOKUP_OBJECT (ErrorLabel, button11, "button11"); return ErrorLabel; } --- 1920,1929 ---- GLADE_HOOKUP_OBJECT_NO_REF (ErrorLabel, ErrorLabel, "ErrorLabel"); GLADE_HOOKUP_OBJECT_NO_REF (ErrorLabel, vbox45, "vbox45"); GLADE_HOOKUP_OBJECT (ErrorLabel, ErrorLabelText, "ErrorLabelText"); GLADE_HOOKUP_OBJECT_NO_REF (ErrorLabel, hbuttonbox11, "hbuttonbox11"); ! GLADE_HOOKUP_OBJECT (ErrorLabel, QuitButton, "QuitButton"); ! GLADE_HOOKUP_OBJECT (ErrorLabel, BackButton, "BackButton"); + gtk_widget_grab_default (QuitButton); return ErrorLabel; } *************** *** 2317,2320 **** --- 2303,2308 ---- GLADE_HOOKUP_OBJECT (SelectPartExpert, okButtonExpert, "okButtonExpert"); + gtk_widget_grab_focus (EntryPart1Expert); + gtk_widget_grab_default (okButtonExpert); return SelectPartExpert; } Index: ui.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/ui.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ui.c 29 Feb 2004 15:41:51 -0000 1.1 --- ui.c 7 Mar 2004 03:40:51 -0000 1.2 *************** *** 54,58 **** extern GtkWidget *SelectPartExpert; ! extern gint global_cdrom_size; /* --- 54,65 ---- extern GtkWidget *SelectPartExpert; ! gint global_cdrom_size; ! gint global_error_type; ! ! enum { ! ERROR_BACK, ! ERROR_QUIT, ! ERROR_CONTINUE ! }; /* *************** *** 60,64 **** */ ! gboolean progress_timeout(gpointer data) { GtkWidget *pbar = data; --- 67,71 ---- */ ! gboolean ProgressTimeout(gpointer data) { GtkWidget *pbar = data; *************** *** 73,81 **** } /* timeout function for the installing-process */ ! gboolean progress_timeout_size(gpointer data) { GtkWidget *pbar = data; gchar str_per[5]; --- 80,118 ---- } + void SetSavedCdromSize(gint size) { + global_cdrom_size = size; + } + + gint GetSavedCdromSize(gint size) { + return global_cdrom_size; + } + + void DoAnimation(GtkWidget *image, gchar *path) { + GdkPixbufAnimation *anim = gdk_pixbuf_animation_new_from_file(path,NULL); + if (anim != NULL) { + gtk_image_set_from_animation(GTK_IMAGE(image),anim); + } + } + + gboolean CheckSizeRootpartition() { + if (GetCurrentSize(global_cdrom_size) >= GetPartUsedSize(GetSelectedRoot())) { + ErrorLabel = create_ErrorLabel(); + gtk_widget_show(ErrorLabel); + return FALSE; + } + if (GetCurrentSize(global_cdrom_size) >= GetPartUsedSize(GetSelectedRoot()) + 100) { + ErrorLabel = create_ErrorLabel(); + gtk_widget_show(ErrorLabel); + debug("Root partition size dangerously low, but installing shouldn't fail"); + return FALSE; + } + return TRUE; + } + /* timeout function for the installing-process */ ! gboolean ProgressTimeoutSize(gpointer data) { GtkWidget *pbar = data; gchar str_per[5]; *************** *** 84,88 **** gint curr_rootpart_size = GetPartUsedSize(GetSelectedRoot()); gdouble fraction = GetCurrentPercentage(global_cdrom_size,curr_rootpart_size); ! updateInstallLabel(curr_rootpart_size,(gint)global_cdrom_size); gint percentage = (fraction * 100); sprintf(str_per,"%3d%%",percentage); --- 121,127 ---- gint curr_rootpart_size = GetPartUsedSize(GetSelectedRoot()); gdouble fraction = GetCurrentPercentage(global_cdrom_size,curr_rootpart_size); ! printf("Curr rootpart: %d\nCurr fraction: %f\nCurr global cdrom size: %d\n", ! curr_rootpart_size,fraction,global_cdrom_size); ! updateInstallLabel(curr_rootpart_size,GetCurrentSize(global_cdrom_size)); gint percentage = (fraction * 100); sprintf(str_per,"%3d%%",percentage); *************** *** 96,100 **** } ! void do_install_process() { GThread *thread; if (!g_thread_supported ()) g_thread_init (NULL); --- 135,139 ---- } ! void DoInstallProcess() { GThread *thread; if (!g_thread_supported ()) g_thread_init (NULL); *************** *** 179,186 **** } void ShowError(gchar *error) { error_msg = error; ! ErrorMessage = create_ErrorMessage (); ! gtk_widget_show (ErrorMessage); } --- 218,241 ---- } + gboolean ErrorBackButton() { + if (global_error_type == ERROR_BACK) + return TRUE; + return FALSE; + } + + /* for recoverable errors, with the only option of going back */ + void ShowErrorBack(gchar *error) { + error_msg = error; + ErrorLabel = create_ErrorLabel(); + global_error_type = ERROR_BACK; + gtk_widget_show(ErrorLabel); + } + + /* for non-recoverable errors, only option is quitting */ void ShowError(gchar *error) { error_msg = error; ! ErrorLabel = create_ErrorLabel(); ! global_error_type = ERROR_QUIT; ! gtk_widget_show (ErrorLabel); } Index: ui.h =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/src/ui.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ui.h 29 Feb 2004 15:41:51 -0000 1.1 --- ui.h 7 Mar 2004 03:40:51 -0000 1.2 *************** *** 26,35 **** extern GtkWidget *HelpDialog; ! gboolean progress_timeout(gpointer data); ! gboolean progress_timeout_size(gpointer data); void updateInstallLabel(gint current, gint total); void SetupPartitionerList(); void ShowError(gchar *error); ! void do_install_process(); #endif --- 26,35 ---- extern GtkWidget *HelpDialog; ! gboolean ProgressTimeout(gpointer data); ! gboolean ProgressTimeoutSize(gpointer data); void updateInstallLabel(gint current, gint total); void SetupPartitionerList(); void ShowError(gchar *error); ! void DoInstallProcess(); #endif |
|
From: <ale...@us...> - 2004-03-07 04:04:06
|
Update of /cvsroot/morphix/morphixinstaller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12564 Modified Files: morphixinstaller.glade trans.c Log Message: error notifications, install feedback fixes might actually install this time... Index: morphixinstaller.glade =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/morphixinstaller.glade,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** morphixinstaller.glade 16 Feb 2004 23:42:12 -0000 1.13 --- morphixinstaller.glade 7 Mar 2004 03:40:51 -0000 1.14 *************** *** 59,62 **** --- 59,63 ---- <property name="visible">True</property> <property name="can_default">True</property> + <property name="has_default">True</property> <property name="can_focus">True</property> <property name="label">gtk-go-forward</property> *************** *** 91,94 **** --- 92,96 ---- <widget class="GtkImage" id="image33"> <property name="visible">True</property> + <property name="pixbuf">installpenguin.png</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> *************** *** 97,103 **** </widget> <packing> ! <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> </packing> </child> --- 99,105 ---- </widget> <packing> ! <property name="padding">8</property> ! <property name="expand">False</property> ! <property name="fill">False</property> </packing> </child> *************** *** 351,354 **** --- 353,357 ---- <property name="visible">True</property> <property name="can_default">True</property> + <property name="has_default">True</property> <property name="can_focus">True</property> <property name="label">gtk-go-forward</property> *************** *** 383,386 **** --- 386,390 ---- <widget class="GtkImage" id="image3"> <property name="visible">True</property> + <property name="pixbuf">installpenguin.png</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> *************** *** 389,395 **** </widget> <packing> ! <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> </packing> </child> --- 393,399 ---- </widget> <packing> ! <property name="padding">8</property> ! <property name="expand">False</property> ! <property name="fill">False</property> </packing> </child> *************** *** 415,426 **** <packing> <property name="padding">0</property> ! <property name="expand">False</property> ! <property name="fill">False</property> </packing> </child> - - <child> - <placeholder/> - </child> </widget> <packing> --- 419,426 ---- <packing> <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> </packing> </child> </widget> <packing> *************** *** 503,506 **** --- 503,507 ---- <property name="tooltip" translatable="yes">A list of harddisks, choose the one you want to install Morphix on</property> <property name="can_focus">True</property> + <property name="has_focus">True</property> <property name="editable">False</property> <property name="visibility">True</property> *************** *** 709,712 **** --- 710,714 ---- <property name="can_default">True</property> <property name="can_focus">True</property> + <property name="has_focus">True</property> <property name="label">gtk-go-forward</property> <property name="use_stock">True</property> *************** *** 740,743 **** --- 742,746 ---- <widget class="GtkImage" id="image4"> <property name="visible">True</property> + <property name="pixbuf">installpenguin.png</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> *************** *** 746,752 **** </widget> <packing> ! <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> </packing> </child> --- 749,755 ---- </widget> <packing> ! <property name="padding">8</property> ! <property name="expand">False</property> ! <property name="fill">False</property> </packing> </child> *************** *** 772,783 **** <packing> <property name="padding">0</property> ! <property name="expand">False</property> ! <property name="fill">False</property> </packing> </child> - - <child> - <placeholder/> - </child> </widget> <packing> --- 775,782 ---- <packing> <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> </packing> </child> </widget> <packing> *************** *** 878,881 **** --- 877,881 ---- <property name="tooltip" translatable="yes">A list of the detected swap partitions, use back if you want to make additional changes to your harddisk</property> <property name="can_focus">True</property> + <property name="has_focus">True</property> <property name="editable">False</property> <property name="visibility">True</property> *************** *** 1165,1168 **** --- 1165,1169 ---- <property name="visible">True</property> <property name="can_default">True</property> + <property name="has_default">True</property> <property name="can_focus">True</property> <property name="label">gtk-go-forward</property> *************** *** 1197,1200 **** --- 1198,1202 ---- <widget class="GtkImage" id="image6"> <property name="visible">True</property> + <property name="pixbuf">installpenguin.png</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> *************** *** 1203,1209 **** </widget> <packing> ! <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> </packing> </child> --- 1205,1211 ---- </widget> <packing> ! <property name="padding">8</property> ! <property name="expand">False</property> ! <property name="fill">False</property> </packing> </child> *************** *** 1229,1240 **** <packing> <property name="padding">0</property> ! <property name="expand">False</property> ! <property name="fill">False</property> </packing> </child> - - <child> - <placeholder/> - </child> </widget> <packing> --- 1231,1238 ---- <packing> <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> </packing> </child> </widget> <packing> *************** *** 1308,1311 **** --- 1306,1310 ---- <property name="tooltip" translatable="yes">A list of available partitions to install Morphix on. Choose back if you want to go back and repartition your harddisk</property> <property name="can_focus">True</property> + <property name="has_focus">True</property> <property name="editable">True</property> <property name="visibility">True</property> *************** *** 1582,1587 **** <property name="window_position">GTK_WIN_POS_CENTER</property> <property name="modal">False</property> - <property name="default_width">640</property> - <property name="default_height">480</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> --- 1581,1584 ---- *************** *** 1613,1625 **** <child> ! <widget class="GtkButton" id="buttonSmall"> <property name="visible">True</property> <property name="can_default">True</property> <property name="can_focus">True</property> <property name="label">gtk-go-back</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="response_id">-7</property> ! <signal name="clicked" handler="on_buttonSmall_clicked" last_modification_time="Fri, 31 Jan 2003 22:55:15 GMT"/> </widget> </child> --- 1610,1637 ---- <child> ! <widget class="GtkButton" id="buttonBack"> <property name="visible">True</property> <property name="can_default">True</property> + <property name="has_default">True</property> <property name="can_focus">True</property> + <property name="has_focus">True</property> <property name="label">gtk-go-back</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="response_id">-7</property> ! <signal name="clicked" handler="on_buttonBack_clicked" last_modification_time="Sun, 07 Mar 2004 03:30:04 GMT"/> ! </widget> ! </child> ! ! <child> ! <widget class="GtkButton" id="buttonForward"> ! <property name="visible">True</property> ! <property name="can_default">True</property> ! <property name="can_focus">True</property> ! <property name="label">gtk-go-forward</property> ! <property name="use_stock">True</property> ! <property name="relief">GTK_RELIEF_NORMAL</property> ! <property name="response_id">0</property> ! <signal name="clicked" handler="on_buttonForward_clicked" last_modification_time="Sun, 07 Mar 2004 03:30:13 GMT"/> </widget> </child> *************** *** 1634,1745 **** <child> ! <widget class="GtkHBox" id="hbox13"> <property name="visible">True</property> ! <property name="homogeneous">False</property> ! <property name="spacing">0</property> ! ! <child> ! <widget class="GtkVBox" id="vbox15"> ! <property name="visible">True</property> ! <property name="homogeneous">False</property> ! <property name="spacing">0</property> ! ! <child> ! <widget class="GtkImage" id="image8"> ! <property name="visible">True</property> ! <property name="xalign">0.5</property> ! <property name="yalign">0.5</property> ! <property name="xpad">0</property> ! <property name="ypad">0</property> ! </widget> ! <packing> ! <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> ! </packing> ! </child> ! ! <child> ! <placeholder/> ! </child> ! ! <child> ! <placeholder/> ! </child> ! </widget> ! <packing> ! <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> ! </packing> ! </child> ! ! <child> ! <widget class="GtkVSeparator" id="vseparator8"> ! <property name="visible">True</property> ! </widget> ! <packing> ! <property name="padding">0</property> ! <property name="expand">False</property> ! <property name="fill">False</property> ! </packing> ! </child> ! ! <child> ! <widget class="GtkHBox" id="hbox14"> ! <property name="visible">True</property> ! <property name="homogeneous">False</property> ! <property name="spacing">0</property> ! ! <child> ! <widget class="GtkVBox" id="vbox16"> ! <property name="visible">True</property> ! <property name="homogeneous">True</property> ! <property name="spacing">0</property> ! <child> ! <widget class="GtkLabel" id="label12"> ! <property name="width_request">400</property> ! <property name="height_request">200</property> ! <property name="visible">True</property> ! <property name="label" translatable="yes">The selected rootpartition is smaller ! than we recommend, make sure the ! partition is bigger than X MB</property> ! <property name="use_underline">False</property> ! <property name="use_markup">False</property> ! <property name="justify">GTK_JUSTIFY_CENTER</property> ! <property name="wrap">True</property> ! <property name="selectable">False</property> ! <property name="xalign">0.5</property> ! <property name="yalign">0.5</property> ! <property name="xpad">28</property> ! <property name="ypad">0</property> ! </widget> ! <packing> ! <property name="padding">0</property> ! <property name="expand">False</property> ! <property name="fill">False</property> ! </packing> ! </child> ! </widget> ! <packing> ! <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> ! </packing> ! </child> ! </widget> ! <packing> ! <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">False</property> ! <property name="pack_type">GTK_PACK_END</property> ! </packing> ! </child> </widget> <packing> <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> </packing> </child> --- 1646,1669 ---- <child> ! <widget class="GtkLabel" id="label55"> <property name="visible">True</property> ! <property name="label" translatable="yes">The selected root partition doesn't appear to have enough free space available for a complete Morphix install ! You may continue, but be advised that the install procedure will likely fail. ! You are advised to go back and select a larger root partition.</property> ! <property name="use_underline">False</property> ! <property name="use_markup">False</property> ! <property name="justify">GTK_JUSTIFY_LEFT</property> ! <property name="wrap">True</property> ! <property name="selectable">False</property> ! <property name="xalign">0.5</property> ! <property name="yalign">0.5</property> ! <property name="xpad">0</property> ! <property name="ypad">0</property> </widget> <packing> <property name="padding">0</property> ! <property name="expand">False</property> ! <property name="fill">False</property> </packing> </child> *************** *** 1977,1980 **** --- 1901,1905 ---- <property name="visible">True</property> <property name="can_default">True</property> + <property name="has_default">True</property> <property name="can_focus">True</property> <property name="label">gtk-go-forward</property> *************** *** 2009,2012 **** --- 1934,1938 ---- <widget class="GtkImage" id="image12"> <property name="visible">True</property> + <property name="pixbuf">installpenguin.png</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> *************** *** 2015,2021 **** </widget> <packing> ! <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> </packing> </child> --- 1941,1947 ---- </widget> <packing> ! <property name="padding">8</property> ! <property name="expand">False</property> ! <property name="fill">False</property> </packing> </child> *************** *** 2042,2053 **** <packing> <property name="padding">0</property> ! <property name="expand">False</property> ! <property name="fill">False</property> </packing> </child> - - <child> - <placeholder/> - </child> </widget> <packing> --- 1968,1975 ---- <packing> <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> </packing> </child> </widget> <packing> *************** *** 2140,2143 **** --- 2062,2066 ---- <property name="tooltip" translatable="yes">A hostname is used to identify your computer. You may choose anything as a name</property> <property name="can_focus">True</property> + <property name="has_focus">True</property> <property name="editable">True</property> <property name="visibility">True</property> *************** *** 2242,2245 **** --- 2165,2169 ---- <property name="visible">True</property> <property name="can_default">True</property> + <property name="has_default">True</property> <property name="can_focus">True</property> <property name="label">gtk-go-forward</property> *************** *** 2274,2277 **** --- 2198,2202 ---- <widget class="GtkImage" id="image13"> <property name="visible">True</property> + <property name="pixbuf">installpenguin.png</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> *************** *** 2280,2286 **** </widget> <packing> ! <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> </packing> </child> --- 2205,2211 ---- </widget> <packing> ! <property name="padding">8</property> ! <property name="expand">False</property> ! <property name="fill">False</property> </packing> </child> *************** *** 2307,2318 **** <packing> <property name="padding">0</property> ! <property name="expand">False</property> ! <property name="fill">False</property> </packing> </child> - - <child> - <placeholder/> - </child> </widget> <packing> --- 2232,2239 ---- <packing> <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> </packing> </child> </widget> <packing> *************** *** 2434,2437 **** --- 2355,2359 ---- <property name="visible">True</property> <property name="can_focus">True</property> + <property name="has_focus">True</property> <property name="editable">True</property> <property name="visibility">False</property> *************** *** 2562,2565 **** --- 2484,2488 ---- <property name="visible">True</property> <property name="can_default">True</property> + <property name="has_default">True</property> <property name="can_focus">True</property> <property name="label">gtk-go-forward</property> *************** *** 2594,2597 **** --- 2517,2521 ---- <widget class="GtkImage" id="image14"> <property name="visible">True</property> + <property name="pixbuf">installpenguin.png</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> *************** *** 2600,2606 **** </widget> <packing> ! <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> </packing> </child> --- 2524,2530 ---- </widget> <packing> ! <property name="padding">8</property> ! <property name="expand">False</property> ! <property name="fill">False</property> </packing> </child> *************** *** 2627,2638 **** <packing> <property name="padding">0</property> ! <property name="expand">False</property> ! <property name="fill">False</property> </packing> </child> - - <child> - <placeholder/> - </child> </widget> <packing> --- 2551,2558 ---- <packing> <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> </packing> </child> </widget> <packing> *************** *** 2723,2726 **** --- 2643,2647 ---- <property name="tooltip" translatable="yes">This name will be used for the first user, keep it short and simple</property> <property name="can_focus">True</property> + <property name="has_focus">True</property> <property name="editable">True</property> <property name="visibility">True</property> *************** *** 2952,2955 **** --- 2873,2877 ---- <property name="visible">True</property> <property name="can_default">True</property> + <property name="has_default">True</property> <property name="can_focus">True</property> <property name="label">gtk-go-forward</property> *************** *** 2984,2987 **** --- 2906,2910 ---- <widget class="GtkImage" id="image15"> <property name="visible">True</property> + <property name="pixbuf">installpenguin.png</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> *************** *** 2990,2996 **** </widget> <packing> ! <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> </packing> </child> --- 2913,2919 ---- </widget> <packing> ! <property name="padding">8</property> ! <property name="expand">False</property> ! <property name="fill">False</property> </packing> </child> *************** *** 3017,3028 **** <packing> <property name="padding">0</property> ! <property name="expand">False</property> ! <property name="fill">False</property> </packing> </child> - - <child> - <placeholder/> - </child> </widget> <packing> --- 2940,2947 ---- <packing> <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> </packing> </child> </widget> <packing> *************** *** 3095,3098 **** --- 3014,3018 ---- <property name="tooltip" translatable="yes">If you have other operating systems, this might make them unavailable. Take care when using this option</property> <property name="can_focus">True</property> + <property name="has_focus">True</property> <property name="label" translatable="yes">Install GRUB on MBR (removes other bootloaders!) </property> <property name="use_underline">True</property> *************** *** 3340,3344 **** --- 3260,3266 ---- <property name="visible">True</property> <property name="can_default">True</property> + <property name="has_default">True</property> <property name="can_focus">True</property> + <property name="has_focus">True</property> <property name="label">gtk-quit</property> <property name="use_stock">True</property> *************** *** 3372,3375 **** --- 3294,3298 ---- <widget class="GtkImage" id="image16"> <property name="visible">True</property> + <property name="pixbuf">installpenguin.png</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> *************** *** 3378,3384 **** </widget> <packing> ! <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> </packing> </child> --- 3301,3307 ---- </widget> <packing> ! <property name="padding">8</property> ! <property name="expand">False</property> ! <property name="fill">False</property> </packing> </child> *************** *** 3534,3538 **** <widget class="GtkDialog" id="ErrorLabel"> <property name="visible">True</property> ! <property name="title" translatable="yes">Installation Error</property> <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_CENTER</property> --- 3457,3461 ---- <widget class="GtkDialog" id="ErrorLabel"> <property name="visible">True</property> ! <property name="title" translatable="yes">Morphix Install</property> <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_CENTER</property> *************** *** 3556,3562 **** <child> ! <widget class="GtkButton" id="button11"> <property name="visible">True</property> <property name="can_default">True</property> <property name="can_focus">True</property> <property name="label">gtk-quit</property> --- 3479,3486 ---- <child> ! <widget class="GtkButton" id="QuitButton"> <property name="visible">True</property> <property name="can_default">True</property> + <property name="has_default">True</property> <property name="can_focus">True</property> <property name="label">gtk-quit</property> *************** *** 3567,3570 **** --- 3491,3506 ---- </widget> </child> + + <child> + <widget class="GtkButton" id="BackButton"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-go-back</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="response_id">0</property> + </widget> + </child> </widget> <packing> *************** *** 3577,3633 **** <child> ! <widget class="GtkVBox" id="vbox46"> <property name="visible">True</property> ! <property name="homogeneous">False</property> ! <property name="spacing">0</property> ! ! <child> ! <widget class="GtkLabel" id="label31"> ! <property name="visible">True</property> ! <property name="label" translatable="yes">An error has occured. ! </property> ! <property name="use_underline">False</property> ! <property name="use_markup">False</property> ! <property name="justify">GTK_JUSTIFY_CENTER</property> ! <property name="wrap">False</property> ! <property name="selectable">False</property> ! <property name="xalign">0.5</property> ! <property name="yalign">0.5</property> ! <property name="xpad">0</property> ! <property name="ypad">0</property> ! </widget> ! <packing> ! <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> ! </packing> ! </child> ! ! <child> ! <widget class="GtkLabel" id="ErrorLabelText"> ! <property name="visible">True</property> ! <property name="label" translatable="yes"></property> ! <property name="use_underline">False</property> ! <property name="use_markup">False</property> ! <property name="justify">GTK_JUSTIFY_LEFT</property> ! <property name="wrap">False</property> ! <property name="selectable">False</property> ! <property name="xalign">0.5</property> ! <property name="yalign">0.5</property> ! <property name="xpad">0</property> ! <property name="ypad">0</property> ! </widget> ! <packing> ! <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> ! <property name="pack_type">GTK_PACK_END</property> ! </packing> ! </child> </widget> <packing> <property name="padding">0</property> ! <property name="expand">True</property> ! <property name="fill">True</property> <property name="pack_type">GTK_PACK_END</property> </packing> --- 3513,3533 ---- <child> ! <widget class="GtkLabel" id="ErrorLabelText"> <property name="visible">True</property> ! <property name="label" translatable="yes">ErrorLabel</property> ! <property name="use_underline">True</property> ! <property name="use_markup">True</property> ! <property name="justify">GTK_JUSTIFY_CENTER</property> ! <property name="wrap">True</property> ! <property name="selectable">False</property> ! <property name="xalign">0.5</property> ! <property name="yalign">0.5</property> ! <property name="xpad">0</property> ! <property name="ypad">0</property> </widget> <packing> <property name="padding">0</property> ! <property name="expand">False</property> ! <property name="fill">False</property> <property name="pack_type">GTK_PACK_END</property> </packing> *************** *** 3857,3860 **** --- 3757,3761 ---- <property name="visible">True</property> <property name="can_default">True</property> + <property name="has_default">True</property> <property name="can_focus">True</property> <property name="label">gtk-ok</property> *************** *** 3926,3929 **** --- 3827,3831 ---- <property name="visible">True</property> <property name="can_focus">True</property> + <property name="has_focus">True</property> <property name="editable">False</property> <property name="visibility">True</property> Index: trans.c =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/trans.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** trans.c 16 Feb 2004 23:42:12 -0000 1.13 --- trans.c 7 Mar 2004 03:40:51 -0000 1.14 *************** *** 84,90 **** "please go back and correct your settings!</b>"); gchar *s = N_("Morphix Install"); ! gchar *s = N_("The selected rootpartition is smaller\n" ! "than we recommend, make sure the \n" ! "partition is bigger than X MB"); gchar *s = N_("Processing..."); gchar *s = N_("<b>Creating filesystem, please wait...</b>"); --- 84,91 ---- "please go back and correct your settings!</b>"); gchar *s = N_("Morphix Install"); ! gchar *s = N_("The selected root partition doesn't appear to have enough free space available for a complete Morphix install\n" ! "\n" ! "You may continue, but be advised that the install procedure will likely fail.\n" ! "You are advised to go back and select a larger root partition."); gchar *s = N_("Processing..."); gchar *s = N_("<b>Creating filesystem, please wait...</b>"); *************** *** 175,181 **** gchar *s = N_("Processing..."); gchar *s = N_("Creating Swap partition..."); ! gchar *s = N_("Installation Error"); ! gchar *s = N_("An error has occured. \n" ! ""); gchar *s = N_("Installer Help"); gchar *s = N_("Welcome to the Morphix Installer Help!\n" --- 176,181 ---- gchar *s = N_("Processing..."); gchar *s = N_("Creating Swap partition..."); ! gchar *s = N_("Morphix Install"); ! gchar *s = N_("ErrorLabel"); gchar *s = N_("Installer Help"); gchar *s = N_("Welcome to the Morphix Installer Help!\n" |
|
From: <ale...@us...> - 2004-03-07 04:04:06
|
Update of /cvsroot/morphix/morphixinstaller/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12564/debian Modified Files: changelog files Log Message: error notifications, install feedback fixes might actually install this time... Index: changelog =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/debian/changelog,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** changelog 2 Feb 2004 01:42:15 -0000 1.2 --- changelog 7 Mar 2004 03:40:51 -0000 1.3 *************** *** 1,2 **** --- 1,17 ---- + morphixinstaller (0.2-0) unstable; urgency=low + + * Grub stuff + * fixes for install procedure feedback + * error window updates + * more useless cruft + + -- Alex de Landgraaf <ale...@xs...> Sun, 7 Mar 2004 04:30:08 +0000 + + morphixinstaller (0.1-3) unstable; urgency=low + + * dancing penguin update! + + -- Alex de Landgraaf <ale...@xs...> Tue, 17 Feb 2004 00:33:09 +0000 + morphixinstaller (0.1-2) unstable; urgency=low Index: files =================================================================== RCS file: /cvsroot/morphix/morphixinstaller/debian/files,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** files 15 Feb 2004 23:41:51 -0000 1.2 --- files 7 Mar 2004 03:40:51 -0000 1.3 *************** *** 1 **** ! morphixinstaller_0.1-2_i386.deb admin optional --- 1 ---- ! morphixinstaller_0.2-0_i386.deb admin optional |
Update of /cvsroot/morphix/mcp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21513 Modified Files: Makefile Makefile.am Makefile.in callbacks.c iconviewer.c iconviewer.h interface.c Added Files: eggiconlist.c eggiconlist.c~ eggiconlist.h eggiconlist.o eggintl.h eggmarshalers.c eggmarshalers.h eggmarshalers.o eggtrayicon.c eggtrayicon.h eggtrayicon.o Log Message: Long and hard, he fought for justice, Far and wide he sought for truth, He came back with triumph, joy and peace, Only to find that he could have better just copied an iconviewer widget instead and get over with it Using libegg iconview widget, resizing works. Not as pretty, but less of a hassle (and less self-written code to maintain) --- NEW FILE: eggiconlist.c --- /* eggiconlist.h * Copyright (C) 2002 Anders Carlsson <and...@gn...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ [...2415 lines suppressed...] EggIconListItem *item) { g_signal_emit (G_OBJECT (icon_list), icon_list_signals[ITEM_ACTIVATED], 0, item); } GList * egg_icon_list_get_items (EggIconList *icon_list) { g_return_val_if_fail (EGG_IS_ICON_LIST (icon_list), NULL); return icon_list->priv->items; } EggIconList * egg_icon_list_item_get_icon_list (EggIconListItem *item) { g_return_val_if_fail (item != NULL, NULL); return item->icon_list; } --- NEW FILE: eggiconlist.c~ --- /* eggiconlist.h * Copyright (C) 2002 Anders Carlsson <and...@gn...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ [...2413 lines suppressed...] EggIconListItem *item) { g_signal_emit (G_OBJECT (icon_list), icon_list_signals[ITEM_ACTIVATED], 0, item); } GList * egg_icon_list_get_items (EggIconList *icon_list) { g_return_val_if_fail (EGG_IS_ICON_LIST (icon_list), NULL); return icon_list->priv->items; } EggIconList * egg_icon_list_item_get_icon_list (EggIconListItem *item) { g_return_val_if_fail (item != NULL, NULL); return item->icon_list; } --- NEW FILE: eggiconlist.h --- /* eggiconlist.h * Copyright (C) 2002 Anders Carlsson <and...@gn...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ #ifndef __EGG_ICON_LIST_H__ #define __EGG_ICON_LIST_H__ #include <gtk/gtkcontainer.h> G_BEGIN_DECLS #define EGG_TYPE_ICON_LIST (egg_icon_list_get_type ()) #define EGG_ICON_LIST(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_ICON_LIST, EggIconList)) #define EGG_ICON_LIST_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_ICON_LIST, EggIconListClass)) #define EGG_IS_ICON_LIST(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_ICON_LIST)) #define EGG_IS_ICON_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_ICON_LIST)) #define EGG_ICON_LIST_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), EGG_TYPE_ICON_LIST, EggIconListClass)) #define EGG_TYPE_ICON_LIST_ITEM (egg_icon_list_item_get_type ()) typedef struct _EggIconList EggIconList; typedef struct _EggIconListClass EggIconListClass; typedef struct _EggIconListPrivate EggIconListPrivate; typedef struct _EggIconListItem EggIconListItem; typedef void (* EggIconListForeachFunc) (EggIconList *icon_list, EggIconListItem *item, gpointer data); typedef gint (* EggIconListItemCompareFunc) (EggIconList *icon_list, EggIconListItem *a, EggIconListItem *b, gpointer user_data); struct _EggIconList { GtkContainer parent; EggIconListPrivate *priv; }; struct _EggIconListClass { GtkContainerClass parent_class; void (* set_scroll_adjustments) (EggIconList *icon_list, GtkAdjustment *hadjustment, GtkAdjustment *vadjustment); void (* item_activated) (EggIconList *icon_list, EggIconListItem *item); void (* selection_changed) (EggIconList *icon_list); void (* item_added) (EggIconList *icon_list, EggIconListItem *item); void (* item_removed) (EggIconList *icon_list, EggIconListItem *item); void (* item_changed) (EggIconList *icon_list, EggIconListItem *item); /* Key binding signals */ void (* select_all) (EggIconList *icon_list); void (* unselect_all) (EggIconList *icon_list); void (* select_cursor_item) (EggIconList *icon_list); void (* toggle_cursor_item) (EggIconList *icon_list); }; GType egg_icon_list_get_type (void); GType egg_icon_list_item_get_type (void); GtkWidget *egg_icon_list_new (void); EggIconListItem * egg_icon_list_item_new (GdkPixbuf *icon, const gchar *label); void egg_icon_list_item_ref (EggIconListItem *item); void egg_icon_list_item_unref (EggIconListItem *item); void egg_icon_list_item_set_data (EggIconListItem *item, gpointer data); void egg_icon_list_item_set_data_full (EggIconListItem *item, gpointer data, GDestroyNotify destroy_notify); gpointer egg_icon_list_item_get_data (EggIconListItem *item); void egg_icon_list_item_set_label (EggIconListItem *item, const char *label); G_CONST_RETURN gchar *egg_icon_list_item_get_label (EggIconListItem *item); void egg_icon_list_item_set_icon (EggIconListItem *item, GdkPixbuf *icon); GdkPixbuf * egg_icon_list_item_get_icon (EggIconListItem *item); EggIconList * egg_icon_list_item_get_icon_list (EggIconListItem *item); void egg_icon_list_append_item (EggIconList *icon_list, EggIconListItem *item); void egg_icon_list_prepend_item (EggIconList *icon_list, EggIconListItem *item); void egg_icon_list_insert_item_before (EggIconList *icon_list, EggIconListItem *sibling, EggIconListItem *item); void egg_icon_list_insert_item_after (EggIconList *icon_list, EggIconListItem *sibling, EggIconListItem *item); void egg_icon_list_remove_item (EggIconList *icon_list, EggIconListItem *item); void egg_icon_list_clear (EggIconList *icon_list); EggIconListItem * egg_icon_list_get_item_at_pos (EggIconList *icon_list, gint x, gint y); gint egg_icon_list_get_item_count (EggIconList *icon_list); void egg_icon_list_foreach (EggIconList *icon_list, EggIconListForeachFunc func, gpointer data); GList * egg_icon_list_get_selected (EggIconList *icon_list); void egg_icon_list_selected_foreach (EggIconList *icon_list, EggIconListForeachFunc func, gpointer data); void egg_icon_list_set_selection_mode (EggIconList *icon_list, GtkSelectionMode mode); GtkSelectionMode egg_icon_list_get_selection_mode (EggIconList *icon_list); void egg_icon_list_select_item (EggIconList *icon_list, EggIconListItem *item); void egg_icon_list_unselect_item (EggIconList *icon_list, EggIconListItem *item); gboolean egg_icon_list_item_is_selected (EggIconListItem *item); void egg_icon_list_select_all (EggIconList *icon_list); void egg_icon_list_unselect_all (EggIconList *icon_list); void egg_icon_list_set_sorted (EggIconList *icon_list, gboolean sorted); gboolean egg_icon_list_get_sorted (EggIconList *icon_list); void egg_icon_list_set_sort_func (EggIconList *icon_list, EggIconListItemCompareFunc func, gpointer data, GDestroyNotify destroy_notify); void egg_icon_list_set_sort_order (EggIconList *icon_list, GtkSortType order); GtkSortType egg_icon_list_get_sort_order (EggIconList *icon_list); void egg_icon_list_item_activated (EggIconList *icon_list, EggIconListItem *item); /* For accessibility */ GList *egg_icon_list_get_items (EggIconList *icon_list); G_END_DECLS #endif /* __EGG_ICON_LIST_H__ */ --- NEW FILE: eggiconlist.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: eggintl.h --- #ifndef __EGG_INTL_H__ #define __EGG_INTL_H__ /* We don't support gettext yet, dunno if we should /Anders */ #define _(x) (x) #define N_(x) (x) #endif /* __EGG_INTL_H__ */ --- NEW FILE: eggmarshalers.c --- #include <glib-object.h> #ifdef G_ENABLE_DEBUG #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) #define g_marshal_value_peek_char(v) g_value_get_char (v) #define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) #define g_marshal_value_peek_int(v) g_value_get_int (v) #define g_marshal_value_peek_uint(v) g_value_get_uint (v) #define g_marshal_value_peek_long(v) g_value_get_long (v) #define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) #define g_marshal_value_peek_int64(v) g_value_get_int64 (v) #define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) #define g_marshal_value_peek_enum(v) g_value_get_enum (v) #define g_marshal_value_peek_flags(v) g_value_get_flags (v) #define g_marshal_value_peek_float(v) g_value_get_float (v) #define g_marshal_value_peek_double(v) g_value_get_double (v) #define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) #define g_marshal_value_peek_param(v) g_value_get_param (v) #define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) #define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) #define g_marshal_value_peek_object(v) g_value_get_object (v) #else /* !G_ENABLE_DEBUG */ /* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. * Do not access GValues directly in your code. Instead, use the * g_value_get_*() functions */ #define g_marshal_value_peek_boolean(v) (v)->data[0].v_int #define g_marshal_value_peek_char(v) (v)->data[0].v_int #define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint #define g_marshal_value_peek_int(v) (v)->data[0].v_int #define g_marshal_value_peek_uint(v) (v)->data[0].v_uint #define g_marshal_value_peek_long(v) (v)->data[0].v_long #define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong #define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 #define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 #define g_marshal_value_peek_enum(v) (v)->data[0].v_int #define g_marshal_value_peek_flags(v) (v)->data[0].v_uint #define g_marshal_value_peek_float(v) (v)->data[0].v_float #define g_marshal_value_peek_double(v) (v)->data[0].v_double #define g_marshal_value_peek_string(v) (v)->data[0].v_pointer #define g_marshal_value_peek_param(v) (v)->data[0].v_pointer #define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer #define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer #define g_marshal_value_peek_object(v) (v)->data[0].v_pointer #endif /* !G_ENABLE_DEBUG */ /* VOID:OBJECT,OBJECT (eggmarshalers.list:1) */ void _egg_marshal_VOID__OBJECT_OBJECT (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data) { typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2); register GMarshalFunc_VOID__OBJECT_OBJECT callback; register GCClosure *cc = (GCClosure*) closure; register gpointer data1, data2; g_return_if_fail (n_param_values == 3); if (G_CCLOSURE_SWAP_DATA (closure)) { data1 = closure->data; data2 = g_value_peek_pointer (param_values + 0); } else { data1 = g_value_peek_pointer (param_values + 0); data2 = closure->data; } callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); callback (data1, g_marshal_value_peek_object (param_values + 1), g_marshal_value_peek_object (param_values + 2), data2); } /* VOID:OBJECT,STRING,LONG,LONG (eggmarshalers.list:2) */ void _egg_marshal_VOID__OBJECT_STRING_LONG_LONG (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data) { typedef void (*GMarshalFunc_VOID__OBJECT_STRING_LONG_LONG) (gpointer data1, gpointer arg_1, gpointer arg_2, glong arg_3, glong arg_4, gpointer data2); register GMarshalFunc_VOID__OBJECT_STRING_LONG_LONG callback; register GCClosure *cc = (GCClosure*) closure; register gpointer data1, data2; g_return_if_fail (n_param_values == 5); if (G_CCLOSURE_SWAP_DATA (closure)) { data1 = closure->data; data2 = g_value_peek_pointer (param_values + 0); } else { data1 = g_value_peek_pointer (param_values + 0); data2 = closure->data; } callback = (GMarshalFunc_VOID__OBJECT_STRING_LONG_LONG) (marshal_data ? marshal_data : cc->callback); callback (data1, g_marshal_value_peek_object (param_values + 1), g_marshal_value_peek_string (param_values + 2), g_marshal_value_peek_long (param_values + 3), g_marshal_value_peek_long (param_values + 4), data2); } /* VOID:OBJECT,LONG (eggmarshalers.list:3) */ void _egg_marshal_VOID__OBJECT_LONG (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data) { typedef void (*GMarshalFunc_VOID__OBJECT_LONG) (gpointer data1, gpointer arg_1, glong arg_2, gpointer data2); register GMarshalFunc_VOID__OBJECT_LONG callback; register GCClosure *cc = (GCClosure*) closure; register gpointer data1, data2; g_return_if_fail (n_param_values == 3); if (G_CCLOSURE_SWAP_DATA (closure)) { data1 = closure->data; data2 = g_value_peek_pointer (param_values + 0); } else { data1 = g_value_peek_pointer (param_values + 0); data2 = closure->data; } callback = (GMarshalFunc_VOID__OBJECT_LONG) (marshal_data ? marshal_data : cc->callback); callback (data1, g_marshal_value_peek_object (param_values + 1), g_marshal_value_peek_long (param_values + 2), data2); } /* VOID:OBJECT,STRING,STRING (eggmarshalers.list:4) */ void _egg_marshal_VOID__OBJECT_STRING_STRING (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data) { typedef void (*GMarshalFunc_VOID__OBJECT_STRING_STRING) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer arg_3, gpointer data2); register GMarshalFunc_VOID__OBJECT_STRING_STRING callback; register GCClosure *cc = (GCClosure*) closure; register gpointer data1, data2; g_return_if_fail (n_param_values == 4); if (G_CCLOSURE_SWAP_DATA (closure)) { data1 = closure->data; data2 = g_value_peek_pointer (param_values + 0); } else { data1 = g_value_peek_pointer (param_values + 0); data2 = closure->data; } callback = (GMarshalFunc_VOID__OBJECT_STRING_STRING) (marshal_data ? marshal_data : cc->callback); callback (data1, g_marshal_value_peek_object (param_values + 1), g_marshal_value_peek_string (param_values + 2), g_marshal_value_peek_string (param_values + 3), data2); } /* VOID:UINT,UINT (eggmarshalers.list:5) */ void _egg_marshal_VOID__UINT_UINT (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data) { typedef void (*GMarshalFunc_VOID__UINT_UINT) (gpointer data1, guint arg_1, guint arg_2, gpointer data2); register GMarshalFunc_VOID__UINT_UINT callback; register GCClosure *cc = (GCClosure*) closure; register gpointer data1, data2; g_return_if_fail (n_param_values == 3); if (G_CCLOSURE_SWAP_DATA (closure)) { data1 = closure->data; data2 = g_value_peek_pointer (param_values + 0); } else { data1 = g_value_peek_pointer (param_values + 0); data2 = closure->data; } callback = (GMarshalFunc_VOID__UINT_UINT) (marshal_data ? marshal_data : cc->callback); callback (data1, g_marshal_value_peek_uint (param_values + 1), g_marshal_value_peek_uint (param_values + 2), data2); } /* BOOLEAN:INT (eggmarshalers.list:6) */ void _egg_marshal_BOOLEAN__INT (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__INT) (gpointer data1, gint arg_1, gpointer data2); register GMarshalFunc_BOOLEAN__INT callback; register GCClosure *cc = (GCClosure*) closure; register gpointer data1, data2; gboolean v_return; g_return_if_fail (return_value != NULL); g_return_if_fail (n_param_values == 2); if (G_CCLOSURE_SWAP_DATA (closure)) { data1 = closure->data; data2 = g_value_peek_pointer (param_values + 0); } else { data1 = g_value_peek_pointer (param_values + 0); data2 = closure->data; } callback = (GMarshalFunc_BOOLEAN__INT) (marshal_data ? marshal_data : cc->callback); v_return = callback (data1, g_marshal_value_peek_int (param_values + 1), data2); g_value_set_boolean (return_value, v_return); } /* BOOLEAN:ENUM (eggmarshalers.list:7) */ void _egg_marshal_BOOLEAN__ENUM (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__ENUM) (gpointer data1, gint arg_1, gpointer data2); register GMarshalFunc_BOOLEAN__ENUM callback; register GCClosure *cc = (GCClosure*) closure; register gpointer data1, data2; gboolean v_return; g_return_if_fail (return_value != NULL); g_return_if_fail (n_param_values == 2); if (G_CCLOSURE_SWAP_DATA (closure)) { data1 = closure->data; data2 = g_value_peek_pointer (param_values + 0); } else { data1 = g_value_peek_pointer (param_values + 0); data2 = closure->data; } callback = (GMarshalFunc_BOOLEAN__ENUM) (marshal_data ? marshal_data : cc->callback); v_return = callback (data1, g_marshal_value_peek_enum (param_values + 1), data2); g_value_set_boolean (return_value, v_return); } /* BOOLEAN:VOID (eggmarshalers.list:8) */ void _egg_marshal_BOOLEAN__VOID (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__VOID) (gpointer data1, gpointer data2); register GMarshalFunc_BOOLEAN__VOID callback; register GCClosure *cc = (GCClosure*) closure; register gpointer data1, data2; gboolean v_return; g_return_if_fail (return_value != NULL); g_return_if_fail (n_param_values == 1); if (G_CCLOSURE_SWAP_DATA (closure)) { data1 = closure->data; data2 = g_value_peek_pointer (param_values + 0); } else { data1 = g_value_peek_pointer (param_values + 0); data2 = closure->data; } callback = (GMarshalFunc_BOOLEAN__VOID) (marshal_data ? marshal_data : cc->callback); v_return = callback (data1, data2); g_value_set_boolean (return_value, v_return); } /* OBJECT:VOID (eggmarshalers.list:9) */ void _egg_marshal_OBJECT__VOID (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data) { typedef GObject* (*GMarshalFunc_OBJECT__VOID) (gpointer data1, gpointer data2); register GMarshalFunc_OBJECT__VOID callback; register GCClosure *cc = (GCClosure*) closure; register gpointer data1, data2; GObject* v_return; g_return_if_fail (return_value != NULL); g_return_if_fail (n_param_values == 1); if (G_CCLOSURE_SWAP_DATA (closure)) { data1 = closure->data; data2 = g_value_peek_pointer (param_values + 0); } else { data1 = g_value_peek_pointer (param_values + 0); data2 = closure->data; } callback = (GMarshalFunc_OBJECT__VOID) (marshal_data ? marshal_data : cc->callback); v_return = callback (data1, data2); g_value_set_object_take_ownership (return_value, v_return); } /* VOID:VOID (eggmarshalers.list:10) */ /* VOID:INT,INT (eggmarshalers.list:11) */ void _egg_marshal_VOID__INT_INT (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data) { typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1, gint arg_1, gint arg_2, gpointer data2); register GMarshalFunc_VOID__INT_INT callback; register GCClosure *cc = (GCClosure*) closure; register gpointer data1, data2; g_return_if_fail (n_param_values == 3); if (G_CCLOSURE_SWAP_DATA (closure)) { data1 = closure->data; data2 = g_value_peek_pointer (param_values + 0); } else { data1 = g_value_peek_pointer (param_values + 0); data2 = closure->data; } callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback); callback (data1, g_marshal_value_peek_int (param_values + 1), g_marshal_value_peek_int (param_values + 2), data2); } /* VOID:UINT,UINT (eggmarshalers.list:12) */ /* VOID:BOOLEAN (eggmarshalers.list:13) */ /* VOID:OBJECT,ENUM,BOXED (eggmarshalers.list:14) */ void _egg_marshal_VOID__OBJECT_ENUM_BOXED (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data) { typedef void (*GMarshalFunc_VOID__OBJECT_ENUM_BOXED) (gpointer data1, gpointer arg_1, gint arg_2, gpointer arg_3, gpointer data2); register GMarshalFunc_VOID__OBJECT_ENUM_BOXED callback; register GCClosure *cc = (GCClosure*) closure; register gpointer data1, data2; g_return_if_fail (n_param_values == 4); if (G_CCLOSURE_SWAP_DATA (closure)) { data1 = closure->data; data2 = g_value_peek_pointer (param_values + 0); } else { data1 = g_value_peek_pointer (param_values + 0); data2 = closure->data; } callback = (GMarshalFunc_VOID__OBJECT_ENUM_BOXED) (marshal_data ? marshal_data : cc->callback); callback (data1, g_marshal_value_peek_object (param_values + 1), g_marshal_value_peek_enum (param_values + 2), g_marshal_value_peek_boxed (param_values + 3), data2); } /* VOID:BOXED (eggmarshalers.list:15) */ /* BOOLEAN:BOOLEAN (eggmarshalers.list:16) */ void _egg_marshal_BOOLEAN__BOOLEAN (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data) { typedef gboolean (*GMarshalFunc_BOOLEAN__BOOLEAN) (gpointer data1, gboolean arg_1, gpointer data2); register GMarshalFunc_BOOLEAN__BOOLEAN callback; register GCClosure *cc = (GCClosure*) closure; register gpointer data1, data2; gboolean v_return; g_return_if_fail (return_value != NULL); g_return_if_fail (n_param_values == 2); if (G_CCLOSURE_SWAP_DATA (closure)) { data1 = closure->data; data2 = g_value_peek_pointer (param_values + 0); } else { data1 = g_value_peek_pointer (param_values + 0); data2 = closure->data; } callback = (GMarshalFunc_BOOLEAN__BOOLEAN) (marshal_data ? marshal_data : cc->callback); v_return = callback (data1, g_marshal_value_peek_boolean (param_values + 1), data2); g_value_set_boolean (return_value, v_return); } --- NEW FILE: eggmarshalers.h --- #ifndef ___egg_marshal_MARSHAL_H__ #define ___egg_marshal_MARSHAL_H__ #include <glib-object.h> G_BEGIN_DECLS /* VOID:OBJECT,OBJECT (eggmarshalers.list:1) */ extern void _egg_marshal_VOID__OBJECT_OBJECT (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); /* VOID:OBJECT,STRING,LONG,LONG (eggmarshalers.list:2) */ extern void _egg_marshal_VOID__OBJECT_STRING_LONG_LONG (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); /* VOID:OBJECT,LONG (eggmarshalers.list:3) */ extern void _egg_marshal_VOID__OBJECT_LONG (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); /* VOID:OBJECT,STRING,STRING (eggmarshalers.list:4) */ extern void _egg_marshal_VOID__OBJECT_STRING_STRING (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); /* VOID:UINT,UINT (eggmarshalers.list:5) */ extern void _egg_marshal_VOID__UINT_UINT (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); /* BOOLEAN:INT (eggmarshalers.list:6) */ extern void _egg_marshal_BOOLEAN__INT (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); /* BOOLEAN:ENUM (eggmarshalers.list:7) */ extern void _egg_marshal_BOOLEAN__ENUM (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); /* BOOLEAN:VOID (eggmarshalers.list:8) */ extern void _egg_marshal_BOOLEAN__VOID (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); /* OBJECT:VOID (eggmarshalers.list:9) */ extern void _egg_marshal_OBJECT__VOID (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); /* VOID:VOID (eggmarshalers.list:10) */ #define _egg_marshal_VOID__VOID g_cclosure_marshal_VOID__VOID /* VOID:INT,INT (eggmarshalers.list:11) */ extern void _egg_marshal_VOID__INT_INT (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); /* VOID:UINT,UINT (eggmarshalers.list:12) */ /* VOID:BOOLEAN (eggmarshalers.list:13) */ #define _egg_marshal_VOID__BOOLEAN g_cclosure_marshal_VOID__BOOLEAN /* VOID:OBJECT,ENUM,BOXED (eggmarshalers.list:14) */ extern void _egg_marshal_VOID__OBJECT_ENUM_BOXED (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); /* VOID:BOXED (eggmarshalers.list:15) */ #define _egg_marshal_VOID__BOXED g_cclosure_marshal_VOID__BOXED /* BOOLEAN:BOOLEAN (eggmarshalers.list:16) */ extern void _egg_marshal_BOOLEAN__BOOLEAN (GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data); G_END_DECLS #endif /* ___egg_marshal_MARSHAL_H__ */ --- NEW FILE: eggmarshalers.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: eggtrayicon.c --- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* eggtrayicon.c * Copyright (C) 2002 Anders Carlsson <and...@gn...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ #include <string.h> #include <gdk/gdkx.h> #include "eggtrayicon.h" #define SYSTEM_TRAY_REQUEST_DOCK 0 #define SYSTEM_TRAY_BEGIN_MESSAGE 1 #define SYSTEM_TRAY_CANCEL_MESSAGE 2 static GtkPlugClass *parent_class = NULL; static void egg_tray_icon_init (EggTrayIcon *icon); static void egg_tray_icon_class_init (EggTrayIconClass *klass); static void egg_tray_icon_unrealize (GtkWidget *widget); static void egg_tray_icon_update_manager_window (EggTrayIcon *icon); GType egg_tray_icon_get_type (void) { static GType our_type = 0; if (our_type == 0) { static const GTypeInfo our_info = { sizeof (EggTrayIconClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) egg_tray_icon_class_init, NULL, /* class_finalize */ NULL, /* class_data */ sizeof (EggTrayIcon), 0, /* n_preallocs */ (GInstanceInitFunc) egg_tray_icon_init }; our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0); } return our_type; } static void egg_tray_icon_init (EggTrayIcon *icon) { icon->stamp = 1; gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK); } static void egg_tray_icon_class_init (EggTrayIconClass *klass) { GtkWidgetClass *widget_class = (GtkWidgetClass *)klass; parent_class = g_type_class_peek_parent (klass); widget_class->unrealize = egg_tray_icon_unrealize; } static GdkFilterReturn egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_data) { EggTrayIcon *icon = user_data; XEvent *xev = (XEvent *)xevent; if (xev->xany.type == ClientMessage && xev->xclient.message_type == icon->manager_atom && xev->xclient.data.l[1] == icon->selection_atom) { egg_tray_icon_update_manager_window (icon); } else if (xev->xany.window == icon->manager_window) { if (xev->xany.type == DestroyNotify) { egg_tray_icon_update_manager_window (icon); } } return GDK_FILTER_CONTINUE; } static void egg_tray_icon_unrealize (GtkWidget *widget) { EggTrayIcon *icon = EGG_TRAY_ICON (widget); GdkWindow *root_window; if (icon->manager_window != None) { GdkWindow *gdkwin; gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget), icon->manager_window); gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon); } root_window = gdk_screen_get_root_window (gtk_widget_get_screen (widget)); gdk_window_remove_filter (root_window, egg_tray_icon_manager_filter, icon); if (GTK_WIDGET_CLASS (parent_class)->unrealize) (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); } static void egg_tray_icon_send_manager_message (EggTrayIcon *icon, long message, Window window, long data1, long data2, long data3) { XClientMessageEvent ev; Display *display; ev.type = ClientMessage; ev.window = window; ev.message_type = icon->system_tray_opcode_atom; ev.format = 32; ev.data.l[0] = gdk_x11_get_server_time (GTK_WIDGET (icon)->window); ev.data.l[1] = message; ev.data.l[2] = data1; ev.data.l[3] = data2; ev.data.l[4] = data3; display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); gdk_error_trap_push (); XSendEvent (display, icon->manager_window, False, NoEventMask, (XEvent *)&ev); XSync (display, False); gdk_error_trap_pop (); } static void egg_tray_icon_send_dock_request (EggTrayIcon *icon) { egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_REQUEST_DOCK, icon->manager_window, gtk_plug_get_id (GTK_PLUG (icon)), 0, 0); } static void egg_tray_icon_update_manager_window (EggTrayIcon *icon) { Display *xdisplay; xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); if (icon->manager_window != None) { GdkWindow *gdkwin; gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)), icon->manager_window); gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon); } XGrabServer (xdisplay); icon->manager_window = XGetSelectionOwner (xdisplay, icon->selection_atom); if (icon->manager_window != None) XSelectInput (xdisplay, icon->manager_window, StructureNotifyMask); XUngrabServer (xdisplay); XFlush (xdisplay); if (icon->manager_window != None) { GdkWindow *gdkwin; gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)), icon->manager_window); gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon); /* Send a request that we'd like to dock */ egg_tray_icon_send_dock_request (icon); } } static EggTrayIcon * egg_tray_icon_new_for_xscreen (Screen *xscreen, const char *name) { EggTrayIcon *icon; char buffer[256]; GdkWindow *root_window; GdkDisplay *display; GdkScreen *screen; g_return_val_if_fail (xscreen != NULL, NULL); icon = g_object_new (EGG_TYPE_TRAY_ICON, NULL); gtk_window_set_title (GTK_WINDOW (icon), name); display = gdk_x11_lookup_xdisplay (DisplayOfScreen (xscreen)); screen = gdk_display_get_screen (display, XScreenNumberOfScreen (xscreen)); gtk_plug_construct_for_display (GTK_PLUG (icon), display, 0); gtk_window_set_screen (GTK_WINDOW (icon), screen); gtk_widget_realize (GTK_WIDGET (icon)); /* Now see if there's a manager window around */ g_snprintf (buffer, sizeof (buffer), "_NET_SYSTEM_TRAY_S%d", XScreenNumberOfScreen (xscreen)); icon->selection_atom = XInternAtom (DisplayOfScreen (xscreen), buffer, False); icon->manager_atom = XInternAtom (DisplayOfScreen (xscreen), "MANAGER", False); icon->system_tray_opcode_atom = XInternAtom (DisplayOfScreen (xscreen), "_NET_SYSTEM_TRAY_OPCODE", False); egg_tray_icon_update_manager_window (icon); root_window = gdk_screen_get_root_window (gtk_widget_get_screen (GTK_WIDGET (icon))); /* Add a root window filter so that we get changes on MANAGER */ gdk_window_add_filter (root_window, egg_tray_icon_manager_filter, icon); return icon; } EggTrayIcon * egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name) { g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); return egg_tray_icon_new_for_xscreen (GDK_SCREEN_XSCREEN (screen), name); } EggTrayIcon* egg_tray_icon_new (const gchar *name) { return egg_tray_icon_new_for_xscreen (DefaultScreenOfDisplay (gdk_display), name); } guint egg_tray_icon_send_message (EggTrayIcon *icon, gint timeout, const gchar *message, gint len) { guint stamp; g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), 0); g_return_val_if_fail (timeout >= 0, 0); g_return_val_if_fail (message != NULL, 0); if (icon->manager_window == None) return 0; if (len < 0) len = strlen (message); stamp = icon->stamp++; /* Get ready to send the message */ egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_BEGIN_MESSAGE, (Window)gtk_plug_get_id (GTK_PLUG (icon)), timeout, len, stamp); /* Now to send the actual message */ gdk_error_trap_push (); while (len > 0) { XClientMessageEvent ev; Display *xdisplay; xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); ev.type = ClientMessage; ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon)); ev.format = 8; ev.message_type = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_MESSAGE_DATA", False); if (len > 20) { memcpy (&ev.data, message, 20); len -= 20; message += 20; } else { memcpy (&ev.data, message, len); len = 0; } XSendEvent (xdisplay, icon->manager_window, False, StructureNotifyMask, (XEvent *)&ev); XSync (xdisplay, False); } gdk_error_trap_pop (); return stamp; } void egg_tray_icon_cancel_message (EggTrayIcon *icon, guint id) { g_return_if_fail (EGG_IS_TRAY_ICON (icon)); g_return_if_fail (id > 0); egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE, (Window)gtk_plug_get_id (GTK_PLUG (icon)), id, 0, 0); } --- NEW FILE: eggtrayicon.h --- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* eggtrayicon.h * Copyright (C) 2002 Anders Carlsson <and...@gn...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ #ifndef __EGG_TRAY_ICON_H__ #define __EGG_TRAY_ICON_H__ #include <gtk/gtkplug.h> #include <gdk/gdkx.h> G_BEGIN_DECLS #define EGG_TYPE_TRAY_ICON (egg_tray_icon_get_type ()) #define EGG_TRAY_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TRAY_ICON, EggTrayIcon)) #define EGG_TRAY_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_TRAY_ICON, EggTrayIconClass)) #define EGG_IS_TRAY_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_TRAY_ICON)) #define EGG_IS_TRAY_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TRAY_ICON)) #define EGG_TRAY_ICON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TRAY_ICON, EggTrayIconClass)) typedef struct _EggTrayIcon EggTrayIcon; typedef struct _EggTrayIconClass EggTrayIconClass; struct _EggTrayIcon { GtkPlug parent_instance; guint stamp; Atom selection_atom; Atom manager_atom; Atom system_tray_opcode_atom; Window manager_window; }; struct _EggTrayIconClass { GtkPlugClass parent_class; }; GType egg_tray_icon_get_type (void); EggTrayIcon *egg_tray_icon_new_for_screen (GdkScreen *screen, const gchar *name); EggTrayIcon *egg_tray_icon_new (const gchar *name); guint egg_tray_icon_send_message (EggTrayIcon *icon, gint timeout, const char *message, gint len); void egg_tray_icon_cancel_message (EggTrayIcon *icon, guint id); G_END_DECLS #endif /* __EGG_TRAY_ICON_H__ */ --- NEW FILE: eggtrayicon.o --- (This appears to be a binary file; contents omitted.) Index: Makefile =================================================================== RCS file: /cvsroot/morphix/mcp/src/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 2 Mar 2004 19:31:47 -0000 1.5 --- Makefile 3 Mar 2004 21:16:43 -0000 1.6 *************** *** 142,146 **** dirtree.c dirtree.h \ iconviewer.c iconviewer.h \ ! interface.c interface.h --- 142,149 ---- dirtree.c dirtree.h \ iconviewer.c iconviewer.h \ ! interface.c interface.h \ ! eggiconlist.c eggiconlist.h \ ! eggintl.h eggmarshalers.c eggmarshalers.h \ ! eggtrayicon.c eggtrayicon.h *************** *** 156,160 **** am_mcp_OBJECTS = main.$(OBJEXT) support.$(OBJEXT) callbacks.$(OBJEXT) \ desktop_file.$(OBJEXT) dirtree.$(OBJEXT) iconviewer.$(OBJEXT) \ ! interface.$(OBJEXT) mcp_OBJECTS = $(am_mcp_OBJECTS) mcp_DEPENDENCIES = --- 159,164 ---- am_mcp_OBJECTS = main.$(OBJEXT) support.$(OBJEXT) callbacks.$(OBJEXT) \ desktop_file.$(OBJEXT) dirtree.$(OBJEXT) iconviewer.$(OBJEXT) \ ! interface.$(OBJEXT) eggiconlist.$(OBJEXT) \ ! eggmarshalers.$(OBJEXT) eggtrayicon.$(OBJEXT) mcp_OBJECTS = $(am_mcp_OBJECTS) mcp_DEPENDENCIES = *************** *** 166,169 **** --- 170,176 ---- DEP_FILES = ./$(DEPDIR)/callbacks.Po \ ./$(DEPDIR)/desktop_file.Po ./$(DEPDIR)/dirtree.Po \ + ./$(DEPDIR)/eggiconlist.Po \ + ./$(DEPDIR)/eggmarshalers.Po \ + ./$(DEPDIR)/eggtrayicon.Po \ ./$(DEPDIR)/iconviewer.Po ./$(DEPDIR)/interface.Po \ ./$(DEPDIR)/main.Po ./$(DEPDIR)/support.Po *************** *** 222,225 **** --- 229,235 ---- include ./$(DEPDIR)/desktop_file.Po include ./$(DEPDIR)/dirtree.Po + include ./$(DEPDIR)/eggiconlist.Po + include ./$(DEPDIR)/eggmarshalers.Po + include ./$(DEPDIR)/eggtrayicon.Po include ./$(DEPDIR)/iconviewer.Po include ./$(DEPDIR)/interface.Po Index: Makefile.am =================================================================== RCS file: /cvsroot/morphix/mcp/src/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.am 2 Mar 2004 17:09:11 -0000 1.4 --- Makefile.am 3 Mar 2004 21:16:43 -0000 1.5 *************** *** 15,19 **** dirtree.c dirtree.h \ iconviewer.c iconviewer.h \ ! interface.c interface.h mcp_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -L/usr/lib -lz -lpthread -lm --- 15,22 ---- dirtree.c dirtree.h \ iconviewer.c iconviewer.h \ ! interface.c interface.h \ ! eggiconlist.c eggiconlist.h \ ! eggintl.h eggmarshalers.c eggmarshalers.h \ ! eggtrayicon.c eggtrayicon.h mcp_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -L/usr/lib -lz -lpthread -lm Index: Makefile.in =================================================================== RCS file: /cvsroot/morphix/mcp/src/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.in 2 Mar 2004 19:31:47 -0000 1.5 --- Makefile.in 3 Mar 2004 21:16:43 -0000 1.6 *************** *** 142,146 **** dirtree.c dirtree.h \ iconviewer.c iconviewer.h \ ! interface.c interface.h --- 142,149 ---- dirtree.c dirtree.h \ iconviewer.c iconviewer.h \ ! interface.c interface.h \ ! eggiconlist.c eggiconlist.h \ ! eggintl.h eggmarshalers.c eggmarshalers.h \ ! eggtrayicon.c eggtrayicon.h *************** *** 156,160 **** am_mcp_OBJECTS = main.$(OBJEXT) support.$(OBJEXT) callbacks.$(OBJEXT) \ desktop_file.$(OBJEXT) dirtree.$(OBJEXT) iconviewer.$(OBJEXT) \ ! interface.$(OBJEXT) mcp_OBJECTS = $(am_mcp_OBJECTS) mcp_DEPENDENCIES = --- 159,164 ---- am_mcp_OBJECTS = main.$(OBJEXT) support.$(OBJEXT) callbacks.$(OBJEXT) \ desktop_file.$(OBJEXT) dirtree.$(OBJEXT) iconviewer.$(OBJEXT) \ ! interface.$(OBJEXT) eggiconlist.$(OBJEXT) \ ! eggmarshalers.$(OBJEXT) eggtrayicon.$(OBJEXT) mcp_OBJECTS = $(am_mcp_OBJECTS) mcp_DEPENDENCIES = *************** *** 166,169 **** --- 170,176 ---- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/callbacks.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/desktop_file.Po ./$(DEPDIR)/dirtree.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/eggiconlist.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/eggmarshalers.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/eggtrayicon.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/iconviewer.Po ./$(DEPDIR)/interface.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/main.Po ./$(DEPDIR)/support.Po *************** *** 222,225 **** --- 229,235 ---- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/desktop_file.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirtree.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eggiconlist.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eggmarshalers.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eggtrayicon.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconviewer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interface.Po@am__quote@ Index: callbacks.c =================================================================== RCS file: /cvsroot/morphix/mcp/src/callbacks.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** callbacks.c 2 Mar 2004 23:41:05 -0000 1.15 --- callbacks.c 3 Mar 2004 21:16:43 -0000 1.16 *************** *** 12,15 **** --- 12,16 ---- // iconviewer component #include "iconviewer.h" + #include "eggiconlist.h" extern GtkWidget *MainWindow; *************** *** 80,88 **** void expand_treeview() { GtkWidget *treeview = lookup_widget(MainWindow,"treeview1"); ! GtkWidget *scrolledwindow = lookup_widget(MainWindow,"scrolledwindow1"); ! GtkWidget *separator = lookup_widget(MainWindow,"vseparator1"); gtk_widget_show(treeview); gtk_widget_show(scrolledwindow); - gtk_widget_show(separator); dirtree_new(treeview,get_panel_path(),FALSE,FALSE,NULL); gtk_widget_set_size_request(treeview,100,100); --- 81,87 ---- void expand_treeview() { GtkWidget *treeview = lookup_widget(MainWindow,"treeview1"); ! GtkWidget *scrolledwindow = lookup_widget(MainWindow,"scrolledwindow3"); gtk_widget_show(treeview); gtk_widget_show(scrolledwindow); dirtree_new(treeview,get_panel_path(),FALSE,FALSE,NULL); gtk_widget_set_size_request(treeview,100,100); *************** *** 91,98 **** void hide_treeview() { ! GtkWidget *treeview = lookup_widget(MainWindow,"scrolledwindow1"); ! GtkWidget *separator = lookup_widget(MainWindow,"vseparator1"); gtk_widget_hide(treeview); - gtk_widget_hide(separator); } --- 90,95 ---- void hide_treeview() { ! GtkWidget *treeview = lookup_widget(MainWindow,"scrolledwindow3"); gtk_widget_hide(treeview); } *************** *** 103,173 **** gpointer user_data) { GtkWidget *da = lookup_widget(MainWindow,"MainDrawingArea"); ! if (iv_add(get_panel_path(),da)) { // directory items found, expand treeview ! expand_treeview(); ! iv_redraw(da); } else { // don't use treeview, hide widgets - hide_treeview(); - } - } - - - gboolean - on_MainDrawingArea_button_press_event (GtkWidget *widget, - GdkEventButton *event, - gpointer user_data) - { - iv_button_press_callback(widget,event,user_data); - iv_redraw(widget); - return FALSE; - } - ! gboolean ! on_MainDrawingArea_expose_event (GtkWidget *widget, ! GdkEventExpose *event, ! gpointer user_data) ! { ! guchar *pixels; ! int rowstride; ! int width, height; ! gtk_window_get_size(GTK_WINDOW(MainWindow),&width,&height); ! GdkPixbuf *image = iv_get_image(); ! if (image == NULL) ! return FALSE; ! ! rowstride = gdk_pixbuf_get_rowstride(image); ! pixels = gdk_pixbuf_get_pixels (image) + rowstride * event->area.y + ! event->area.x * 3; ! gdk_draw_rgb_image_dithalign (widget->window, ! widget->style->black_gc, ! event->area.x, event->area.y, ! event->area.width, event->area.height, ! GDK_RGB_DITHER_NORMAL,pixels,rowstride,0,0); ! ! return FALSE; } gboolean - on_MainDrawingArea_key_press_event (GtkWidget *widget, - GdkEventKey *event, - gpointer user_data) {} - - - gboolean on_MainWindow_configure_event (GtkWidget *widget, GdkEventConfigure *event, gpointer user_data) { ! /* printf("Configure event! old_width: %d old_height: %d new_width: %d new height: %d\n", ! iv_get_width(),iv_get_height(),event->width,event->height); */ ! if (event->width != iv_get_width() || event->height != iv_get_height()) { ! GtkWidget *da = lookup_widget(MainWindow,"MainDrawingArea"); ! /* printf("Redrawing iconviewer after configure event\n"); */ ! iv_redraw(da); ! } return FALSE; } --- 100,132 ---- gpointer user_data) { + gboolean expand = FALSE; GtkWidget *da = lookup_widget(MainWindow,"MainDrawingArea"); ! GtkWidget *scrolledwindow = lookup_widget(MainWindow,"scrolledwindow2"); ! ! GtkWidget *iconviewer = egg_icon_list_new(); ! if (iv_add(get_panel_path(),iconviewer)) { // directory items found, expand treeview ! expand = TRUE; } else { // don't use treeview, hide widgets ! } ! g_signal_connect(iconviewer,"item_activated",G_CALLBACK(item_activated_cb), NULL); ! gtk_container_add(GTK_CONTAINER(scrolledwindow),iconviewer); ! gtk_widget_show(scrolledwindow); ! gtk_widget_show(iconviewer); ! if (expand) ! expand_treeview(); ! else ! hide_treeview(); } gboolean on_MainWindow_configure_event (GtkWidget *widget, GdkEventConfigure *event, gpointer user_data) { ! return FALSE; } Index: iconviewer.c =================================================================== RCS file: /cvsroot/morphix/mcp/src/iconviewer.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** iconviewer.c 2 Mar 2004 23:41:05 -0000 1.7 --- iconviewer.c 3 Mar 2004 21:16:44 -0000 1.8 *************** *** 6,9 **** --- 6,10 ---- // .desktop files handling #include "desktop_file.h" + #include "eggiconlist.h" #include <stdio.h> #include <string.h> *************** *** 261,369 **** /* - redraw the icons on the drawingarea - this could use a diagram to clear it up :) - */ - void iv_redraw(GtkWidget *da) { - - int nr_x = 0; - int nr_y = 0; - int i, width, height; - - PangoContext *context; - PangoLayout *layout; - PangoFontDescription *fontd; - PangoAttrList *attrlist; - - GdkColor colorfg, colorbg; - GdkPixmap *pixmap; - - colorfg.red = 0; - colorfg.green = 0; - colorfg.blue = 0; - colorbg.red = 65535; - colorbg.green = 65535; - colorbg.blue = 65535; - - attrlist = pango_attr_list_new(); - /* Thanks to chen shengqi for noting this in gtk-app-devel */ - context = gtk_widget_get_pango_context(da); - fontd = pango_font_description_from_string("8"); - gdk_drawable_get_size(da->window,&width,&height)... [truncated message content] |
|
From: <ale...@us...> - 2004-03-03 00:01:53
|
Update of /cvsroot/morphix/mcp/data/main-mcp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2789 Added Files: .directory Log Message: oh, here's a .directory file for testing. gnight! :D --- NEW FILE: .directory --- [Desktop Entry] Name=Morphix Control Panel Comment=Morphix menu Exec=cd ../ Icon=/usr/share/mcp/pixmaps/mcp.png Type=Directory |
|
From: <ale...@us...> - 2004-03-03 00:01:07
|
Update of /cvsroot/morphix/mcp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1638 Modified Files: Makefile Makefile.in aclocal.m4 config.log config.status configure mcp.glade Log Message: added treeview (nearly forgot about dirtree, thanks Tiago! =) treeview only expands when there are subdirectories with .directory entries. However, if treeview expands other directories will also be shown. But this is for another day... Icons are automatically resized, selection-blue-stuff-size depends on the size of the text, iconviewer is now dependant on it's Drawingarea size instead of the MainWindow size... Yeah, it's late and this cvs log is way too long. But MCP is looking fine! Honest! Just don't look at the code! =) PS. resizing still isn't enabled. Maybe division between tree and iconviewer should be moveable? Bah, sleep... Index: Makefile =================================================================== RCS file: /cvsroot/morphix/mcp/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 5 Sep 2003 12:16:14 -0000 1.2 --- Makefile 2 Mar 2004 23:41:05 -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)/mcp pkglibdir = $(libdir)/mcp pkgincludedir = $(includedir)/mcp - 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)/mcp pkglibdir = $(libdir)/mcp pkgincludedir = $(includedir)/mcp 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 = mcp GMOFILES = GMSGFMT = /usr/bin/msgfmt ! HAVE_LIB = @HAVE_LIB@ INSTOBJEXT = .mo INTLLIBS = ! LIB = @LIB@ ! LTLIB = @LTLIB@ MAINT = MAKEINFO = makeinfo MKINSTALLDIRS = ./mkinstalldirs PACKAGE = mcp 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 = aclocal-1.7 ! AMDEP_FALSE = # ! AMDEP_TRUE = ! AMTAR = tar ! AUTOCONF = autoconf ! AUTOHEADER = autoheader ! AUTOMAKE = 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 = mcp 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 = makeinfo MKINSTALLDIRS = ./mkinstalldirs + MSGFMT = /usr/bin/msgfmt + OBJEXT = o PACKAGE = mcp + 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.1 SUBDIRS = src po ! EXTRA_DIST = autogen.sh mcp.glade mcp.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.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 = /root/morphix/mcp/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 \ ! mcp.glade \ ! mcp.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/mcp/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 5 Sep 2003 12:16:14 -0000 1.2 --- Makefile.in 2 Mar 2004 23:41:05 -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,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 mcp.glade mcp.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 \ ! mcp.glade \ ! mcp.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/mcp/aclocal.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** aclocal.m4 5 Sep 2003 12:16:14 -0000 1.2 --- aclocal.m4 2 Mar 2004 23:41:05 -0000 1.3 *************** *** 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 *************** *** 1123,1126 **** --- 1032,1037 ---- ]) + AU_DEFUN([fp_PROG_CC_STDC], [AM_PROG_CC_STDC]) + dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) Index: config.log =================================================================== RCS file: /cvsroot/morphix/mcp/config.log,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** config.log 2 Mar 2004 17:09:10 -0000 1.3 --- config.log 2 Mar 2004 23:41:05 -0000 1.4 *************** *** 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 line was $ ./configure --enable-maintainer-mode *************** *** 11,19 **** ## --------- ## ! hostname = morpheus uname -m = i686 ! uname -r = 2.4.21-4-686 uname -s = Linux ! uname -v = #1 Sat Aug 2 23:27:25 EST 2003 /usr/bin/uname -p = unknown --- 11,19 ---- ## --------- ## ! hostname = myBox uname -m = i686 ! uname -r = 2.4.25-lck1 uname -s = Linux ! uname -v = #2 SMP Thu Feb 26 01:13:45 CET 2004 /usr/bin/uname -p = unknown *************** *** 28,36 **** /bin/universe = unknown ! PATH: /usr/local/bin ! PATH: /usr/bin PATH: /bin PATH: /usr/bin/X11 ! PATH: /usr/games --- 28,38 ---- /bin/universe = unknown ! PATH: /sbin PATH: /bin + PATH: /usr/sbin + PATH: /usr/bin PATH: /usr/bin/X11 ! PATH: /usr/local/sbin ! PATH: /usr/local/bin *************** *** 39,130 **** ## ----------- ## ! configure:1303: checking for a BSD-compatible install ! configure:1357: result: /usr/bin/install -c ! configure:1368: checking whether build environment is sane ! configure:1411: result: yes ! configure:1426: checking whether make sets $(MAKE) ! configure:1446: result: yes ! configure:1478: checking for working aclocal-1.4 ! configure:1485: result: found ! configure:1493: checking for working autoconf ! conf... [truncated message content] |
|
From: <ale...@us...> - 2004-03-03 00:01:06
|
Update of /cvsroot/morphix/mcp/autom4te.cache In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1638/autom4te.cache Modified Files: output.0 requests traces.0 Log Message: added treeview (nearly forgot about dirtree, thanks Tiago! =) treeview only expands when there are subdirectories with .directory entries. However, if treeview expands other directories will also be shown. But this is for another day... Icons are automatically resized, selection-blue-stuff-size depends on the size of the text, iconviewer is now dependant on it's Drawingarea size instead of the MainWindow size... Yeah, it's late and this cvs log is way too long. But MCP is looking fine! Honest! Just don't look at the code! =) PS. resizing still isn't enabled. Maybe division between tree and iconviewer should be moveable? Bah, sleep... Index: output.0 =================================================================== RCS file: /cvsroot/morphix/mcp/autom4te.cache/output.0,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** output.0 2 Mar 2004 17:09:10 -0000 1.3 --- output.0 2 Mar 2004 23:41:05 -0000 1.4 *************** *** 310,314 **** #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP PKG_CONFIG PACKAGE_CFLAGS PACKAGE_LIBS GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS LIB@&t@OBJS LTLIBOBJS' ac_subst_files='' --- 310,314 ---- #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP PKG_CONFIG PACKAGE_CFLAGS PACKAGE_LIBS GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS LIB@&t@OBJS LTLIBOBJS' ac_subst_files='' *************** *** 848,851 **** --- 848,853 ---- --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer + --disable-dependency-tracking Speeds up one-time builds + --enable-dependency-tracking Do not reject slow dependency extractors Some influential environment variables: *************** *** 1296,1300 **** ! am__api_version="1.4" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do --- 1298,1302 ---- ! am__api_version="1.7" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do *************** *** 1405,1409 **** # Just in case sleep 1 ! echo timestamp > conftestfile # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a --- 1407,1411 ---- # Just in case sleep 1 ! echo timestamp > conftest.file # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a *************** *** 1412,1422 **** # directory). if ( ! set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` if test "$*" = "X"; then # -L didn't work. ! set X `ls -t $srcdir/configure conftestfile` fi ! if test "$*" != "X $srcdir/configure conftestfile" \ ! && test "$*" != "X conftestfile $srcdir/configure"; then # If neither matched, then we have a broken ls. This can happen --- 1414,1425 ---- # directory). if ( ! set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` if test "$*" = "X"; then # -L didn't work. ! set X `ls -t $srcdir/configure conftest.file` fi ! rm -f conftest.file ! if test "$*" != "X $srcdir/configure conftest.file" \ ! && test "$*" != "X conftest.file $srcdir/configure"; then # If neither matched, then we have a broken ls. This can happen *************** *** 1431,1435 **** fi ! test "$2" = conftestfile ) then --- 1434,1438 ---- fi ! test "$2" = conftest.file ) then *************** *** 1443,1447 **** { (exit 1); exit 1; }; } fi - rm -f conftest* echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 --- 1446,1449 ---- *************** *** 1459,1462 **** --- 1461,1518 ---- rm conftest.sed + + # expand $ac_aux_dir to an absolute path + am_aux_dir=`cd $ac_aux_dir && pwd` + + test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" + # Use eval to expand $SHELL + if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " + else + am_missing_run= + { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 + echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + + for ac_prog in gawk mawk nawk awk + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AWK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + fi + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then + echo "$as_me:$LINENO: result: $AWK" >&5 + echo "${ECHO_T}$AWK" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + test -n "$AWK" && break + done + echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 *************** *** 1488,1497 **** fi ! PACKAGE=mcp ! ! VERSION=0.1 ! ! if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} --- 1544,1559 ---- fi + rm -rf .tst 2>/dev/null + mkdir .tst 2>/dev/null + if test -d .tst; then + am__leading_dot=. + else + am__leading_dot=_ + fi + rmdir .tst 2>/dev/null ! # test to see if srcdir already configured ! if test "`cd $srcdir && pwd`" != "`pwd`" && ! test -f $srcdir/config.status; then { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} *************** *** 1499,1594 **** fi cat >>confdefs.h <<_ACEOF @%:@define PACKAGE "$PACKAGE" _ACEOF ! cat >>confdefs.h <<_ACEOF @%:@define VERSION "$VERSION" _ACEOF ! missing_dir=`cd $ac_aux_dir && pwd` ! echo "$as_me:$LINENO: checking for working aclocal-${am__api_version}" >&5 ! echo $ECHO_N "checking for working aclocal-${am__api_version}... $ECHO_C" >&6 ! # Run test in a subshell; some versions of sh will print an error if ! # an executable is not found, even if stderr is redirected. ! # Redirect stdin to placate older versions of autoconf. Sigh. ! if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then ! ACLOCAL=aclocal-${am__api_version} ! echo "$as_me:$LINENO: result: found" >&5 ! echo "${ECHO_T}found" >&6 else ! ACLOCAL="$missing_dir/missing aclocal-${am__api_version}" ! echo "$as_me:$LINENO: result: missing" >&5 ! echo "${ECHO_T}missing" >&6 ! fi ! echo "$as_me:$LINENO: checking for working autoconf" >&5 ! echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6 ! # Run test in a subshell; some versions of sh will print an error if ! # an executable is not found, even if stderr is redirected. ! # Redirect stdin to placate older versions of autoconf. Sigh. ! if (autoconf --version) < /dev/null > /dev/null 2>&1; then ! AUTOCONF=autoconf ! echo "$as_me:$LINENO: result: found" >&5 ! echo "${ECHO_T}found" >&6 else ! AUTOCONF="$missing_dir/missing autoconf" ! echo "$as_me:$LINENO: result: missing" >&5 ! echo "${ECHO_T}missing" >&6 fi - echo "$as_me:$LINENO: checking for working automake-${am__api_version}" >&5 - echo $ECHO_N "checking for working automake-${am__api_version}... $ECHO_C" >&6 - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. - if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-${am__api_version} - echo "$as_me:$LINENO: result: found" >&5 - echo "${ECHO_T}found" >&6 - else - AUTOMAKE="$missing_dir/missing automake-${am__api_version}" - echo "$as_me:$LINENO: result: missing" >&5 - echo "${ECHO_T}missing" >&6 fi ! echo "$as_me:$LINENO: checking for working autoheader" >&5 ! echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6 ! # Run test in a subshell; some versions of sh will print an error if ! # an executable is not found, even if stderr is redirected. ! # Redirect stdin to placate older versions of autoconf. Sigh. ! if (autoheader --version) < /dev/null > /dev/null 2>&1; then ! AUTOHEADER=autoheader ! echo "$as_me:$LINENO: result: found" >&5 ! echo "${ECHO_T}found" >&6 else ! AUTOHEADER="$missing_dir/missing autoheader" ! echo "$as_me:$LINENO: result: missing" >&5 ! echo "${ECHO_T}missing" >&6 fi ! echo "$as_me:$LINENO: checking for working makeinfo" >&5 ! echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6 ! # Run test in a subshell; some versions of sh will print an error if ! # an executable is not found, even if stderr is redirected. ! # Redirect stdin to placate older versions of autoconf. Sigh. ! if (makeinfo --version) < /dev/null > /dev/null 2>&1; then ! MAKEINFO=makeinfo ! echo "$as_me:$LINENO: result: found" >&5 ! echo "${ECHO_T}found" >&6 else ! MAKEINFO="$missing_dir/missing makeinfo" ! echo "$as_me:$LINENO: result: missing" >&5 ! echo "${ECHO_T}missing" >&6 fi - ac_config_headers="$ac_config_headers config.h" ! ac_config_commands="$ac_config_commands default-1" echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 --- 1561,1703 ---- fi + # test whether we have cygpath + if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi + fi + + + # Define the identity of the package. + PACKAGE=mcp + VERSION=0.1 + + cat >>confdefs.h <<_ACEOF @%:@define PACKAGE "$PACKAGE" _ACEOF ! cat >>confdefs.h <<_ACEOF @%:@define VERSION "$VERSION" _ACEOF + # Some tools Automake needs. + ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} ! ! AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} ! ! ! AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} ! ! ! AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} ! ! ! MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} ! ! ! AMTAR=${AMTAR-"${am_missing_run}tar"} ! ! install_sh=${install_sh-"$am_aux_dir/install-sh"} ! ! # Installed binaries are usually stripped using `strip' when the user ! # run `make install-strip'. However `strip' might not be the right ! # tool to use in cross-compilation environments, therefore Automake ! # will honor the `STRIP' environment variable to overrule this program. ! if test "$cross_compiling" != no; then ! if test -n "$ac_tool_prefix"; then ! # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. ! set dummy ${ac_tool_prefix}strip; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 ! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_prog_STRIP+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 else ! if test -n "$STRIP"; then ! ac_cv_prog_STRIP="$STRIP" # Let the user override the test. ! else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_STRIP="${ac_tool_prefix}strip" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done ! done ! fi ! fi ! STRIP=$ac_cv_prog_STRIP ! if test -n "$STRIP"; then ! echo "$as_me:$LINENO: result: $STRIP" >&5 ! echo "${ECHO_T}$STRIP" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 fi fi + if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done ! test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" ! fi ! fi ! ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP ! if test -n "$ac_ct_STRIP"; then ! echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ! echo "${ECHO_T}$ac_ct_STRIP" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 fi ! STRIP=$ac_ct_STRIP else ! STRIP="$ac_cv_prog_STRIP" fi + fi + INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. ! ! ac_config_headers="$ac_config_headers config.h" echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 *************** *** 1612,1619 **** --- 1721,1794 ---- MAINTAINER_MODE_FALSE= fi + MAINT=$MAINTAINER_MODE_TRUE + DEPDIR="${am__leading_dot}deps" + + ac_config_commands="$ac_config_commands depfiles" + + + am_make=${MAKE-make} + cat > confinc << 'END' + am__doit: + @echo done + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. + echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 + echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 + am__include="#" + am__quote= + _am_result=none + # First try GNU make style include. + echo "include confinc" > confmf + # We grep out `Entering directory' and `Leaving directory' + # messages which can occur if `w' ends up in MAKEFLAGS. + # In particular we don't look at `^make:' because GNU make might + # be invoked under some other name (usually "gmake"), in which + # case it prints its new name instead of `make'. + if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU + fi + # Now try BSD make style include. + if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi + fi + + + echo "$as_me:$LINENO: result: $_am_result" >&5 + echo "${ECHO_T}$_am_result" >&6 + rm -f confinc confmf + + # Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. + if test "${enable_dependency_tracking+set}" = set; then + enableval="$enable_dependency_tracking" + + fi; + if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + fi + + + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' + else + AMDEP_TRUE='#' + AMDEP_FALSE= + fi + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' *************** *** 2540,2543 **** --- 2715,2820 ---- ac_compiler_gnu=$ac_cv_c_compiler_gnu + depcc="$CC" am_compiler_list= + + echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 + echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 + if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + : > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # (even with -Werror). So we grep stderr for any message + # that says an option was ignored. + if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir + else + am_cv_CC_dependencies_compiler_type=none + fi + + fi + echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 + echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' + else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= + fi + + *************** *** 3334,3337 **** --- 3611,3716 ---- ac_compiler_gnu=$ac_cv_c_compiler_gnu + depcc="$CC" am_compiler_list= + + echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 + echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 + if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + : > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # (even with -Werror). So we grep stderr for any message + # that says an option was ignored. + if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir + else + am_cv_CC_dependencies_compiler_type=none + fi + + fi + echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 + echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' + else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= + fi + + *************** *** 3348,3354 **** # AIX -qlanglvl=ansi # Ultrix and OSF/1 -std1 ! # HP-UX -Aa -D_HPUX_SOURCE # SVR4 -Xc -D__EXTENSIONS__ ! for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" --- 3727,3734 ---- # AIX -qlanglvl=ansi # Ultrix and OSF/1 -std1 ! # HP-UX 10.20 and later -Ae ! # HP-UX older versions -Aa -D_HPUX_SOURCE # SVR4 -Xc -D__EXTENSIONS__ ! for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" *************** *** 5317,5321 **** POSUB=po ! ac_config_commands="$ac_config_commands default-2" --- 5697,5701 ---- POSUB=po ! ac_config_commands="$ac_config_commands default-1" *************** *** 5491,5494 **** --- 5871,5902 ---- + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"AMDEP\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi : ${CONFIG_STATUS=./config.status} *************** *** 5924,5928 **** # ! --- 6332,6336 ---- # ! AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" *************** *** 5939,5944 **** "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 --- 6347,6352 ---- "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; + "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 *************** *** 6030,6033 **** --- 6438,6442 ---- s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t + s,@CYGPATH_W@,$CYGPATH_W,;t t s,@PACKAGE@,$PACKAGE,;t t s,@VERSION@,$VERSION,;t t *************** *** 6037,6041 **** --- 6446,6457 ---- s,@AUTOHEADER@,$AUTOHEADER,;t t s,@MAKEINFO@,$MAKEINFO,;t t + s,@AMTAR@,$AMTAR,;t t + s,@install_sh@,$install_sh,;t t + s,@STRIP@,$STRIP,;t t + s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t + s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t + s,@AWK@,$AWK,;t t s,@SET_MAKE@,$SET_MAKE,;t t + s,@am__leading_dot@,$am__leading_dot,;t t s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t *************** *** 6048,6051 **** --- 6464,6476 ---- s,@EXEEXT@,$EXEEXT,;t t s,@OBJEXT@,$OBJEXT,;t t + s,@DEPDIR@,$DEPDIR,;t t + s,@am__include@,$am__include,;t t + s,@am__quote@,$am__quote,;t t + s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t + s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t + s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t + s,@CCDEPMODE@,$CCDEPMODE,;t t + s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t + s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t s,@CPP@,$CPP,;t t s,@EGREP@,$EGREP,;t t *************** *** 6530,6533 **** --- 6955,6980 ---- rm -f $tmp/config.h fi + # Compute $ac_file's index in $config_headers. + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in + $ac_file | $ac_file:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done + echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || + $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X$ac_file : 'X\(//\)[^/]' \| \ + X$ac_file : 'X\(//\)$' \| \ + X$ac_file : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || + echo X$ac_file | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'`/stamp-h$_am_stamp_count done _ACEOF *************** *** 6646,6651 **** echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in ! default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;; ! default-2 ) case "$CONFIG_FILES" in *po/Makefile.in*) sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile esac ;; --- 7093,7188 ---- echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in ! depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do ! # Strip MF so we end up with the name of the file. ! mf=`echo "$mf" | sed -e 's/:.*$//'` ! # Check whether this is an Automake generated Makefile or not. ! # We used to match only the files named `Makefile.in', but ! # some people rename them; so instead we look at the file content. ! # Grep'ing the first line is not enough: some people post-process ! # each Makefile.in and add a new line on top of each file to say so. ! # So let's grep whole file. ! if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ! dirpart=`(dirname "$mf") 2>/dev/null || ! $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$mf" : 'X\(//\)[^/]' \| \ ! X"$mf" : 'X\(//\)$' \| \ ! X"$mf" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || ! echo X"$mf" | ! sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ! /^X\(\/\/\)[^/].*/{ s//\1/; q; } ! /^X\(\/\/\)$/{ s//\1/; q; } ! /^X\(\/\).*/{ s//\1/; q; } ! s/.*/./; q'` ! else ! continue ! fi ! grep '^DEP_FILES *= *[^ @%:@]' < "$mf" > /dev/null || continue ! # Extract the definition of DEP_FILES from the Makefile without ! # running `make'. ! DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` ! test -z "$DEPDIR" && continue ! # When using ansi2knr, U may be empty or an underscore; expand it ! U=`sed -n -e '/^U = / s///p' < "$mf"` ! test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" ! # We invoke sed twice because it is the simplest approach to ! # changing $(DEPDIR) to its actual value in the expansion. ! for file in `sed -n -e ' ! /^DEP_FILES = .*\\\\$/ { ! s/^DEP_FILES = // ! :loop ! s/\\\\$// ! p ! n ! /\\\\$/ b loop ! p ! } ! /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ ! sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ! # Make sure the directory exists. ! test -f "$dirpart/$file" && continue ! fdir=`(dirname "$file") 2>/dev/null || ! $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$file" : 'X\(//\)[^/]' \| \ ! X"$file" : 'X\(//\)$' \| \ ! X"$file" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || ! echo X"$file" | ! sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ! /^X\(\/\/\)[^/].*/{ s//\1/; q; } ! /^X\(\/\/\)$/{ s//\1/; q; } ! /^X\(\/\).*/{ s//\1/; q; } ! s/.*/./; q'` ! { if $as_mkdir_p; then ! mkdir -p $dirpart/$fdir ! else ! as_dir=$dirpart/$fdir ! as_dirs= ! while test ! -d "$as_dir"; do ! as_dirs="$as_dir $as_dirs" ! as_dir=`(dirname "$as_dir") 2>/dev/null || ! $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$as_dir" : 'X\(//\)[^/]' \| \ ! X"$as_dir" : 'X\(//\)$' \| \ ! X"$as_dir" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || ! 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/mcp/autom4te.cache/requests,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** requests 2 Mar 2004 17:09:10 -0000 1.2 --- requests 2 Mar 2004 23:41:05 -0000 1.3 *************** *** 85,88 **** --- 85,89 ---- 'AC_C_INLINE' => 1, 'AC_PROG_CPP' => 1, + 'AM_ENABLE_MULTILIB' => 1, 'AC_TYPE_PID_T' => 1, 'AC_C_CONST' => 1, Index: traces.0 =================================================================== RCS file: /cvsroot/morphix/mcp/autom4te.cache/traces.0,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** traces.0 2 Mar 2004 17:09:10 -0000 1.2 --- traces.0 2 Mar 2004 23:41:05 -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]_]) *************** *** 53,68 **** m4trace:configure.in:3: -1- AC_SUBST([LIBS]) m4trace:configure.in:4: -1- AM_INIT_AUTOMAKE([mcp], [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([mcp], [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], [mcp]) ! 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,86 **** m4trace:configure.in:4: -1- AC_SUBST([AUTOHEADER]) m4trace:configure.in:4: -1- AC_SUBST([MAKEINFO]) m4trace:configure.in:4: -1- AC_PROG_MAKE_SET m4trace:configure.in:4: -1- AC_SUBST([SET_MAKE]) ! m4trace:configure.in:5: -1- AC_CONFIG_HEADERS([config.h]) ! m4trace:configure.in:5: -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:975: AM_CONFIG_HEADER is expanded from... ! configure.in:5: the top level]) ! m4trace:configure.in:5: -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:975: AM_CONFIG_HEADER is expanded from... configure.in:5: the top level]) m4trace:configure.in:6: -1- AM_MAINTAINER_MODE m4trace:configure.in:6: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) --- 73,90 ---- 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 m4trace:configure.in:6: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) *************** *** 103,106 **** --- 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]) *************** *** 115,122 **** m4trace:configure.in:9: -1- AC_SUBST([CC]) m4trace:configure.in:9: -1- AC_SUBST([ac_ct_CC]) 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:1123: AM_PROG_CC_STDC is expanded from... configure.in:10: the top level]) m4trace:configure.in:11: -1- AC_HEADER_STDC --- 132,145 ---- 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 *************** *** 163,169 **** autoconf/general.m4:1799: AC_CACHE_VAL is expanded from... autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... ! aclocal.m4:1238: GLIB_LC_MESSAGES is expanded from... ! aclocal.m4:1533: GLIB_GNU_GETTEXT is expanded from... ! aclocal.m4:1562: 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]) --- 186,192 ---- 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]) *************** *** 176,182 **** autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from... autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from... ! aclocal.m4:1450: GLIB_WITH_NLS is expanded from... ! aclocal.m4:1533: GLIB_GNU_GETTEXT is expanded from... ! aclocal.m4:1562: AM_GLIB_GNU_GETTEXT is expanded from... configure.in:24: the top level]) m4trace:configure.in:24: -1- AC_CHECK_FUNCS([bind_textdomain_codeset]) --- 199,205 ---- 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]) *************** *** 203,209 **** 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:1450: GLIB_WITH_NLS is expanded from... ! aclocal.m4:1533: GLIB_GNU_GETTEXT is expanded from... ! aclocal.m4:1562: AM_GLIB_GNU_GETTEXT is expanded from... configure.in:24: the top level]) m4trace:configure.in:24: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_NLS]) --- 226,232 ---- 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]) *************** *** 212,218 **** 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:1450: GLIB_WITH_NLS is expanded from... ! aclocal.m4:1533: GLIB_GNU_GETTEXT is expanded from... ! aclocal.m4:1562: AM_GLIB_GNU_GETTEXT is expanded from... configure.in:24: the top level]) m4trace:configure.in:24: -1- AC_SUBST([CATALOGS]) --- 235,248 ---- 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]) |
1 message has been excluded from this view by a project administrator.
