From f9a602667b891f6be8e3a6801b92683ab813f5b6 Mon Sep 17 00:00:00 2001 From: Nicola Fontana Date: Tue, 30 Mar 2010 22:30:33 +0200 Subject: [PATCH] [build] Moved project dirs under src/ Being planned to split the GTK+ stuff in the "adg-gtk" project, the current two projects ("cpml" and "adg") have been moved under the newly created "src" directory to keep the root directory somewhat clean. Apart that, this will also allow to do some tricks with include... check out future commits for details --- Makefile.am | 3 +- configure.ac | 11 ++-- demo/Makefile.am | 6 +- docs/adg/Makefile.am | 8 +-- docs/cpml/Makefile.am | 6 +- po-properties/POTFILES.in | 82 ++++++++++++++-------------- po/POTFILES.in | 82 ++++++++++++++-------------- src/Makefile.am | 4 ++ {adg => src/adg}/.gitignore | 0 {adg => src/adg}/Makefile.am | 14 ++--- {adg => src/adg}/adg-adim-private.h | 0 {adg => src/adg}/adg-adim.c | 0 {adg => src/adg}/adg-adim.h | 0 {adg => src/adg}/adg-alignment-private.h | 0 {adg => src/adg}/adg-alignment.c | 0 {adg => src/adg}/adg-alignment.h | 0 {adg => src/adg}/adg-arrow-private.h | 0 {adg => src/adg}/adg-arrow.c | 0 {adg => src/adg}/adg-arrow.h | 0 {adg => src/adg}/adg-canvas-private.h | 0 {adg => src/adg}/adg-canvas.c | 0 {adg => src/adg}/adg-canvas.h | 0 {adg => src/adg}/adg-color-style-private.h | 0 {adg => src/adg}/adg-color-style.c | 0 {adg => src/adg}/adg-color-style.h | 0 {adg => src/adg}/adg-container-private.h | 0 {adg => src/adg}/adg-container.c | 0 {adg => src/adg}/adg-container.h | 0 {adg => src/adg}/adg-dim-private.h | 0 {adg => src/adg}/adg-dim-style-private.h | 0 {adg => src/adg}/adg-dim-style.c | 0 {adg => src/adg}/adg-dim-style.h | 0 {adg => src/adg}/adg-dim.c | 0 {adg => src/adg}/adg-dim.h | 0 {adg => src/adg}/adg-dress-builtins.c | 0 {adg => src/adg}/adg-dress-builtins.h | 0 {adg => src/adg}/adg-dress-private.h | 0 {adg => src/adg}/adg-dress.c | 0 {adg => src/adg}/adg-dress.h | 0 {adg => src/adg}/adg-edges-private.h | 0 {adg => src/adg}/adg-edges.c | 0 {adg => src/adg}/adg-edges.h | 0 {adg => src/adg}/adg-entity-private.h | 0 {adg => src/adg}/adg-entity.c | 0 {adg => src/adg}/adg-entity.h | 0 {adg => src/adg}/adg-enums.c | 0 {adg => src/adg}/adg-enums.h | 0 {adg => src/adg}/adg-fill-style-private.h | 0 {adg => src/adg}/adg-fill-style.c | 0 {adg => src/adg}/adg-fill-style.h | 0 {adg => src/adg}/adg-font-style-private.h | 0 {adg => src/adg}/adg-font-style.c | 0 {adg => src/adg}/adg-font-style.h | 0 {adg => src/adg}/adg-hatch-private.h | 0 {adg => src/adg}/adg-hatch.c | 0 {adg => src/adg}/adg-hatch.h | 0 {adg => src/adg}/adg-internal.h | 0 {adg => src/adg}/adg-ldim-private.h | 0 {adg => src/adg}/adg-ldim.c | 0 {adg => src/adg}/adg-ldim.h | 0 {adg => src/adg}/adg-line-style-private.h | 0 {adg => src/adg}/adg-line-style.c | 0 {adg => src/adg}/adg-line-style.h | 0 {adg => src/adg}/adg-logo-private.h | 0 {adg => src/adg}/adg-logo.c | 0 {adg => src/adg}/adg-logo.h | 0 {adg => src/adg}/adg-marker-private.h | 0 {adg => src/adg}/adg-marker.c | 0 {adg => src/adg}/adg-marker.h | 0 {adg => src/adg}/adg-marshal.genmarshal | 0 {adg => src/adg}/adg-matrix.c | 0 {adg => src/adg}/adg-matrix.h | 0 {adg => src/adg}/adg-model-private.h | 0 {adg => src/adg}/adg-model.c | 0 {adg => src/adg}/adg-model.h | 0 {adg => src/adg}/adg-pair.c | 0 {adg => src/adg}/adg-pair.h | 0 {adg => src/adg}/adg-path-private.h | 0 {adg => src/adg}/adg-path.c | 0 {adg => src/adg}/adg-path.h | 0 {adg => src/adg}/adg-pattern.c | 0 {adg => src/adg}/adg-pattern.h | 0 {adg => src/adg}/adg-point.c | 0 {adg => src/adg}/adg-point.h | 0 {adg => src/adg}/adg-primitive.c | 0 {adg => src/adg}/adg-primitive.h | 0 {adg => src/adg}/adg-projection-private.h | 0 {adg => src/adg}/adg-projection.c | 0 {adg => src/adg}/adg-projection.h | 0 {adg => src/adg}/adg-rdim-private.h | 0 {adg => src/adg}/adg-rdim.c | 0 {adg => src/adg}/adg-rdim.h | 0 {adg => src/adg}/adg-ruled-fill-private.h | 0 {adg => src/adg}/adg-ruled-fill.c | 0 {adg => src/adg}/adg-ruled-fill.h | 0 {adg => src/adg}/adg-segment.c | 0 {adg => src/adg}/adg-segment.h | 0 {adg => src/adg}/adg-stroke-private.h | 0 {adg => src/adg}/adg-stroke.c | 0 {adg => src/adg}/adg-stroke.h | 0 {adg => src/adg}/adg-style.c | 0 {adg => src/adg}/adg-style.h | 0 {adg => src/adg}/adg-table-private.h | 0 {adg => src/adg}/adg-table-style-private.h | 0 {adg => src/adg}/adg-table-style.c | 0 {adg => src/adg}/adg-table-style.h | 0 {adg => src/adg}/adg-table.c | 0 {adg => src/adg}/adg-table.h | 0 {adg => src/adg}/adg-title-block-private.h | 0 {adg => src/adg}/adg-title-block.c | 0 {adg => src/adg}/adg-title-block.h | 0 {adg => src/adg}/adg-toy-text-private.h | 0 {adg => src/adg}/adg-toy-text.c | 0 {adg => src/adg}/adg-toy-text.h | 0 {adg => src/adg}/adg-trail-private.h | 0 {adg => src/adg}/adg-trail.c | 0 {adg => src/adg}/adg-trail.h | 0 {adg => src/adg}/adg-type-builtins.c.mkenums | 0 {adg => src/adg}/adg-type-builtins.h.mkenums | 0 {adg => src/adg}/adg-util.c | 0 {adg => src/adg}/adg-util.h | 0 {adg => src/adg}/adg-widget-private.h | 0 {adg => src/adg}/adg-widget.c | 0 {adg => src/adg}/adg-widget.h | 0 {adg => src/adg}/adg.h | 0 {adg => src/adg}/adg.pc.in | 0 {adg => src/adg}/tests/.gitignore | 0 {adg => src/adg}/tests/Makefile.am | 6 +- {adg => src/adg}/tests/test-adim.c | 0 {adg => src/adg}/tests/test-alignment.c | 0 {adg => src/adg}/tests/test-arrow.c | 0 {adg => src/adg}/tests/test-color-style.c | 0 {adg => src/adg}/tests/test-container.c | 0 {adg => src/adg}/tests/test-dim-style.c | 0 {adg => src/adg}/tests/test-dim.c | 0 {adg => src/adg}/tests/test-edges.c | 0 {adg => src/adg}/tests/test-entity.c | 0 {adg => src/adg}/tests/test-fill-style.c | 0 {adg => src/adg}/tests/test-font-style.c | 0 {adg => src/adg}/tests/test-hatch.c | 0 {adg => src/adg}/tests/test-internal.c | 0 {adg => src/adg}/tests/test-internal.h | 0 {adg => src/adg}/tests/test-ldim.c | 0 {adg => src/adg}/tests/test-line-style.c | 0 {adg => src/adg}/tests/test-logo.c | 0 {adg => src/adg}/tests/test-marker.c | 0 {adg => src/adg}/tests/test-model.c | 0 {adg => src/adg}/tests/test-projection.c | 0 {adg => src/adg}/tests/test-stroke.c | 0 {adg => src/adg}/tests/test-table-style.c | 0 {adg => src/adg}/tests/test-table.c | 0 {adg => src/adg}/tests/test-title-block.c | 0 {adg => src/adg}/tests/test-toy-text.c | 0 {adg => src/adg}/tests/test-widget.c | 0 {cpml => src/cpml}/.gitignore | 0 {cpml => src/cpml}/Makefile.am | 0 {cpml => src/cpml}/cpml-arc.c | 0 {cpml => src/cpml}/cpml-arc.h | 0 {cpml => src/cpml}/cpml-close.h | 0 {cpml => src/cpml}/cpml-curve.c | 0 {cpml => src/cpml}/cpml-curve.h | 0 {cpml => src/cpml}/cpml-extents.c | 0 {cpml => src/cpml}/cpml-extents.h | 0 {cpml => src/cpml}/cpml-internal.h | 0 {cpml => src/cpml}/cpml-line.c | 0 {cpml => src/cpml}/cpml-line.h | 0 {cpml => src/cpml}/cpml-pair.c | 0 {cpml => src/cpml}/cpml-pair.h | 0 {cpml => src/cpml}/cpml-primitive-private.h | 0 {cpml => src/cpml}/cpml-primitive.c | 0 {cpml => src/cpml}/cpml-primitive.h | 0 {cpml => src/cpml}/cpml-segment.c | 0 {cpml => src/cpml}/cpml-segment.h | 0 {cpml => src/cpml}/cpml-util.c | 0 {cpml => src/cpml}/cpml-util.h | 0 {cpml => src/cpml}/cpml.h | 0 {cpml => src/cpml}/cpml.pc.in | 0 177 files changed, 113 insertions(+), 109 deletions(-) rewrite po-properties/POTFILES.in (92%) rewrite po/POTFILES.in (92%) create mode 100644 src/Makefile.am rename {adg => src/adg}/.gitignore (100%) rename {adg => src/adg}/Makefile.am (93%) rename {adg => src/adg}/adg-adim-private.h (100%) rename {adg => src/adg}/adg-adim.c (100%) rename {adg => src/adg}/adg-adim.h (100%) rename {adg => src/adg}/adg-alignment-private.h (100%) rename {adg => src/adg}/adg-alignment.c (100%) rename {adg => src/adg}/adg-alignment.h (100%) rename {adg => src/adg}/adg-arrow-private.h (100%) rename {adg => src/adg}/adg-arrow.c (100%) rename {adg => src/adg}/adg-arrow.h (100%) rename {adg => src/adg}/adg-canvas-private.h (100%) rename {adg => src/adg}/adg-canvas.c (100%) rename {adg => src/adg}/adg-canvas.h (100%) rename {adg => src/adg}/adg-color-style-private.h (100%) rename {adg => src/adg}/adg-color-style.c (100%) rename {adg => src/adg}/adg-color-style.h (100%) rename {adg => src/adg}/adg-container-private.h (100%) rename {adg => src/adg}/adg-container.c (100%) rename {adg => src/adg}/adg-container.h (100%) rename {adg => src/adg}/adg-dim-private.h (100%) rename {adg => src/adg}/adg-dim-style-private.h (100%) rename {adg => src/adg}/adg-dim-style.c (100%) rename {adg => src/adg}/adg-dim-style.h (100%) rename {adg => src/adg}/adg-dim.c (100%) rename {adg => src/adg}/adg-dim.h (100%) rename {adg => src/adg}/adg-dress-builtins.c (100%) rename {adg => src/adg}/adg-dress-builtins.h (100%) rename {adg => src/adg}/adg-dress-private.h (100%) rename {adg => src/adg}/adg-dress.c (100%) rename {adg => src/adg}/adg-dress.h (100%) rename {adg => src/adg}/adg-edges-private.h (100%) rename {adg => src/adg}/adg-edges.c (100%) rename {adg => src/adg}/adg-edges.h (100%) rename {adg => src/adg}/adg-entity-private.h (100%) rename {adg => src/adg}/adg-entity.c (100%) rename {adg => src/adg}/adg-entity.h (100%) rename {adg => src/adg}/adg-enums.c (100%) rename {adg => src/adg}/adg-enums.h (100%) rename {adg => src/adg}/adg-fill-style-private.h (100%) rename {adg => src/adg}/adg-fill-style.c (100%) rename {adg => src/adg}/adg-fill-style.h (100%) rename {adg => src/adg}/adg-font-style-private.h (100%) rename {adg => src/adg}/adg-font-style.c (100%) rename {adg => src/adg}/adg-font-style.h (100%) rename {adg => src/adg}/adg-hatch-private.h (100%) rename {adg => src/adg}/adg-hatch.c (100%) rename {adg => src/adg}/adg-hatch.h (100%) rename {adg => src/adg}/adg-internal.h (100%) rename {adg => src/adg}/adg-ldim-private.h (100%) rename {adg => src/adg}/adg-ldim.c (100%) rename {adg => src/adg}/adg-ldim.h (100%) rename {adg => src/adg}/adg-line-style-private.h (100%) rename {adg => src/adg}/adg-line-style.c (100%) rename {adg => src/adg}/adg-line-style.h (100%) rename {adg => src/adg}/adg-logo-private.h (100%) rename {adg => src/adg}/adg-logo.c (100%) rename {adg => src/adg}/adg-logo.h (100%) rename {adg => src/adg}/adg-marker-private.h (100%) rename {adg => src/adg}/adg-marker.c (100%) rename {adg => src/adg}/adg-marker.h (100%) rename {adg => src/adg}/adg-marshal.genmarshal (100%) rename {adg => src/adg}/adg-matrix.c (100%) rename {adg => src/adg}/adg-matrix.h (100%) rename {adg => src/adg}/adg-model-private.h (100%) rename {adg => src/adg}/adg-model.c (100%) rename {adg => src/adg}/adg-model.h (100%) rename {adg => src/adg}/adg-pair.c (100%) rename {adg => src/adg}/adg-pair.h (100%) rename {adg => src/adg}/adg-path-private.h (100%) rename {adg => src/adg}/adg-path.c (100%) rename {adg => src/adg}/adg-path.h (100%) rename {adg => src/adg}/adg-pattern.c (100%) rename {adg => src/adg}/adg-pattern.h (100%) rename {adg => src/adg}/adg-point.c (100%) rename {adg => src/adg}/adg-point.h (100%) rename {adg => src/adg}/adg-primitive.c (100%) rename {adg => src/adg}/adg-primitive.h (100%) rename {adg => src/adg}/adg-projection-private.h (100%) rename {adg => src/adg}/adg-projection.c (100%) rename {adg => src/adg}/adg-projection.h (100%) rename {adg => src/adg}/adg-rdim-private.h (100%) rename {adg => src/adg}/adg-rdim.c (100%) rename {adg => src/adg}/adg-rdim.h (100%) rename {adg => src/adg}/adg-ruled-fill-private.h (100%) rename {adg => src/adg}/adg-ruled-fill.c (100%) rename {adg => src/adg}/adg-ruled-fill.h (100%) rename {adg => src/adg}/adg-segment.c (100%) rename {adg => src/adg}/adg-segment.h (100%) rename {adg => src/adg}/adg-stroke-private.h (100%) rename {adg => src/adg}/adg-stroke.c (100%) rename {adg => src/adg}/adg-stroke.h (100%) rename {adg => src/adg}/adg-style.c (100%) rename {adg => src/adg}/adg-style.h (100%) rename {adg => src/adg}/adg-table-private.h (100%) rename {adg => src/adg}/adg-table-style-private.h (100%) rename {adg => src/adg}/adg-table-style.c (100%) rename {adg => src/adg}/adg-table-style.h (100%) rename {adg => src/adg}/adg-table.c (100%) rename {adg => src/adg}/adg-table.h (100%) rename {adg => src/adg}/adg-title-block-private.h (100%) rename {adg => src/adg}/adg-title-block.c (100%) rename {adg => src/adg}/adg-title-block.h (100%) rename {adg => src/adg}/adg-toy-text-private.h (100%) rename {adg => src/adg}/adg-toy-text.c (100%) rename {adg => src/adg}/adg-toy-text.h (100%) rename {adg => src/adg}/adg-trail-private.h (100%) rename {adg => src/adg}/adg-trail.c (100%) rename {adg => src/adg}/adg-trail.h (100%) rename {adg => src/adg}/adg-type-builtins.c.mkenums (100%) rename {adg => src/adg}/adg-type-builtins.h.mkenums (100%) rename {adg => src/adg}/adg-util.c (100%) rename {adg => src/adg}/adg-util.h (100%) rename {adg => src/adg}/adg-widget-private.h (100%) rename {adg => src/adg}/adg-widget.c (100%) rename {adg => src/adg}/adg-widget.h (100%) rename {adg => src/adg}/adg.h (100%) rename {adg => src/adg}/adg.pc.in (100%) rename {adg => src/adg}/tests/.gitignore (100%) rename {adg => src/adg}/tests/Makefile.am (96%) rename {adg => src/adg}/tests/test-adim.c (100%) rename {adg => src/adg}/tests/test-alignment.c (100%) rename {adg => src/adg}/tests/test-arrow.c (100%) rename {adg => src/adg}/tests/test-color-style.c (100%) rename {adg => src/adg}/tests/test-container.c (100%) rename {adg => src/adg}/tests/test-dim-style.c (100%) rename {adg => src/adg}/tests/test-dim.c (100%) rename {adg => src/adg}/tests/test-edges.c (100%) rename {adg => src/adg}/tests/test-entity.c (100%) rename {adg => src/adg}/tests/test-fill-style.c (100%) rename {adg => src/adg}/tests/test-font-style.c (100%) rename {adg => src/adg}/tests/test-hatch.c (100%) rename {adg => src/adg}/tests/test-internal.c (100%) rename {adg => src/adg}/tests/test-internal.h (100%) rename {adg => src/adg}/tests/test-ldim.c (100%) rename {adg => src/adg}/tests/test-line-style.c (100%) rename {adg => src/adg}/tests/test-logo.c (100%) rename {adg => src/adg}/tests/test-marker.c (100%) rename {adg => src/adg}/tests/test-model.c (100%) rename {adg => src/adg}/tests/test-projection.c (100%) rename {adg => src/adg}/tests/test-stroke.c (100%) rename {adg => src/adg}/tests/test-table-style.c (100%) rename {adg => src/adg}/tests/test-table.c (100%) rename {adg => src/adg}/tests/test-title-block.c (100%) rename {adg => src/adg}/tests/test-toy-text.c (100%) rename {adg => src/adg}/tests/test-widget.c (100%) rename {cpml => src/cpml}/.gitignore (100%) rename {cpml => src/cpml}/Makefile.am (100%) rename {cpml => src/cpml}/cpml-arc.c (100%) rename {cpml => src/cpml}/cpml-arc.h (100%) rename {cpml => src/cpml}/cpml-close.h (100%) rename {cpml => src/cpml}/cpml-curve.c (100%) rename {cpml => src/cpml}/cpml-curve.h (100%) rename {cpml => src/cpml}/cpml-extents.c (100%) rename {cpml => src/cpml}/cpml-extents.h (100%) rename {cpml => src/cpml}/cpml-internal.h (100%) rename {cpml => src/cpml}/cpml-line.c (100%) rename {cpml => src/cpml}/cpml-line.h (100%) rename {cpml => src/cpml}/cpml-pair.c (100%) rename {cpml => src/cpml}/cpml-pair.h (100%) rename {cpml => src/cpml}/cpml-primitive-private.h (100%) rename {cpml => src/cpml}/cpml-primitive.c (100%) rename {cpml => src/cpml}/cpml-primitive.h (100%) rename {cpml => src/cpml}/cpml-segment.c (100%) rename {cpml => src/cpml}/cpml-segment.h (100%) rename {cpml => src/cpml}/cpml-util.c (100%) rename {cpml => src/cpml}/cpml-util.h (100%) rename {cpml => src/cpml}/cpml.h (100%) rename {cpml => src/cpml}/cpml.pc.in (100%) diff --git a/Makefile.am b/Makefile.am index 3014a904..68f6c1f0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,8 +24,7 @@ EXTRA_DIST= COPYING \ adg.doap \ $(BUILT_SOURCES) -SUBDIRS= cpml \ - adg \ +SUBDIRS= src \ demo \ docs \ po \ diff --git a/configure.ac b/configure.ac index 284ebedf..892693d4 100644 --- a/configure.ac +++ b/configure.ac @@ -153,11 +153,12 @@ SHAVE_INIT([build],[enable]) AC_CONFIG_FILES([build/shave build/shave-libtool Makefile - cpml/cpml.pc - cpml/Makefile - adg/adg.pc - adg/Makefile - adg/tests/Makefile + src/Makefile + src/cpml/cpml.pc + src/cpml/Makefile + src/adg/adg.pc + src/adg/Makefile + src/adg/tests/Makefile demo/Makefile po/Makefile.in po-properties/Makefile.in diff --git a/demo/Makefile.am b/demo/Makefile.am index 51241e45..a8f5ea5a 100644 --- a/demo/Makefile.am +++ b/demo/Makefile.am @@ -1,12 +1,12 @@ include $(top_srcdir)/build/Makefile.am.common AM_CFLAGS= @ADG_CFLAGS@ \ - -I$(top_srcdir) \ - -I$(top_builddir) + -I$(top_srcdir)/src \ + -I$(top_builddir)/src AM_LDFLAGS= @ADG_LIBS@ AM_CPPFLAGS= -DPKGDATADIR='"$(pkgdatadir)"' \ -DSOURCEDIR='"$(abs_top_srcdir)/demo"' -LDADD= $(top_builddir)/adg/libadg.la +LDADD= $(top_builddir)/src/adg/libadg.la if HAVE_GTK2 diff --git a/docs/adg/Makefile.am b/docs/adg/Makefile.am index dd72ed16..cd5d13fc 100644 --- a/docs/adg/Makefile.am +++ b/docs/adg/Makefile.am @@ -4,11 +4,11 @@ GTKDOC_CFLAGS= @ADG_CFLAGS@ \ -I$(top_srcdir) \ -I$(top_builddir) GTKDOC_LIBS= @ADG_LIBS@ \ - $(top_builddir)/adg/libadg.la + $(top_builddir)/src/adg/libadg.la DOC_MODULE= adg DOC_MAIN_SGML_FILE= $(DOC_MODULE)-docs.xml -DOC_SOURCE_DIR= $(abs_top_srcdir)/adg +DOC_SOURCE_DIR= $(abs_top_srcdir)/src/adg SCANGOBJ_OPTIONS= SCAN_OPTIONS= --rebuild-types \ --rebuild-sections @@ -17,8 +17,8 @@ MKDB_OPTIONS= --sgml-mode \ --output-format=xml MKHTML_OPTIONS= --path=$(abs_builddir) FIXXREF_OPTIONS= -HFILE_GLOB= $(top_srcdir)/adg/*.h -CFILE_GLOB= $(top_srcdir)/adg/*.c +HFILE_GLOB= $(top_srcdir)/src/adg/*.h +CFILE_GLOB= $(top_srcdir)/src/adg/*.c IGNORE_HFILES= adg.h \ adg-internal.h \ adg-type-builtins.h \ diff --git a/docs/cpml/Makefile.am b/docs/cpml/Makefile.am index df864444..dcdd5501 100644 --- a/docs/cpml/Makefile.am +++ b/docs/cpml/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/build/Makefile.am.common DOC_MODULE= cpml DOC_MAIN_SGML_FILE= $(DOC_MODULE)-docs.xml -DOC_SOURCE_DIR= $(abs_top_srcdir)/cpml +DOC_SOURCE_DIR= $(abs_top_srcdir)/src/cpml SCANGOBJ_OPTIONS= SCAN_OPTIONS= --ignore-decorators="CPML_GNUC_CONST" \ --rebuild-sections @@ -11,8 +11,8 @@ MKDB_OPTIONS= --sgml-mode \ --output-format=xml MKHTML_OPTIONS= --path=$(abs_builddir) FIXXREF_OPTIONS= -HFILE_GLOB= $(top_srcdir)/cpml/*.h -CFILE_GLOB= $(top_srcdir)/cpml/*.c +HFILE_GLOB= $(top_srcdir)/src/cpml/*.h +CFILE_GLOB= $(top_srcdir)/src/cpml/*.c IGNORE_HFILES= cpml.h \ cpml-alloca.h \ cpml-internal.h \ diff --git a/po-properties/POTFILES.in b/po-properties/POTFILES.in dissimilarity index 92% index e33bc1b1..edc9982a 100644 --- a/po-properties/POTFILES.in +++ b/po-properties/POTFILES.in @@ -1,41 +1,41 @@ -# List of source files which contain translatable strings. -adg/adg-adim.c -adg/adg-alignment.c -adg/adg-arrow.c -adg/adg-canvas.c -adg/adg-color-style.c -adg/adg-container.c -adg/adg-dim.c -adg/adg-dim-style.c -adg/adg-dress-builtins.c -adg/adg-dress.c -adg/adg-edges.c -adg/adg-entity.c -adg/adg-enums.c -adg/adg-fill-style.c -adg/adg-font-style.c -adg/adg-hatch.c -adg/adg-ldim.c -adg/adg-line-style.c -adg/adg-logo.c -adg/adg-marker.c -adg/adg-matrix.c -adg/adg-model.c -adg/adg-pair.c -adg/adg-path.c -adg/adg-pattern.c -adg/adg-point.c -adg/adg-primitive.c -adg/adg-projection.c -adg/adg-rdim.c -adg/adg-ruled-fill.c -adg/adg-segment.c -adg/adg-stroke.c -adg/adg-style.c -adg/adg-table.c -adg/adg-table-style.c -adg/adg-title-block.c -adg/adg-toy-text.c -adg/adg-trail.c -adg/adg-util.c -adg/adg-widget.c +# List of source files which contain translatable strings. +src/adg/adg-adim.c +src/adg/adg-alignment.c +src/adg/adg-arrow.c +src/adg/adg-canvas.c +src/adg/adg-color-style.c +src/adg/adg-container.c +src/adg/adg-dim.c +src/adg/adg-dim-style.c +src/adg/adg-dress-builtins.c +src/adg/adg-dress.c +src/adg/adg-edges.c +src/adg/adg-entity.c +src/adg/adg-enums.c +src/adg/adg-fill-style.c +src/adg/adg-font-style.c +src/adg/adg-hatch.c +src/adg/adg-ldim.c +src/adg/adg-line-style.c +src/adg/adg-logo.c +src/adg/adg-marker.c +src/adg/adg-matrix.c +src/adg/adg-model.c +src/adg/adg-pair.c +src/adg/adg-path.c +src/adg/adg-pattern.c +src/adg/adg-point.c +src/adg/adg-primitive.c +src/adg/adg-projection.c +src/adg/adg-rdim.c +src/adg/adg-ruled-fill.c +src/adg/adg-segment.c +src/adg/adg-stroke.c +src/adg/adg-style.c +src/adg/adg-table.c +src/adg/adg-table-style.c +src/adg/adg-title-block.c +src/adg/adg-toy-text.c +src/adg/adg-trail.c +src/adg/adg-util.c +src/adg/adg-widget.c diff --git a/po/POTFILES.in b/po/POTFILES.in dissimilarity index 92% index e33bc1b1..edc9982a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,41 +1,41 @@ -# List of source files which contain translatable strings. -adg/adg-adim.c -adg/adg-alignment.c -adg/adg-arrow.c -adg/adg-canvas.c -adg/adg-color-style.c -adg/adg-container.c -adg/adg-dim.c -adg/adg-dim-style.c -adg/adg-dress-builtins.c -adg/adg-dress.c -adg/adg-edges.c -adg/adg-entity.c -adg/adg-enums.c -adg/adg-fill-style.c -adg/adg-font-style.c -adg/adg-hatch.c -adg/adg-ldim.c -adg/adg-line-style.c -adg/adg-logo.c -adg/adg-marker.c -adg/adg-matrix.c -adg/adg-model.c -adg/adg-pair.c -adg/adg-path.c -adg/adg-pattern.c -adg/adg-point.c -adg/adg-primitive.c -adg/adg-projection.c -adg/adg-rdim.c -adg/adg-ruled-fill.c -adg/adg-segment.c -adg/adg-stroke.c -adg/adg-style.c -adg/adg-table.c -adg/adg-table-style.c -adg/adg-title-block.c -adg/adg-toy-text.c -adg/adg-trail.c -adg/adg-util.c -adg/adg-widget.c +# List of source files which contain translatable strings. +src/adg/adg-adim.c +src/adg/adg-alignment.c +src/adg/adg-arrow.c +src/adg/adg-canvas.c +src/adg/adg-color-style.c +src/adg/adg-container.c +src/adg/adg-dim.c +src/adg/adg-dim-style.c +src/adg/adg-dress-builtins.c +src/adg/adg-dress.c +src/adg/adg-edges.c +src/adg/adg-entity.c +src/adg/adg-enums.c +src/adg/adg-fill-style.c +src/adg/adg-font-style.c +src/adg/adg-hatch.c +src/adg/adg-ldim.c +src/adg/adg-line-style.c +src/adg/adg-logo.c +src/adg/adg-marker.c +src/adg/adg-matrix.c +src/adg/adg-model.c +src/adg/adg-pair.c +src/adg/adg-path.c +src/adg/adg-pattern.c +src/adg/adg-point.c +src/adg/adg-primitive.c +src/adg/adg-projection.c +src/adg/adg-rdim.c +src/adg/adg-ruled-fill.c +src/adg/adg-segment.c +src/adg/adg-stroke.c +src/adg/adg-style.c +src/adg/adg-table.c +src/adg/adg-table-style.c +src/adg/adg-title-block.c +src/adg/adg-toy-text.c +src/adg/adg-trail.c +src/adg/adg-util.c +src/adg/adg-widget.c diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 00000000..e1b06312 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,4 @@ +include $(top_srcdir)/build/Makefile.am.common + +SUBDIRS= cpml \ + adg diff --git a/adg/.gitignore b/src/adg/.gitignore similarity index 100% rename from adg/.gitignore rename to src/adg/.gitignore diff --git a/adg/Makefile.am b/src/adg/Makefile.am similarity index 93% rename from adg/Makefile.am rename to src/adg/Makefile.am index a6887f1a..a725cc58 100644 --- a/adg/Makefile.am +++ b/src/adg/Makefile.am @@ -7,8 +7,8 @@ mkenums_command= $(MSG_GEN) ; \ genmarshal_command= $(MSG_GEN) ; \ $(GLIB_GENMARSHAL) --prefix=adg_marshal AM_CFLAGS= @ADG_CFLAGS@ \ - -I$(top_srcdir) \ - -I$(top_builddir) + -I$(top_srcdir)/src \ + -I$(top_builddir)/src AM_LDFLAGS= @ADG_LIBS@ @@ -85,7 +85,7 @@ private_h_sources= adg-adim-private.h \ adg-title-block-private.h \ adg-trail-private.h \ adg-toy-text-private.h -built_private_h_sources= $(builddir)/adg-marshal.h +built_private_h_sources= adg-marshal.h c_sources= adg-adim.c \ adg-alignment.c \ adg-arrow.c \ @@ -125,8 +125,8 @@ c_sources= adg-adim.c \ adg-trail.c \ adg-toy-text.c \ adg-util.c -built_c_sources= $(builddir)/adg-type-builtins.c \ - $(builddir)/adg-marshal.c +built_c_sources= adg-type-builtins.c \ + adg-marshal.c template_sources= adg-type-builtins.c.mkenums \ adg-type-builtins.h.mkenums \ adg-marshal.genmarshal @@ -161,8 +161,8 @@ libadg_la_SOURCES= $(h_sources) \ nodist_libadg_la_SOURCES= $(built_h_sources) \ $(built_private_h_sources) \ $(built_c_sources) -libadg_la_LIBADD= $(top_builddir)/cpml/libcpml.la -libadg_la_DEPENDENCIES= $(top_builddir)/cpml/libcpml.la +libadg_la_LIBADD= $(top_builddir)/src/cpml/libcpml.la +libadg_la_DEPENDENCIES= $(top_builddir)/src/cpml/libcpml.la adg-type-builtins.c: $(srcdir)/adg-type-builtins.c.mkenums $(srcdir)/adg-enums.h diff --git a/adg/adg-adim-private.h b/src/adg/adg-adim-private.h similarity index 100% rename from adg/adg-adim-private.h rename to src/adg/adg-adim-private.h diff --git a/adg/adg-adim.c b/src/adg/adg-adim.c similarity index 100% rename from adg/adg-adim.c rename to src/adg/adg-adim.c diff --git a/adg/adg-adim.h b/src/adg/adg-adim.h similarity index 100% rename from adg/adg-adim.h rename to src/adg/adg-adim.h diff --git a/adg/adg-alignment-private.h b/src/adg/adg-alignment-private.h similarity index 100% rename from adg/adg-alignment-private.h rename to src/adg/adg-alignment-private.h diff --git a/adg/adg-alignment.c b/src/adg/adg-alignment.c similarity index 100% rename from adg/adg-alignment.c rename to src/adg/adg-alignment.c diff --git a/adg/adg-alignment.h b/src/adg/adg-alignment.h similarity index 100% rename from adg/adg-alignment.h rename to src/adg/adg-alignment.h diff --git a/adg/adg-arrow-private.h b/src/adg/adg-arrow-private.h similarity index 100% rename from adg/adg-arrow-private.h rename to src/adg/adg-arrow-private.h diff --git a/adg/adg-arrow.c b/src/adg/adg-arrow.c similarity index 100% rename from adg/adg-arrow.c rename to src/adg/adg-arrow.c diff --git a/adg/adg-arrow.h b/src/adg/adg-arrow.h similarity index 100% rename from adg/adg-arrow.h rename to src/adg/adg-arrow.h diff --git a/adg/adg-canvas-private.h b/src/adg/adg-canvas-private.h similarity index 100% rename from adg/adg-canvas-private.h rename to src/adg/adg-canvas-private.h diff --git a/adg/adg-canvas.c b/src/adg/adg-canvas.c similarity index 100% rename from adg/adg-canvas.c rename to src/adg/adg-canvas.c diff --git a/adg/adg-canvas.h b/src/adg/adg-canvas.h similarity index 100% rename from adg/adg-canvas.h rename to src/adg/adg-canvas.h diff --git a/adg/adg-color-style-private.h b/src/adg/adg-color-style-private.h similarity index 100% rename from adg/adg-color-style-private.h rename to src/adg/adg-color-style-private.h diff --git a/adg/adg-color-style.c b/src/adg/adg-color-style.c similarity index 100% rename from adg/adg-color-style.c rename to src/adg/adg-color-style.c diff --git a/adg/adg-color-style.h b/src/adg/adg-color-style.h similarity index 100% rename from adg/adg-color-style.h rename to src/adg/adg-color-style.h diff --git a/adg/adg-container-private.h b/src/adg/adg-container-private.h similarity index 100% rename from adg/adg-container-private.h rename to src/adg/adg-container-private.h diff --git a/adg/adg-container.c b/src/adg/adg-container.c similarity index 100% rename from adg/adg-container.c rename to src/adg/adg-container.c diff --git a/adg/adg-container.h b/src/adg/adg-container.h similarity index 100% rename from adg/adg-container.h rename to src/adg/adg-container.h diff --git a/adg/adg-dim-private.h b/src/adg/adg-dim-private.h similarity index 100% rename from adg/adg-dim-private.h rename to src/adg/adg-dim-private.h diff --git a/adg/adg-dim-style-private.h b/src/adg/adg-dim-style-private.h similarity index 100% rename from adg/adg-dim-style-private.h rename to src/adg/adg-dim-style-private.h diff --git a/adg/adg-dim-style.c b/src/adg/adg-dim-style.c similarity index 100% rename from adg/adg-dim-style.c rename to src/adg/adg-dim-style.c diff --git a/adg/adg-dim-style.h b/src/adg/adg-dim-style.h similarity index 100% rename from adg/adg-dim-style.h rename to src/adg/adg-dim-style.h diff --git a/adg/adg-dim.c b/src/adg/adg-dim.c similarity index 100% rename from adg/adg-dim.c rename to src/adg/adg-dim.c diff --git a/adg/adg-dim.h b/src/adg/adg-dim.h similarity index 100% rename from adg/adg-dim.h rename to src/adg/adg-dim.h diff --git a/adg/adg-dress-builtins.c b/src/adg/adg-dress-builtins.c similarity index 100% rename from adg/adg-dress-builtins.c rename to src/adg/adg-dress-builtins.c diff --git a/adg/adg-dress-builtins.h b/src/adg/adg-dress-builtins.h similarity index 100% rename from adg/adg-dress-builtins.h rename to src/adg/adg-dress-builtins.h diff --git a/adg/adg-dress-private.h b/src/adg/adg-dress-private.h similarity index 100% rename from adg/adg-dress-private.h rename to src/adg/adg-dress-private.h diff --git a/adg/adg-dress.c b/src/adg/adg-dress.c similarity index 100% rename from adg/adg-dress.c rename to src/adg/adg-dress.c diff --git a/adg/adg-dress.h b/src/adg/adg-dress.h similarity index 100% rename from adg/adg-dress.h rename to src/adg/adg-dress.h diff --git a/adg/adg-edges-private.h b/src/adg/adg-edges-private.h similarity index 100% rename from adg/adg-edges-private.h rename to src/adg/adg-edges-private.h diff --git a/adg/adg-edges.c b/src/adg/adg-edges.c similarity index 100% rename from adg/adg-edges.c rename to src/adg/adg-edges.c diff --git a/adg/adg-edges.h b/src/adg/adg-edges.h similarity index 100% rename from adg/adg-edges.h rename to src/adg/adg-edges.h diff --git a/adg/adg-entity-private.h b/src/adg/adg-entity-private.h similarity index 100% rename from adg/adg-entity-private.h rename to src/adg/adg-entity-private.h diff --git a/adg/adg-entity.c b/src/adg/adg-entity.c similarity index 100% rename from adg/adg-entity.c rename to src/adg/adg-entity.c diff --git a/adg/adg-entity.h b/src/adg/adg-entity.h similarity index 100% rename from adg/adg-entity.h rename to src/adg/adg-entity.h diff --git a/adg/adg-enums.c b/src/adg/adg-enums.c similarity index 100% rename from adg/adg-enums.c rename to src/adg/adg-enums.c diff --git a/adg/adg-enums.h b/src/adg/adg-enums.h similarity index 100% rename from adg/adg-enums.h rename to src/adg/adg-enums.h diff --git a/adg/adg-fill-style-private.h b/src/adg/adg-fill-style-private.h similarity index 100% rename from adg/adg-fill-style-private.h rename to src/adg/adg-fill-style-private.h diff --git a/adg/adg-fill-style.c b/src/adg/adg-fill-style.c similarity index 100% rename from adg/adg-fill-style.c rename to src/adg/adg-fill-style.c diff --git a/adg/adg-fill-style.h b/src/adg/adg-fill-style.h similarity index 100% rename from adg/adg-fill-style.h rename to src/adg/adg-fill-style.h diff --git a/adg/adg-font-style-private.h b/src/adg/adg-font-style-private.h similarity index 100% rename from adg/adg-font-style-private.h rename to src/adg/adg-font-style-private.h diff --git a/adg/adg-font-style.c b/src/adg/adg-font-style.c similarity index 100% rename from adg/adg-font-style.c rename to src/adg/adg-font-style.c diff --git a/adg/adg-font-style.h b/src/adg/adg-font-style.h similarity index 100% rename from adg/adg-font-style.h rename to src/adg/adg-font-style.h diff --git a/adg/adg-hatch-private.h b/src/adg/adg-hatch-private.h similarity index 100% rename from adg/adg-hatch-private.h rename to src/adg/adg-hatch-private.h diff --git a/adg/adg-hatch.c b/src/adg/adg-hatch.c similarity index 100% rename from adg/adg-hatch.c rename to src/adg/adg-hatch.c diff --git a/adg/adg-hatch.h b/src/adg/adg-hatch.h similarity index 100% rename from adg/adg-hatch.h rename to src/adg/adg-hatch.h diff --git a/adg/adg-internal.h b/src/adg/adg-internal.h similarity index 100% rename from adg/adg-internal.h rename to src/adg/adg-internal.h diff --git a/adg/adg-ldim-private.h b/src/adg/adg-ldim-private.h similarity index 100% rename from adg/adg-ldim-private.h rename to src/adg/adg-ldim-private.h diff --git a/adg/adg-ldim.c b/src/adg/adg-ldim.c similarity index 100% rename from adg/adg-ldim.c rename to src/adg/adg-ldim.c diff --git a/adg/adg-ldim.h b/src/adg/adg-ldim.h similarity index 100% rename from adg/adg-ldim.h rename to src/adg/adg-ldim.h diff --git a/adg/adg-line-style-private.h b/src/adg/adg-line-style-private.h similarity index 100% rename from adg/adg-line-style-private.h rename to src/adg/adg-line-style-private.h diff --git a/adg/adg-line-style.c b/src/adg/adg-line-style.c similarity index 100% rename from adg/adg-line-style.c rename to src/adg/adg-line-style.c diff --git a/adg/adg-line-style.h b/src/adg/adg-line-style.h similarity index 100% rename from adg/adg-line-style.h rename to src/adg/adg-line-style.h diff --git a/adg/adg-logo-private.h b/src/adg/adg-logo-private.h similarity index 100% rename from adg/adg-logo-private.h rename to src/adg/adg-logo-private.h diff --git a/adg/adg-logo.c b/src/adg/adg-logo.c similarity index 100% rename from adg/adg-logo.c rename to src/adg/adg-logo.c diff --git a/adg/adg-logo.h b/src/adg/adg-logo.h similarity index 100% rename from adg/adg-logo.h rename to src/adg/adg-logo.h diff --git a/adg/adg-marker-private.h b/src/adg/adg-marker-private.h similarity index 100% rename from adg/adg-marker-private.h rename to src/adg/adg-marker-private.h diff --git a/adg/adg-marker.c b/src/adg/adg-marker.c similarity index 100% rename from adg/adg-marker.c rename to src/adg/adg-marker.c diff --git a/adg/adg-marker.h b/src/adg/adg-marker.h similarity index 100% rename from adg/adg-marker.h rename to src/adg/adg-marker.h diff --git a/adg/adg-marshal.genmarshal b/src/adg/adg-marshal.genmarshal similarity index 100% rename from adg/adg-marshal.genmarshal rename to src/adg/adg-marshal.genmarshal diff --git a/adg/adg-matrix.c b/src/adg/adg-matrix.c similarity index 100% rename from adg/adg-matrix.c rename to src/adg/adg-matrix.c diff --git a/adg/adg-matrix.h b/src/adg/adg-matrix.h similarity index 100% rename from adg/adg-matrix.h rename to src/adg/adg-matrix.h diff --git a/adg/adg-model-private.h b/src/adg/adg-model-private.h similarity index 100% rename from adg/adg-model-private.h rename to src/adg/adg-model-private.h diff --git a/adg/adg-model.c b/src/adg/adg-model.c similarity index 100% rename from adg/adg-model.c rename to src/adg/adg-model.c diff --git a/adg/adg-model.h b/src/adg/adg-model.h similarity index 100% rename from adg/adg-model.h rename to src/adg/adg-model.h diff --git a/adg/adg-pair.c b/src/adg/adg-pair.c similarity index 100% rename from adg/adg-pair.c rename to src/adg/adg-pair.c diff --git a/adg/adg-pair.h b/src/adg/adg-pair.h similarity index 100% rename from adg/adg-pair.h rename to src/adg/adg-pair.h diff --git a/adg/adg-path-private.h b/src/adg/adg-path-private.h similarity index 100% rename from adg/adg-path-private.h rename to src/adg/adg-path-private.h diff --git a/adg/adg-path.c b/src/adg/adg-path.c similarity index 100% rename from adg/adg-path.c rename to src/adg/adg-path.c diff --git a/adg/adg-path.h b/src/adg/adg-path.h similarity index 100% rename from adg/adg-path.h rename to src/adg/adg-path.h diff --git a/adg/adg-pattern.c b/src/adg/adg-pattern.c similarity index 100% rename from adg/adg-pattern.c rename to src/adg/adg-pattern.c diff --git a/adg/adg-pattern.h b/src/adg/adg-pattern.h similarity index 100% rename from adg/adg-pattern.h rename to src/adg/adg-pattern.h diff --git a/adg/adg-point.c b/src/adg/adg-point.c similarity index 100% rename from adg/adg-point.c rename to src/adg/adg-point.c diff --git a/adg/adg-point.h b/src/adg/adg-point.h similarity index 100% rename from adg/adg-point.h rename to src/adg/adg-point.h diff --git a/adg/adg-primitive.c b/src/adg/adg-primitive.c similarity index 100% rename from adg/adg-primitive.c rename to src/adg/adg-primitive.c diff --git a/adg/adg-primitive.h b/src/adg/adg-primitive.h similarity index 100% rename from adg/adg-primitive.h rename to src/adg/adg-primitive.h diff --git a/adg/adg-projection-private.h b/src/adg/adg-projection-private.h similarity index 100% rename from adg/adg-projection-private.h rename to src/adg/adg-projection-private.h diff --git a/adg/adg-projection.c b/src/adg/adg-projection.c similarity index 100% rename from adg/adg-projection.c rename to src/adg/adg-projection.c diff --git a/adg/adg-projection.h b/src/adg/adg-projection.h similarity index 100% rename from adg/adg-projection.h rename to src/adg/adg-projection.h diff --git a/adg/adg-rdim-private.h b/src/adg/adg-rdim-private.h similarity index 100% rename from adg/adg-rdim-private.h rename to src/adg/adg-rdim-private.h diff --git a/adg/adg-rdim.c b/src/adg/adg-rdim.c similarity index 100% rename from adg/adg-rdim.c rename to src/adg/adg-rdim.c diff --git a/adg/adg-rdim.h b/src/adg/adg-rdim.h similarity index 100% rename from adg/adg-rdim.h rename to src/adg/adg-rdim.h diff --git a/adg/adg-ruled-fill-private.h b/src/adg/adg-ruled-fill-private.h similarity index 100% rename from adg/adg-ruled-fill-private.h rename to src/adg/adg-ruled-fill-private.h diff --git a/adg/adg-ruled-fill.c b/src/adg/adg-ruled-fill.c similarity index 100% rename from adg/adg-ruled-fill.c rename to src/adg/adg-ruled-fill.c diff --git a/adg/adg-ruled-fill.h b/src/adg/adg-ruled-fill.h similarity index 100% rename from adg/adg-ruled-fill.h rename to src/adg/adg-ruled-fill.h diff --git a/adg/adg-segment.c b/src/adg/adg-segment.c similarity index 100% rename from adg/adg-segment.c rename to src/adg/adg-segment.c diff --git a/adg/adg-segment.h b/src/adg/adg-segment.h similarity index 100% rename from adg/adg-segment.h rename to src/adg/adg-segment.h diff --git a/adg/adg-stroke-private.h b/src/adg/adg-stroke-private.h similarity index 100% rename from adg/adg-stroke-private.h rename to src/adg/adg-stroke-private.h diff --git a/adg/adg-stroke.c b/src/adg/adg-stroke.c similarity index 100% rename from adg/adg-stroke.c rename to src/adg/adg-stroke.c diff --git a/adg/adg-stroke.h b/src/adg/adg-stroke.h similarity index 100% rename from adg/adg-stroke.h rename to src/adg/adg-stroke.h diff --git a/adg/adg-style.c b/src/adg/adg-style.c similarity index 100% rename from adg/adg-style.c rename to src/adg/adg-style.c diff --git a/adg/adg-style.h b/src/adg/adg-style.h similarity index 100% rename from adg/adg-style.h rename to src/adg/adg-style.h diff --git a/adg/adg-table-private.h b/src/adg/adg-table-private.h similarity index 100% rename from adg/adg-table-private.h rename to src/adg/adg-table-private.h diff --git a/adg/adg-table-style-private.h b/src/adg/adg-table-style-private.h similarity index 100% rename from adg/adg-table-style-private.h rename to src/adg/adg-table-style-private.h diff --git a/adg/adg-table-style.c b/src/adg/adg-table-style.c similarity index 100% rename from adg/adg-table-style.c rename to src/adg/adg-table-style.c diff --git a/adg/adg-table-style.h b/src/adg/adg-table-style.h similarity index 100% rename from adg/adg-table-style.h rename to src/adg/adg-table-style.h diff --git a/adg/adg-table.c b/src/adg/adg-table.c similarity index 100% rename from adg/adg-table.c rename to src/adg/adg-table.c diff --git a/adg/adg-table.h b/src/adg/adg-table.h similarity index 100% rename from adg/adg-table.h rename to src/adg/adg-table.h diff --git a/adg/adg-title-block-private.h b/src/adg/adg-title-block-private.h similarity index 100% rename from adg/adg-title-block-private.h rename to src/adg/adg-title-block-private.h diff --git a/adg/adg-title-block.c b/src/adg/adg-title-block.c similarity index 100% rename from adg/adg-title-block.c rename to src/adg/adg-title-block.c diff --git a/adg/adg-title-block.h b/src/adg/adg-title-block.h similarity index 100% rename from adg/adg-title-block.h rename to src/adg/adg-title-block.h diff --git a/adg/adg-toy-text-private.h b/src/adg/adg-toy-text-private.h similarity index 100% rename from adg/adg-toy-text-private.h rename to src/adg/adg-toy-text-private.h diff --git a/adg/adg-toy-text.c b/src/adg/adg-toy-text.c similarity index 100% rename from adg/adg-toy-text.c rename to src/adg/adg-toy-text.c diff --git a/adg/adg-toy-text.h b/src/adg/adg-toy-text.h similarity index 100% rename from adg/adg-toy-text.h rename to src/adg/adg-toy-text.h diff --git a/adg/adg-trail-private.h b/src/adg/adg-trail-private.h similarity index 100% rename from adg/adg-trail-private.h rename to src/adg/adg-trail-private.h diff --git a/adg/adg-trail.c b/src/adg/adg-trail.c similarity index 100% rename from adg/adg-trail.c rename to src/adg/adg-trail.c diff --git a/adg/adg-trail.h b/src/adg/adg-trail.h similarity index 100% rename from adg/adg-trail.h rename to src/adg/adg-trail.h diff --git a/adg/adg-type-builtins.c.mkenums b/src/adg/adg-type-builtins.c.mkenums similarity index 100% rename from adg/adg-type-builtins.c.mkenums rename to src/adg/adg-type-builtins.c.mkenums diff --git a/adg/adg-type-builtins.h.mkenums b/src/adg/adg-type-builtins.h.mkenums similarity index 100% rename from adg/adg-type-builtins.h.mkenums rename to src/adg/adg-type-builtins.h.mkenums diff --git a/adg/adg-util.c b/src/adg/adg-util.c similarity index 100% rename from adg/adg-util.c rename to src/adg/adg-util.c diff --git a/adg/adg-util.h b/src/adg/adg-util.h similarity index 100% rename from adg/adg-util.h rename to src/adg/adg-util.h diff --git a/adg/adg-widget-private.h b/src/adg/adg-widget-private.h similarity index 100% rename from adg/adg-widget-private.h rename to src/adg/adg-widget-private.h diff --git a/adg/adg-widget.c b/src/adg/adg-widget.c similarity index 100% rename from adg/adg-widget.c rename to src/adg/adg-widget.c diff --git a/adg/adg-widget.h b/src/adg/adg-widget.h similarity index 100% rename from adg/adg-widget.h rename to src/adg/adg-widget.h diff --git a/adg/adg.h b/src/adg/adg.h similarity index 100% rename from adg/adg.h rename to src/adg/adg.h diff --git a/adg/adg.pc.in b/src/adg/adg.pc.in similarity index 100% rename from adg/adg.pc.in rename to src/adg/adg.pc.in diff --git a/adg/tests/.gitignore b/src/adg/tests/.gitignore similarity index 100% rename from adg/tests/.gitignore rename to src/adg/tests/.gitignore diff --git a/adg/tests/Makefile.am b/src/adg/tests/Makefile.am similarity index 96% rename from adg/tests/Makefile.am rename to src/adg/tests/Makefile.am index c8e5655a..05321dd7 100644 --- a/adg/tests/Makefile.am +++ b/src/adg/tests/Makefile.am @@ -1,10 +1,10 @@ include $(top_srcdir)/build/Makefile.am.common AM_CFLAGS= -g @ADG_CFLAGS@ \ - -I$(top_srcdir) \ - -I$(top_builddir) + -I$(top_srcdir)/src \ + -I$(top_builddir)/src AM_LDFLAGS= @ADG_LIBS@ -LDADD= $(top_builddir)/adg/libadg.la +LDADD= $(top_builddir)/src/adg/libadg.la # file groups diff --git a/adg/tests/test-adim.c b/src/adg/tests/test-adim.c similarity index 100% rename from adg/tests/test-adim.c rename to src/adg/tests/test-adim.c diff --git a/adg/tests/test-alignment.c b/src/adg/tests/test-alignment.c similarity index 100% rename from adg/tests/test-alignment.c rename to src/adg/tests/test-alignment.c diff --git a/adg/tests/test-arrow.c b/src/adg/tests/test-arrow.c similarity index 100% rename from adg/tests/test-arrow.c rename to src/adg/tests/test-arrow.c diff --git a/adg/tests/test-color-style.c b/src/adg/tests/test-color-style.c similarity index 100% rename from adg/tests/test-color-style.c rename to src/adg/tests/test-color-style.c diff --git a/adg/tests/test-container.c b/src/adg/tests/test-container.c similarity index 100% rename from adg/tests/test-container.c rename to src/adg/tests/test-container.c diff --git a/adg/tests/test-dim-style.c b/src/adg/tests/test-dim-style.c similarity index 100% rename from adg/tests/test-dim-style.c rename to src/adg/tests/test-dim-style.c diff --git a/adg/tests/test-dim.c b/src/adg/tests/test-dim.c similarity index 100% rename from adg/tests/test-dim.c rename to src/adg/tests/test-dim.c diff --git a/adg/tests/test-edges.c b/src/adg/tests/test-edges.c similarity index 100% rename from adg/tests/test-edges.c rename to src/adg/tests/test-edges.c diff --git a/adg/tests/test-entity.c b/src/adg/tests/test-entity.c similarity index 100% rename from adg/tests/test-entity.c rename to src/adg/tests/test-entity.c diff --git a/adg/tests/test-fill-style.c b/src/adg/tests/test-fill-style.c similarity index 100% rename from adg/tests/test-fill-style.c rename to src/adg/tests/test-fill-style.c diff --git a/adg/tests/test-font-style.c b/src/adg/tests/test-font-style.c similarity index 100% rename from adg/tests/test-font-style.c rename to src/adg/tests/test-font-style.c diff --git a/adg/tests/test-hatch.c b/src/adg/tests/test-hatch.c similarity index 100% rename from adg/tests/test-hatch.c rename to src/adg/tests/test-hatch.c diff --git a/adg/tests/test-internal.c b/src/adg/tests/test-internal.c similarity index 100% rename from adg/tests/test-internal.c rename to src/adg/tests/test-internal.c diff --git a/adg/tests/test-internal.h b/src/adg/tests/test-internal.h similarity index 100% rename from adg/tests/test-internal.h rename to src/adg/tests/test-internal.h diff --git a/adg/tests/test-ldim.c b/src/adg/tests/test-ldim.c similarity index 100% rename from adg/tests/test-ldim.c rename to src/adg/tests/test-ldim.c diff --git a/adg/tests/test-line-style.c b/src/adg/tests/test-line-style.c similarity index 100% rename from adg/tests/test-line-style.c rename to src/adg/tests/test-line-style.c diff --git a/adg/tests/test-logo.c b/src/adg/tests/test-logo.c similarity index 100% rename from adg/tests/test-logo.c rename to src/adg/tests/test-logo.c diff --git a/adg/tests/test-marker.c b/src/adg/tests/test-marker.c similarity index 100% rename from adg/tests/test-marker.c rename to src/adg/tests/test-marker.c diff --git a/adg/tests/test-model.c b/src/adg/tests/test-model.c similarity index 100% rename from adg/tests/test-model.c rename to src/adg/tests/test-model.c diff --git a/adg/tests/test-projection.c b/src/adg/tests/test-projection.c similarity index 100% rename from adg/tests/test-projection.c rename to src/adg/tests/test-projection.c diff --git a/adg/tests/test-stroke.c b/src/adg/tests/test-stroke.c similarity index 100% rename from adg/tests/test-stroke.c rename to src/adg/tests/test-stroke.c diff --git a/adg/tests/test-table-style.c b/src/adg/tests/test-table-style.c similarity index 100% rename from adg/tests/test-table-style.c rename to src/adg/tests/test-table-style.c diff --git a/adg/tests/test-table.c b/src/adg/tests/test-table.c similarity index 100% rename from adg/tests/test-table.c rename to src/adg/tests/test-table.c diff --git a/adg/tests/test-title-block.c b/src/adg/tests/test-title-block.c similarity index 100% rename from adg/tests/test-title-block.c rename to src/adg/tests/test-title-block.c diff --git a/adg/tests/test-toy-text.c b/src/adg/tests/test-toy-text.c similarity index 100% rename from adg/tests/test-toy-text.c rename to src/adg/tests/test-toy-text.c diff --git a/adg/tests/test-widget.c b/src/adg/tests/test-widget.c similarity index 100% rename from adg/tests/test-widget.c rename to src/adg/tests/test-widget.c diff --git a/cpml/.gitignore b/src/cpml/.gitignore similarity index 100% rename from cpml/.gitignore rename to src/cpml/.gitignore diff --git a/cpml/Makefile.am b/src/cpml/Makefile.am similarity index 100% rename from cpml/Makefile.am rename to src/cpml/Makefile.am diff --git a/cpml/cpml-arc.c b/src/cpml/cpml-arc.c similarity index 100% rename from cpml/cpml-arc.c rename to src/cpml/cpml-arc.c diff --git a/cpml/cpml-arc.h b/src/cpml/cpml-arc.h similarity index 100% rename from cpml/cpml-arc.h rename to src/cpml/cpml-arc.h diff --git a/cpml/cpml-close.h b/src/cpml/cpml-close.h similarity index 100% rename from cpml/cpml-close.h rename to src/cpml/cpml-close.h diff --git a/cpml/cpml-curve.c b/src/cpml/cpml-curve.c similarity index 100% rename from cpml/cpml-curve.c rename to src/cpml/cpml-curve.c diff --git a/cpml/cpml-curve.h b/src/cpml/cpml-curve.h similarity index 100% rename from cpml/cpml-curve.h rename to src/cpml/cpml-curve.h diff --git a/cpml/cpml-extents.c b/src/cpml/cpml-extents.c similarity index 100% rename from cpml/cpml-extents.c rename to src/cpml/cpml-extents.c diff --git a/cpml/cpml-extents.h b/src/cpml/cpml-extents.h similarity index 100% rename from cpml/cpml-extents.h rename to src/cpml/cpml-extents.h diff --git a/cpml/cpml-internal.h b/src/cpml/cpml-internal.h similarity index 100% rename from cpml/cpml-internal.h rename to src/cpml/cpml-internal.h diff --git a/cpml/cpml-line.c b/src/cpml/cpml-line.c similarity index 100% rename from cpml/cpml-line.c rename to src/cpml/cpml-line.c diff --git a/cpml/cpml-line.h b/src/cpml/cpml-line.h similarity index 100% rename from cpml/cpml-line.h rename to src/cpml/cpml-line.h diff --git a/cpml/cpml-pair.c b/src/cpml/cpml-pair.c similarity index 100% rename from cpml/cpml-pair.c rename to src/cpml/cpml-pair.c diff --git a/cpml/cpml-pair.h b/src/cpml/cpml-pair.h similarity index 100% rename from cpml/cpml-pair.h rename to src/cpml/cpml-pair.h diff --git a/cpml/cpml-primitive-private.h b/src/cpml/cpml-primitive-private.h similarity index 100% rename from cpml/cpml-primitive-private.h rename to src/cpml/cpml-primitive-private.h diff --git a/cpml/cpml-primitive.c b/src/cpml/cpml-primitive.c similarity index 100% rename from cpml/cpml-primitive.c rename to src/cpml/cpml-primitive.c diff --git a/cpml/cpml-primitive.h b/src/cpml/cpml-primitive.h similarity index 100% rename from cpml/cpml-primitive.h rename to src/cpml/cpml-primitive.h diff --git a/cpml/cpml-segment.c b/src/cpml/cpml-segment.c similarity index 100% rename from cpml/cpml-segment.c rename to src/cpml/cpml-segment.c diff --git a/cpml/cpml-segment.h b/src/cpml/cpml-segment.h similarity index 100% rename from cpml/cpml-segment.h rename to src/cpml/cpml-segment.h diff --git a/cpml/cpml-util.c b/src/cpml/cpml-util.c similarity index 100% rename from cpml/cpml-util.c rename to src/cpml/cpml-util.c diff --git a/cpml/cpml-util.h b/src/cpml/cpml-util.h similarity index 100% rename from cpml/cpml-util.h rename to src/cpml/cpml-util.h diff --git a/cpml/cpml.h b/src/cpml/cpml.h similarity index 100% rename from cpml/cpml.h rename to src/cpml/cpml.h diff --git a/cpml/cpml.pc.in b/src/cpml/cpml.pc.in similarity index 100% rename from cpml/cpml.pc.in rename to src/cpml/cpml.pc.in -- 2.11.4.GIT