vte r2210 - in trunk: . src

[behdad svn gnome org]

Author: behdad
Date: Thu Nov 27 23:54:21 2008
New Revision: 2210
URL: http://svn.gnome.org/viewvc/vte?rev=2210&view=rev

Log:
2008-11-27  Behdad Esfahbod  <behdad gnome org>

        * configure.in:
        * src/Makefile.am:
        More cleanup.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Nov 27 23:54:21 2008
@@ -460,7 +460,6 @@
 ## -------------- ##
 
 Configuration for libvte $VERSION
-	With PCRE: $use_pcre
 	Installing Glade catalogue: $enable_glade_catalogue
 	Debugging: $DEBUG
 	Disable deprecated features: $usedeprecation

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Nov 27 23:54:21 2008
@@ -1,23 +1,16 @@
-bin_PROGRAMS = vte
 
-pkginclude_HEADERS = pty.h reaper.h vte.h vteaccess.h vtetypebuiltins.h vteversion.h
+EXTRA_DIST = iso2022.txt
 
-lib_LTLIBRARIES = libvte.la
 
-pkglib_PROGRAMS = interpret slowcat
-pkglib_SCRIPTS = decset osc window
+# The library
 
-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
+pkginclude_HEADERS = pty.h reaper.h vte.h vteaccess.h vtetypebuiltins.h vteversion.h
 
-EXTRA_DIST = \
-	$(pkglib_SCRIPTS) \
-	vteseq-2.gperf \
-	vteseq-n.gperf \
-	vtetypebuiltins.c.template \
-	vtetypebuiltins.h.template \
+lib_LTLIBRARIES = libvte.la
+
+EXTRA_libvte_la_SOURCES = \
 	genkeysyms.py \
-	iso2022.txt \
+	keysyms.c \
 	marshal.list \
 	mkunitables.sh \
 	unitable.CNS11643 \
@@ -28,19 +21,12 @@
 	unitable.JIS0208 \
 	unitable.JIS0212 \
 	unitable.KSX1001 \
-	$(NULL)
-
-gperf: vteseq-2.gperf vteseq-n.gperf
-	gperf vteseq-2.gperf -m 100 --no-strlen > vteseq-2.c
-	gperf vteseq-n.gperf -m 100 > vteseq-n.c
-
-#vteseq-2.c vteseq-n.c: gperf
-
-
-EXTRA_libvte_la_SOURCES = \
-	keysyms.c \
+	vteseq-2.gperf \
 	vteseq-2.c \
+	vteseq-n.gperf \
 	vteseq-n.c \
+	vtetypebuiltins.c.template \
+	vtetypebuiltins.h.template \
 	$(NULL)
 
 libvte_la_SOURCES = \
@@ -105,13 +91,16 @@
 	-DLIBEXECDIR='"$(libexecdir)"' \
 	-DLOCALEDIR='"$(localedir)"' \
 	-DVTE_COMPILATION
-libvte_la_CFLAGS = $(VTE_CFLAGS) $(PCRE_CFLAGS)
-libvte_la_LIBADD = $(VTE_LIBS) $(PCRE_LIBS)
+libvte_la_CFLAGS = $(VTE_CFLAGS)
+libvte_la_LIBADD = $(VTE_LIBS)
 libvte_la_LDFLAGS = \
 	-version-info $(LIBVTE_LTVERSION) \
 	-export-symbols-regex "^vte_terminal_.*|^_vte_pty_.*|^vte_reaper_.*|_vte_debug_.*" \
 	@LIBTOOL_EXPORT_OPTIONS@ @LIBTOOL_FLAGS@
 
+
+# Generated sources
+
 BUILT_SOURCES = marshal.c marshal.h vtetypebuiltins.c vtetypebuiltins.h
 CLEANFILES = marshal.c marshal.h vtetypebuiltins.c vtetypebuiltins.h stamp-vtetypebuiltins.h
 
@@ -132,11 +121,33 @@
 	&& (cmp -s xgen-vtbc vtetypebuiltins.c || cp xgen-vtbc vtetypebuiltins.c ) \
 	&& rm -f xgen-vtbc
 
-vte_SOURCES = \
-	vteapp.c
+gperf: vteseq-2.gperf vteseq-n.gperf
+	gperf vteseq-2.gperf -m 100 --no-strlen > vteseq-2.c
+	gperf vteseq-n.gperf -m 100 > vteseq-n.c
+
+#vteseq-2.c vteseq-n.c: gperf
+
+
+# vte the application
+
+bin_PROGRAMS = vte
+
+vte_SOURCES = vteapp.c
 vte_CFLAGS = $(VTE_CFLAGS)
 vte_LDADD = libvte.la $(VTE_LIBS)
 
+
+# Misc unit tests and utilities
+
+pkglib_PROGRAMS = interpret slowcat
+pkglib_SCRIPTS = decset osc window
+
+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
+
+AM_CFLAGS = $(GLIB_CFLAGS) $(GOBJECT_CFLAGS)
+LDADD = $(GLIB_LIBS) $(GOBJECT_LIBS)
+
 reflect_text_view_CPPFLAGS = -DUSE_TEXT_VIEW
 reflect_text_view_CFLAGS = $(VTE_CFLAGS)
 reflect_text_view_SOURCES = reflect.c
@@ -263,6 +274,3 @@
 mev_SOURCES = mev.c
 ssfe_SOURCES = ssfe.c
 xticker_SOURCES = xticker.c
-
-AM_CFLAGS = $(GLIB_CFLAGS) $(GOBJECT_CFLAGS)
-LDADD = $(GLIB_LIBS) $(GOBJECT_LIBS)