GNOME.org
 

[vte] all: Reorganise source tree

commit 868e47e19f7fbf25f01363c62c4a2201fc60c1f4
Author: Christian Persch <chpe gnome org>
Date:   Tue Mar 31 18:56:13 2015 +0200

    all: Reorganise source tree
    
    Move public headers to src/vte/ so that in-tree and out-of-tree inclusion can
    both use #include <vte/vte.h>.

 Makefile.am                   |    4 +-
 configure.ac                  |    2 +-
 doc/reference/Makefile.am     |   14 ++++++-
 src/Makefile.am               |   82 ++++++++++++++++++++++------------------
 src/reflect.c                 |    2 +-
 src/{ => vte}/vte.h           |    0
 src/{ => vte}/vtedeprecated.h |    0
 src/{ => vte}/vteenums.h      |    0
 src/{ => vte}/vteglobals.h    |    0
 src/{ => vte}/vtemacros.h     |    0
 src/{ => vte}/vtepty.h        |    0
 src/{ => vte}/vteterminal.h   |    0
 src/{ => vte}/vteversion.h.in |    0
 vte/vte.h                     |    1 -
 14 files changed, 62 insertions(+), 43 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f1c438c..861d5b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = src po doc perf
@@ -7,7 +9,7 @@ EXTRA_DIST = \
        HACKING \
        autogen.sh \
        ChangeLog.pre-git \
-       vte/vte.h
+       $(NULL)
 
 DISTCLEANFILES =
 
diff --git a/configure.ac b/configure.ac
index 65f1ed4..73eb43c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -339,8 +339,8 @@ AC_SUBST([AM_LDFLAGS])
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
-src/vteversion.h
 src/vte.gresource.xml
+src/vte/vteversion.h
 perf/Makefile
 po/Makefile.in
 doc/Makefile
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index c82b7ac..c0d5e3e 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 # We require automake 1.10 for $(abs_builddir)
 AUTOMAKE_OPTIONS = 1.10
 
@@ -21,7 +23,10 @@ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
 # e.g. DOC_SOURCE_DIR=../../../gtk
 DOC_SOURCE_DIR = \
        $(top_srcdir)/src \
-       $(top_builddir)/src
+       $(top_srcdir)/src/vte \
+       $(top_builddir)/src \
+       $(top_builddir)/src/vte \
+       $(NULL)
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS =
@@ -56,7 +61,10 @@ FIXXREF_OPTIONS = \
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
 HFILE_GLOB = \
        $(top_srcdir)/src/*.h \
-       $(top_builddir)/src/*.h
+       $(top_srcdir)/src/vte/*.h \
+       $(top_builddir)/src/*.h \
+       $(top_builddir)/src/vte/*.h \
+       $(NULL)
 
 CFILE_GLOB = \
        $(top_srcdir)/src/*.c
@@ -117,8 +125,10 @@ expand_content_files =
 GTKDOC_CFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/src \
+       -I$(top_srcdir)/src/vte \
        -I$(top_builddir) \
        -I$(top_builddir)/src \
+       -I$(top_builddir)/src/vte \
        -DVTE_COMPILATION \
        $(VTE_CFLAGS)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 6284e05..9536b4d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,18 +10,18 @@ EXTRA_DIST =
 
 headerdir = $(includedir)/vte-$(VTE_API_VERSION)/vte
 header_HEADERS = \
-       vte.h \
-       vtedeprecated.h \
-       vteenums.h \
-       vteglobals.h \
-       vtemacros.h \
-       vtepty.h \
-       vteterminal.h \
+       vte/vte.h \
+       vte/vtedeprecated.h \
+       vte/vteenums.h \
+       vte/vteglobals.h \
+       vte/vtemacros.h \
+       vte/vtepty.h \
+       vte/vteterminal.h \
        $(NULL)
 
 nodist_header_HEADERS = \
-       vtetypebuiltins.h \
-       vteversion.h \
+       vte/vtetypebuiltins.h \
+       vte/vteversion.h \
        $(NULL)
 
 lib_LTLIBRARIES = libvte- VTE_API_MAJOR_VERSION@  VTE_API_MINOR_VERSION@.la
@@ -36,6 +36,13 @@ EXTRA_libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_la_SOURCES = \
        $(NULL)
 
 libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_la_SOURCES = \
+       vte/vte.h \
+       vte/vtedeprecated.h \
+       vte/vteenums.h \
+       vte/vteglobals.h \
+       vte/vtemacros.h \
+       vte/vtepty.h \
+       vte/vteterminal.h \
        buffer.h \
        caps.c \
        caps.h \
@@ -53,7 +60,6 @@ libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_la_SOURCES = \
        table.c \
        table.h \
        vte.c \
-       vte.h \
        vte-private.h \
        vteaccess.c \
        vteaccess.h \
@@ -61,12 +67,7 @@ libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_la_SOURCES = \
        vteconv.h \
        vtedraw.c \
        vtedraw.h \
-       vtedeprecated.h \
-       vteenums.h \
-       vteglobals.h \
        vteint.h \
-       vtemacros.h \
-       vtepty.h \
        vtepty-private.h \
        vterowdata.c \
        vterowdata.h \
@@ -76,7 +77,6 @@ libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_la_SOURCES = \
        vtestream.h \
        vtestream-base.h \
        vtestream-file.h \
-       vteterminal.h \
        vtetree.c \
        vtetree.h \
        vteunistr.c \
@@ -91,8 +91,8 @@ nodist_libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_la_SOURCES = \
        marshal.h \
        vteresources.c \
        vtetypebuiltins.c \
-       vtetypebuiltins.h \
-       vteversion.h \
+       vte/vtetypebuiltins.h \
+       vte/vteversion.h \
        $(NULL)
 
 libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_la_CPPFLAGS = \
@@ -103,6 +103,8 @@ libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_la_CPPFLAGS = \
        -DLOCALEDIR='"$(localedir)"' \
        -DGLIB_DISABLE_DEPRECATION_WARNINGS \
        -DVTE_COMPILATION \
+       -I$(srcdir)/vte \
+       -I$(builddir)/vte \
        $(AM_CPPFLAGS)
 
 libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_la_CFLAGS = \
@@ -121,10 +123,10 @@ libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_la_LIBADD = \
 # Generated sources
 
 VTESEQ_BUILTSOURCES = vteseq-list.h vteseq-n.c
-BUILT_SOURCES = box_drawing.h marshal.c marshal.h vtetypebuiltins.c vtetypebuiltins.h vteresources.c 
$(VTESEQ_BUILTSOURCES)
+BUILT_SOURCES = box_drawing.h marshal.c marshal.h vtetypebuiltins.c vte/vtetypebuiltins.h vteresources.c 
$(VTESEQ_BUILTSOURCES)
 MAINTAINERCLEANFILES += $(VTESEQ_BUILTSOURCES)
 EXTRA_DIST += $(VTESEQ_BUILTSOURCES) box_drawing.txt box_drawing_generate.sh iso2022.txt
-CLEANFILES += box_drawing.h marshal.c marshal.h vtetypebuiltins.c vtetypebuiltins.h stamp-vtetypebuiltins.h 
vteresources.c
+CLEANFILES += box_drawing.h marshal.c marshal.h vtetypebuiltins.c vte/vtetypebuiltins.h 
stamp-vtetypebuiltins.h vteresources.c
 
 box_drawing.h: box_drawing.txt box_drawing_generate.sh
        $(AM_V_GEN) $(srcdir)/box_drawing_generate.sh < $< > $@
@@ -135,15 +137,15 @@ marshal.c: marshal.list
 marshal.h: marshal.list
        $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_vte_marshal --header --internal $< > $@
 
-vtetypebuiltins.h: stamp-vtetypebuiltins.h
+vte/vtetypebuiltins.h: stamp-vtetypebuiltins.h
        @true
-stamp-vtetypebuiltins.h: vtetypebuiltins.h.template vteenums.h vtedeprecated.h
+stamp-vtetypebuiltins.h: vtetypebuiltins.h.template vte/vteenums.h vte/vtedeprecated.h
        $(AM_V_GEN) $(GLIB_MKENUMS) --template $< $(filter %.h,$^) > xgen-vtbh \
-       && (cmp -s xgen-vtbh vtetypebuiltins.h || cp xgen-vtbh vtetypebuiltins.h ) \
+       && (cmp -s xgen-vtbh vte/vtetypebuiltins.h || cp xgen-vtbh vte/vtetypebuiltins.h ) \
        && rm -f xgen-vtbh \
        && echo timestamp > $(@F)
 
-vtetypebuiltins.c: vtetypebuiltins.c.template vteenums.h vtedeprecated.h
+vtetypebuiltins.c: vtetypebuiltins.c.template vte/vteenums.h vte/vtedeprecated.h
        $(AM_V_GEN) $(GLIB_MKENUMS) --template $< $(filter %.h,$^) > xgen-vtbc \
        && (cmp -s xgen-vtbc vtetypebuiltins.c || cp xgen-vtbc vtetypebuiltins.c ) \
        && rm -f xgen-vtbc
@@ -176,16 +178,10 @@ Vte_ VTE_API_VERSION_U@_gir_LIBS = libvte-$(VTE_API_VERSION).la
 Vte_ VTE_API_VERSION_U@_gir_EXPORT_PACKAGES = vte-$(VTE_API_VERSION)
 Vte_ VTE_API_VERSION_U@_gir_SCANNERFLAGS = --c-include "vte/vte.h"
 Vte_ VTE_API_VERSION_U@_gir_FILES = \
+       $(filter-out vte/vtedeprecated.h,$(header_HEADERS)) \
+       $(nodist_header_HEADERS) \
        vte.c \
-       vte.h \
-       vteenums.h \
-       vteglobals.h \
-       vtemacros.h \
-       vtepty.h \
-       vteterminal.h \
        vtetypebuiltins.c \
-       vtetypebuiltins.h \
-       vteversion.h \
        pty.c \
        $(NULL)
 
@@ -235,6 +231,8 @@ testvte_SOURCES = \
 testvte_CPPFLAGS = \
         -DGLIB_DISABLE_DEPRECATION_WARNINGS \
         -DGDK_DISABLE_DEPRECATION_WARNINGS \
+       -I$(srcdir)/vte \
+       -I$(builddir)/vte \
         $(AM_CPPFLAGS)
 
 testvte_CFLAGS = \
@@ -271,8 +269,8 @@ vte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_VALAFLAGS = \
        $(AM_VALAFLAGS)
 
 vte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_CPPFLAGS = \
-       -I$(top_builddir) \
-       -I$(top_srcdir) \
+       -I$(srcdir)/vte \
+       -I$(builddir)/vte \
        $(AM_CPPFLAGS) \
        $(NULL)
 
@@ -322,12 +320,12 @@ EXTRA_DIST += $(TEST_SH)
 check_PROGRAMS = dumpkeys reflect-text-view reflect-vte mev table xticker vteconv vtestream-file
 TESTS = table vteconv vtestream-file $(TEST_SH)
 
-reflect_text_view_CPPFLAGS = -DUSE_TEXT_VIEW $(AM_CPPFLAGS)
+reflect_text_view_CPPFLAGS = -DUSE_TEXT_VIEW -I$(srcdir) -I $(builddir) $(AM_CPPFLAGS)
 reflect_text_view_CFLAGS = $(VTE_CFLAGS) $(AM_CFLAGS)
 reflect_text_view_SOURCES = reflect.c
 reflect_text_view_LDADD = $(VTE_LIBS)
 
-reflect_vte_CPPFLAGS = -DUSE_VTE $(AM_CPPFLAGS)
+reflect_vte_CPPFLAGS = -DUSE_VTE  -I$(srcdir) -I $(builddir) $(AM_CPPFLAGS)
 reflect_vte_CFLAGS = $(VTE_CFLAGS) $(AM_CFLAGS)
 reflect_vte_SOURCES = reflect.c
 reflect_vte_LDADD = libvte-$(VTE_API_VERSION).la $(VTE_LIBS)
@@ -352,6 +350,8 @@ interpret_SOURCES = \
 interpret_CPPFLAGS = \
        -DINTERPRET_MAIN \
        -DVTE_API_VERSION=\"$(VTE_API_VERSION)\" \
+       -I$(srcdir) \
+       -I$(builddir) \
        $(AM_CPPFLAGS)
 interpret_CFLAGS = \
        $(GLIB_CFLAGS) \
@@ -365,6 +365,7 @@ interpret_LDADD = \
 slowcat_SOURCES = \
        slowcat.c \
        $(NULL)
+slowcat_CPPFLAGS = -I$(srcdir) -I$(builddir) $(AM_CPPFLAGS)
 slowcat_CFLAGS = $(GLIB_CFLAGS) $(AM_CFLAGS)
 slowcat_LDADD = $(GLIB_LIBS)
 
@@ -383,6 +384,8 @@ table_SOURCES = \
        $(NULL)
 table_CPPFLAGS = \
        -DTABLE_MAIN \
+       -I$(srcdir) \
+       -I$(builddir) \
        $(AM_CPPFLAGS)
 table_CFLAGS = \
        $(GLIB_CFLAGS) \
@@ -401,6 +404,8 @@ vtestream_file_SOURCES = \
        $(NULL)
 vtestream_file_CPPFLAGS = \
        -DVTESTREAM_MAIN \
+       -I$(srcdir) \
+       -I$(builddir) \
        $(AM_CPPFLAGS)
 vtestream_file_CFLAGS = \
        $(VTE_CFLAGS) \
@@ -409,19 +414,22 @@ vtestream_file_LDADD = \
        $(VTE_LIBS)
 
 vteconv_SOURCES = buffer.h debug.c debug.h vteconv.c vteconv.h
-vteconv_CPPFLAGS = -DVTECONV_MAIN $(AM_CPPFLAGS)
+vteconv_CPPFLAGS = -DVTECONV_MAIN -I$(srcdir) -I$(builddir) $(AM_CPPFLAGS)
 vteconv_CFLAGS = $(VTE_CFLAGS) $(AM_CFLAGS)
 vteconv_LDADD = $(VTE_LIBS)
 
 dumpkeys_SOURCES = dumpkeys.c
+dumpkeys_CPPFLAGS = -I$(srcdir) -I$(builddir) $(AM_CPPFLAGS)
 dumpkeys_CFLAGS = $(GLIB_CFLAGS) $(AM_CFLAGS)
 dumpkeys_LDADD = $(GLIB_LIBS)
 
 mev_SOURCES = mev.c
+mev_CPPFLAGS = -I$(srcdir) -I$(builddir) $(AM_CPPFLAGS)
 mev_CFLAGS = $(GLIB_CFLAGS) $(AM_CFLAGS)
 mev_LDADD = $(GLIB_LIBS)
 
 xticker_SOURCES = xticker.c
+xticker_CPPFLAGS = -I$(srcdir) -I$(builddir) $(AM_CPPFLAGS)
 xticker_CFLAGS = $(GLIB_CFLAGS) $(AM_CFLAGS)
 xticker_LDADD = $(GLIB_LIBS)
 
diff --git a/src/reflect.c b/src/reflect.c
index 102663e..8697d95 100644
--- a/src/reflect.c
+++ b/src/reflect.c
@@ -25,7 +25,7 @@
 #include <gtk/gtk.h>
 #include <atk/atk.h>
 #ifdef USE_VTE
-#include "vte.h"
+#include <vte/vte.h>
 #endif
 
 static GArray *contents = NULL;
diff --git a/src/vte.h b/src/vte/vte.h
similarity index 100%
rename from src/vte.h
rename to src/vte/vte.h
diff --git a/src/vtedeprecated.h b/src/vte/vtedeprecated.h
similarity index 100%
rename from src/vtedeprecated.h
rename to src/vte/vtedeprecated.h
diff --git a/src/vteenums.h b/src/vte/vteenums.h
similarity index 100%
rename from src/vteenums.h
rename to src/vte/vteenums.h
diff --git a/src/vteglobals.h b/src/vte/vteglobals.h
similarity index 100%
rename from src/vteglobals.h
rename to src/vte/vteglobals.h
diff --git a/src/vtemacros.h b/src/vte/vtemacros.h
similarity index 100%
rename from src/vtemacros.h
rename to src/vte/vtemacros.h
diff --git a/src/vtepty.h b/src/vte/vtepty.h
similarity index 100%
rename from src/vtepty.h
rename to src/vte/vtepty.h
diff --git a/src/vteterminal.h b/src/vte/vteterminal.h
similarity index 100%
rename from src/vteterminal.h
rename to src/vte/vteterminal.h
diff --git a/src/vteversion.h.in b/src/vte/vteversion.h.in
similarity index 100%
rename from src/vteversion.h.in
rename to src/vte/vteversion.h.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]