vte r2209 - in trunk: . src
- From: behdad svn gnome org
- To: svn-commits-list gnome org
- Subject: vte r2209 - in trunk: . src
- Date: Thu, 27 Nov 2008 23:41:26 +0000 (UTC)
Author: behdad
Date: Thu Nov 27 23:41:26 2008
New Revision: 2209
URL: http://svn.gnome.org/viewvc/vte?rev=2209&view=rev
Log:
2008-11-27 Behdad Esfahbod <behdad gnome org>
* src/Makefile.am:
Run some of the utilities in "make check", and build the others.
* src/nativeecho.c:
* src/utf8echo.c:
Remove more useless trivial utilities.
Removed:
trunk/src/nativeecho.c
trunk/src/utf8echo.c
Modified:
trunk/ChangeLog
trunk/src/Makefile.am
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Thu Nov 27 23:41:26 2008
@@ -4,17 +4,16 @@
lib_LTLIBRARIES = libvte.la
-pkglib_PROGRAMS = interpret utf8echo nativeecho slowcat
-
+pkglib_PROGRAMS = interpret slowcat
pkglib_SCRIPTS = decset osc window
-EXTRA_PROGRAMS = buffer dumpkeys iso2022 pty reaper reflect-text-view reflect-vte ring mev ssfe table trie xticker vteconv vtetc
+check_PROGRAMS = buffer dumpkeys iso2022 pty reaper reflect-text-view reflect-vte ring mev ssfe table trie xticker vteconv vtetc
+TESTS = buffer ring table trie
+
EXTRA_DIST = \
$(pkglib_SCRIPTS) \
vteseq-2.gperf \
vteseq-n.gperf \
- vteseq-2.c \
- vteseq-n.c \
vtetypebuiltins.c.template \
vtetypebuiltins.h.template \
genkeysyms.py \
@@ -28,7 +27,8 @@
unitable.JIS0201 \
unitable.JIS0208 \
unitable.JIS0212 \
- unitable.KSX1001
+ unitable.KSX1001 \
+ $(NULL)
gperf: vteseq-2.gperf vteseq-n.gperf
gperf vteseq-2.gperf -m 100 --no-strlen > vteseq-2.c
@@ -37,7 +37,11 @@
#vteseq-2.c vteseq-n.c: gperf
-EXTRA_libvte_la_SOURCES = keysyms.c
+EXTRA_libvte_la_SOURCES = \
+ keysyms.c \
+ vteseq-2.c \
+ vteseq-n.c \
+ $(NULL)
libvte_la_SOURCES = \
buffer.c \
@@ -92,6 +96,7 @@
vtetypebuiltins.c \
vtetypebuiltins.h \
vteversion.h
+ $(NULL)
libvte_la_CPPFLAGS = \
-DG_DISABLE_ASSERT \
@@ -195,47 +200,11 @@
iso2022_CFLAGS = $(GTK_CFLAGS)
iso2022_LDADD = $(GTK_LIBS)
-utf8echo_SOURCES = \
- buffer.c \
- buffer.h \
- caps.c \
- caps.h \
- debug.c \
- debug.h \
- matcher.c \
- matcher.h \
- table.c \
- table.h \
- trie.c \
- trie.h \
- utf8echo.c \
- vteconv.c \
- vteconv.h \
- vtetc.c \
- vtetc.h
-utf8echo_CPPFLAGS = -DUTF8ECHO_MAIN
-utf8echo_CFLAGS = $(GOBJECT_CFLAGS)
-utf8echo_LDADD = $(GOBJECT_LIBS)
-
-nativeecho_SOURCES = \
- nativeecho.c
-nativeecho_CPPFLAGS = -DNATIVEECHO_MAIN
-nativeecho_CFLAGS = $(GLIB_CFLAGS)
-nativeecho_LDADD = $(GLIB_LIBS)
-
-ring_SOURCES = \
- debug.c \
- debug.h \
- ring.c \
- ring.h
+ring_SOURCES = ring.c ring.h debug.c debug.h
ring_CPPFLAGS = -DRING_MAIN
-ring_CFLAGS = $(GLIB_CFLAGS)
-ring_LDADD = $(GLIB_LIBS)
slowcat_SOURCES = \
slowcat.c
-slowcat_CFLAGS = $(GLIB_CFLAGS)
-slowcat_LDADD = $(GLIB_LIBS)
table_SOURCES = \
buffer.c \
@@ -255,10 +224,10 @@
vtetc.c \
vtetc.h
table_CPPFLAGS = -DTABLE_MAIN
-table_CFLAGS = $(GOBJECT_CFLAGS)
-table_LDADD = $(GOBJECT_LIBS)
trie_SOURCES = \
+ trie.c \
+ trie.h \
buffer.c \
buffer.h \
caps.c \
@@ -269,71 +238,31 @@
matcher.h \
table.c \
table.h \
- trie.c \
- trie.h \
vteconv.c \
vteconv.h \
vtetc.c \
vtetc.h
trie_CPPFLAGS = -DTRIE_MAIN
-trie_CFLAGS = $(GOBJECT_CFLAGS)
-trie_LDADD = $(GOBJECT_LIBS)
-vtetc_SOURCES = \
- debug.c \
- debug.h \
- vtetc.c \
- vtetc.h
+vtetc_SOURCES = vtetc.c vtetc.h debug.c debug.h
vtetc_CPPFLAGS = -DTERMCAP_MAIN
-vtetc_CFLAGS = $(GLIB_CFLAGS)
-vtetc_LDADD = $(GLIB_LIBS)
-pty_SOURCES = \
- debug.c \
- debug.h \
- pty.c \
- pty.h
+pty_SOURCES = pty.c pty.h debug.c debug.h
pty_CPPFLAGS = -DPTY_MAIN -DLIBEXECDIR='"$(libexecdir)"'
-pty_CFLAGS = $(GLIB_CFLAGS)
-pty_LDADD = $(GLIB_LIBS)
-reaper_SOURCES = \
- debug.c \
- debug.h \
- marshal.c \
- marshal.h \
- reaper.c \
- reaper.h
+reaper_SOURCES = reaper.c reaper.h debug.c debug.h marshal.c marshal.h
reaper_CPPFLAGS = -DREAPER_MAIN -DLOCALEDIR='"$(localedir)"'
-reaper_CFLAGS = $(GOBJECT_CFLAGS)
-reaper_LDADD = $(GOBJECT_LIBS)
-vteconv_SOURCES = \
- buffer.c \
- buffer.h \
- debug.c \
- debug.h \
- vteconv.c \
- vteconv.h
+vteconv_SOURCES = buffer.c buffer.h debug.c debug.h vteconv.c vteconv.h
vteconv_CPPFLAGS = -DVTECONV_MAIN
-vteconv_CFLAGS = $(GLIB_CFLAGS)
-vteconv_LDADD = $(GLIB_LIBS)
buffer_SOURCES = buffer.c
buffer_CPPFLAGS = -DBUFFER_MAIN
-buffer_CFLAGS = $(GLIB_CFLAGS)
-buffer_LDADD = $(GLIB_LIBS)
dumpkeys_SOURCES = dumpkeys.c
-dumpkeys_CFLAGS = $(GLIB_CFLAGS)
-dumpkeys_LDADD = $(GLIB_LIBS)
-
mev_SOURCES = mev.c
-mev_CFLAGS = $(GLIB_CFLAGS)
-mev_LDADD = $(GLIB_LIBS)
-
ssfe_SOURCES = ssfe.c
-
xticker_SOURCES = xticker.c
-xticker_CFLAGS = $(GLIB_CFLAGS)
-xticker_LDADD = $(GLIB_LIBS)
+
+AM_CFLAGS = $(GLIB_CFLAGS) $(GOBJECT_CFLAGS)
+LDADD = $(GLIB_LIBS) $(GOBJECT_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]