summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog41
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac6
-rw-r--r--gidl/Makefile.am1
-rw-r--r--girepository/Makefile.am16
-rw-r--r--girepository/ginfo.c (renamed from src/ginfo.c)0
-rw-r--r--girepository/ginvoke.c (renamed from src/ginvoke.c)0
-rw-r--r--girepository/girepository.c (renamed from src/girepository.c)0
-rw-r--r--girepository/girepository.h (renamed from src/girepository.h)0
-rw-r--r--girepository/gmetadata.c (renamed from src/gmetadata.c)0
-rw-r--r--girepository/gmetadata.h (renamed from src/gmetadata.h)0
-rw-r--r--src/Makefile.am46
-rw-r--r--tests/Makefile.am16
-rw-r--r--tests/invoke/Makefile.am14
-rw-r--r--tests/parser/Makefile.am13
-rwxr-xr-xtests/roundtrips.sh24
-rw-r--r--tools/Makefile.am39
-rw-r--r--tools/compiler.c (renamed from src/compiler.c)0
-rwxr-xr-xtools/g-idl-offsets.pl (renamed from src/g-idl-offsets.pl)0
-rw-r--r--tools/generate.c (renamed from src/generate.c)0
-rw-r--r--tools/gidlmodule.c (renamed from src/gidlmodule.c)0
-rw-r--r--tools/gidlmodule.h (renamed from src/gidlmodule.h)0
-rw-r--r--tools/gidlnode.c (renamed from src/gidlnode.c)0
-rw-r--r--tools/gidlnode.h (renamed from src/gidlnode.h)0
-rw-r--r--tools/gidlparser.c (renamed from src/gidlparser.c)0
-rw-r--r--tools/gidlparser.h (renamed from src/gidlparser.h)0
-rw-r--r--tools/gidlwriter.c (renamed from src/gidlwriter.c)0
-rw-r--r--tools/gidlwriter.h (renamed from src/gidlwriter.h)0
-rw-r--r--tools/scanner.c (renamed from src/scanner.c)0
-rw-r--r--tools/scanner.h (renamed from src/scanner.h)0
-rw-r--r--tools/scannerlexer.l (renamed from src/scannerlexer.l)0
-rw-r--r--tools/scannerparser.y (renamed from src/scannerparser.y)0
32 files changed, 143 insertions, 75 deletions
diff --git a/ChangeLog b/ChangeLog
index 35847682..6caf8838 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+2008-02-08 Rob Taylor <rob.taylor@codethink.co.uk>
+
+ * Makefile.am:
+ * configure.ac:
+ * gidl/Makefile.am: Added:
+ * girepository/Makefile.am: Added:
+ * src/Makefile.am: Renamed to tools/Makefile.am:
+ * src/compiler.c: Renamed to tools/compiler.c:
+ * src/g-idl-offsets.pl: Renamed to tools/g-idl-offsets.pl:
+ * src/generate.c: Renamed to tools/generate.c:
+ * src/gidlmodule.c: Renamed to tools/gidlmodule.c:
+ * src/gidlmodule.h: Renamed to tools/gidlmodule.h:
+ * src/gidlnode.c: Renamed to tools/gidlnode.c:
+ * src/gidlnode.h: Renamed to tools/gidlnode.h:
+ * src/gidlparser.c: Renamed to tools/gidlparser.c:
+ * src/gidlparser.h: Renamed to tools/gidlparser.h:
+ * src/gidlwriter.c: Renamed to tools/gidlwriter.c:
+ * src/gidlwriter.h: Renamed to tools/gidlwriter.h:
+ * src/ginfo.c: Renamed to girepository/ginfo.c:
+ * src/ginvoke.c: Renamed to girepository/ginvoke.c:
+ * src/girepository.c: Renamed to girepository/girepository.c:
+ * src/girepository.h: Renamed to girepository/girepository.h:
+ * src/gmetadata.c: Renamed to girepository/gmetadata.c:
+ * src/gmetadata.h: Renamed to girepository/gmetadata.h:
+ * src/scanner.c: Renamed to tools/scanner.c:
+ * src/scanner.h: Renamed to tools/scanner.h:
+ * src/scannerlexer.l: Renamed to tools/scannerlexer.l:
+ * src/scannerparser.y: Renamed to tools/scannerparser.y:
+ * tests/invoke/Makefile.am:
+ Split src/ into girepository/ and tools/
+
+ * Makefile.am:
+ * configure.ac:
+ * girepository/Makefile.am:
+ * tests/Makefile.am:
+ * tests/invoke/Makefile.am:
+ * tests/parser/Makefile.am:
+ * tests/roundtrips.sh:
+ * tools/Makefile.am:
+ Make distcheck work.
+
2008-02-04 Rob Taylor <rob.taylor@codethink.co.uk>
* tests/invoke/invoke.c: (main):
diff --git a/Makefile.am b/Makefile.am
index 1d3483fc..8a336995 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = src tests
+SUBDIRS = gidl girepository tools tests
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gobject-introspection.pc
diff --git a/configure.ac b/configure.ac
index 52e0d2da..44fe0ab1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_PREREQ(2.59)
AC_INIT(gobject-introspection, 0.1, http://bugzilla.gnome.org/enter_bug.cgi?product=glib)
AM_INIT_AUTOMAKE([1.7])
AM_MAINTAINER_MODE
-AC_CONFIG_SRCDIR([src/ginvoke.c])
+AC_CONFIG_SRCDIR([girepository/ginvoke.c])
AC_CONFIG_HEADER([config.h])
# Checks for programs.
@@ -87,7 +87,9 @@ AC_FUNC_STRTOD
AC_CHECK_FUNCS([memchr strchr strspn strstr strtol strtoull])
AC_CONFIG_FILES([Makefile
- src/Makefile
+ gidl/Makefile
+ girepository/Makefile
+ tools/Makefile
tests/Makefile
tests/invoke/Makefile
tests/parser/Makefile
diff --git a/gidl/Makefile.am b/gidl/Makefile.am
new file mode 100644
index 00000000..829c73e8
--- /dev/null
+++ b/gidl/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = GLib.gidl
diff --git a/girepository/Makefile.am b/girepository/Makefile.am
new file mode 100644
index 00000000..480e95f6
--- /dev/null
+++ b/girepository/Makefile.am
@@ -0,0 +1,16 @@
+## Process this file with automake to produce Makefile.in
+
+INCLUDES = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\""
+
+lib_LTLIBRARIES = libgirepository.la
+
+libgirepository_la_SOURCES = \
+ girepository.c \
+ gmetadata.h \
+ gmetadata.c \
+ ginfo.c \
+ ginvoke.c
+libgirepository_la_CFLAGS = $(GIREPO_CFLAGS)
+
+girepodir = $(includedir)/glib-2.0/gobject-introspection
+girepo_HEADERS = girepository.h
diff --git a/src/ginfo.c b/girepository/ginfo.c
index 6d66de21..6d66de21 100644
--- a/src/ginfo.c
+++ b/girepository/ginfo.c
diff --git a/src/ginvoke.c b/girepository/ginvoke.c
index 986ca785..986ca785 100644
--- a/src/ginvoke.c
+++ b/girepository/ginvoke.c
diff --git a/src/girepository.c b/girepository/girepository.c
index c9b3b683..c9b3b683 100644
--- a/src/girepository.c
+++ b/girepository/girepository.c
diff --git a/src/girepository.h b/girepository/girepository.h
index 7ad1067a..7ad1067a 100644
--- a/src/girepository.h
+++ b/girepository/girepository.h
diff --git a/src/gmetadata.c b/girepository/gmetadata.c
index b6803904..b6803904 100644
--- a/src/gmetadata.c
+++ b/girepository/gmetadata.c
diff --git a/src/gmetadata.h b/girepository/gmetadata.h
index a22ee235..a22ee235 100644
--- a/src/gmetadata.h
+++ b/girepository/gmetadata.h
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index b29ef5f6..00000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-INCLUDES = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\""
-BUILT_SOURCES = scannerparser.c scannerparser.h scannerlexer.c scannerlexer.h
-CLEANFILES = scannerparser.c scannerparser.h scannerlexer.c scannerlexer.h
-AM_YFLAGS = -d
-
-# Why do I have to do this automake?
-scannerlexer.h: scannerlexer.c
-
-noinst_LTLIBRARIES = libgirepository-parser.la
-lib_LTLIBRARIES = libgirepository.la
-bin_PROGRAMS = g-idl-compiler g-idl-generate g-idl-scanner
-
-libgirepository_la_SOURCES = \
- girepository.c \
- gmetadata.c \
- ginfo.c \
- ginvoke.c
-libgirepository_la_CFLAGS = $(GIREPO_CFLAGS)
-
-libgirepository_parser_la_SOURCES = \
- gidlmodule.c \
- gidlnode.c \
- gidlparser.c
-libgirepository_parser_la_CFLAGS = $(GIREPO_CFLAGS)
-
-g_idl_compiler_SOURCES = compiler.c
-g_idl_compiler_CFLAGS = $(GIREPO_CFLAGS)
-g_idl_compiler_LDADD = $(GIREPO_LIBS) libgirepository.la libgirepository-parser.la
-
-g_idl_generate_SOURCES = generate.c
-g_idl_generate_CFLAGS = $(GIREPO_CFLAGS)
-g_idl_generate_LDADD = $(GIREPO_LIBS) libgirepository.la
-
-g_idl_scanner_SOURCES = \
- scanner.c \
- scanner.h \
- scannerlexer.l \
- scannerparser.y \
- gidlwriter.c
-g_idl_scanner_CFLAGS = $(GIREPO_CFLAGS) $(SCANNER_CFLAGS)
-g_idl_scanner_LDADD = $(GIREPO_LIBS) $(SCANNER_LIBS) libgirepository.la libgirepository-parser.la
-
-girepodir = $(includedir)/glib-2.0/gobject-introspection
-girepo_HEADERS = girepository.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 66de828e..7dc01659 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,18 @@
SUBDIRS = . invoke parser
-TESTS = roundtrips.sh
+EXTRA_DIST = \
+ roundtrips.sh \
+ array.test \
+ boxed.test \
+ enum.test \
+ errors.test \
+ function.test \
+ gobject.test \
+ interface.test \
+ object.test \
+ struct.test \
+ union.test \
+ xref1.test \
+ xref2.test
+TESTS = roundtrips.sh
diff --git a/tests/invoke/Makefile.am b/tests/invoke/Makefile.am
index 0c45d972..f5ff163b 100644
--- a/tests/invoke/Makefile.am
+++ b/tests/invoke/Makefile.am
@@ -9,25 +9,25 @@ install-testlibLTLIBRARIES: # prevent it from being installed
testfns_la_SOURCES = \
testfns.c \
testfns-metadata.c
-testfns_la_CFLAGS = $(GIREPO_CFLAGS) -I ../../src
+testfns_la_CFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
testfns_la_LDFLAGS = -module -avoid-version
-testfns_la_LIBADD = $(GIREPO_LIBS) ../../src/libgirepository.la
+testfns_la_LIBADD = $(GIREPO_LIBS) $(top_builddir)/girepository/libgirepository.la
BUILT_SOURCES = testfns-metadata.c test.repo
CLEANFILES = testfns-metadata.c test.repo
testfns-metadata.c: testfns.xml
- ../../src/g-idl-compiler $(srcdir)/testfns.xml -o testfns-metadata.c
+ $(top_builddir)/tools/g-idl-compiler $(srcdir)/testfns.xml -o testfns-metadata.c
test.repo: testfns.xml
- ../../src/g-idl-compiler --shared-library testfns.la $< --raw -o $@
+ $(top_builddir)/tools/g-idl-compiler --shared-library testfns.la $< --raw -o $@
invoke_SOURCES = invoke.c
-invoke_CFLAGS = $(GIREPO_CFLAGS) -I ../../src
-invoke_LDADD = $(GIREPO_LIBS) ../../src/libgirepository.la
+invoke_CFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
+invoke_LDADD = $(GIREPO_LIBS) $(top_builddir)/girepository/libgirepository.la
TESTS = invoke invoke-namespace-find.sh
-EXTRA_DIST = invoke-namespace-find.sh
+EXTRA_DIST = invoke-namespace-find.sh testfns.xml
TESTS_ENVIRONMENT = GIREPOPATH="."
diff --git a/tests/parser/Makefile.am b/tests/parser/Makefile.am
index a4b096f2..409ebc9b 100644
--- a/tests/parser/Makefile.am
+++ b/tests/parser/Makefile.am
@@ -2,7 +2,7 @@ testlib_LTLIBRARIES = libfoo.la
testlibdir = /tmp
install-testlibLTLIBRARIES: # prevent it from being installed
-libfoo_la_SOURCES = foo.c
+libfoo_la_SOURCES = foo.c foo-object.h
libfoo_la_CFLAGS = $(GOBJECT_CFLAGS)
libfoo_la_LDFLAGS = -module -avoid-version
@@ -10,17 +10,18 @@ libfoo_la_LIBADD = $(GOBJECT_LIBS)
BUILT_SOURCES = Foo.gidl
CLEANFILES = Foo.gidl
+EXTRA_DIST = Foo-expected.gidl
-SCAN_SOURCES = foo-object.h
+SCAN_SOURCES = $(srcdir)/foo-object.h
-Foo.gidl: libfoo.la foo-object.h $(top_builddir)/src/g-idl-scanner
- G_DEBUG=fatal_warnings $(top_builddir)/src/g-idl-scanner -v --namespace=Foo \
+Foo.gidl: libfoo.la foo-object.h $(top_builddir)/tools/g-idl-scanner
+ G_DEBUG=fatal_warnings $(top_builddir)/tools/g-idl-scanner -v --namespace=Foo \
--include-idl=$(top_srcdir)/gidl/GLib.gidl \
- $(SCAN_SOURCES) -I. $(GOBJECT_CFLAGS) \
+ $(SCAN_SOURCES) -I$(srcdir) $(GOBJECT_CFLAGS) \
libfoo.la --output $@
check-local:
- @diff -u Foo-expected.gidl Foo.gidl && echo "Foo.gidl"
+ @diff -u $(srcdir)/Foo-expected.gidl Foo.gidl && echo "Foo.gidl"
@echo "======================="
@echo "All parser tests passed"
@echo "======================="
diff --git a/tests/roundtrips.sh b/tests/roundtrips.sh
index 148d6eda..65ef78a4 100755
--- a/tests/roundtrips.sh
+++ b/tests/roundtrips.sh
@@ -4,23 +4,23 @@ SIMPLE_TESTS="array.test boxed.test enum.test errors.test function.test interfac
for i in $SIMPLE_TESTS; do
echo $i
- ../src/g-idl-compiler --raw $i > $i.1;
- ../src/g-idl-generate --raw $i.1 > $i.2;
- diff -u $i $i.2 || exit 1;
+ ../tools/g-idl-compiler --raw $srcdir/$i > $i.1;
+ ../tools/g-idl-generate --raw $i.1 > $i.2;
+ diff -u $srcdir/$i $i.2 || exit 1;
rm $i.1 $i.2
done
-../src/g-idl-compiler --raw --module=Foo object.test gobject.test > object.test.1
-../src/g-idl-generate --raw object.test.1 > object.test.2
-diff -u object.test object.test.2 || exit 1
+../tools/g-idl-compiler --raw --module=Foo $srcdir/object.test $srcdir/gobject.test > object.test.1
+../tools/g-idl-generate --raw object.test.1 > object.test.2
+diff -u $srcdir/object.test object.test.2 || exit 1
rm object.test.1 object.test.2
-../src/g-idl-compiler --raw --module=Foo xref1.test xref2.test > xref1.test.1
-../src/g-idl-generate --raw xref1.test.1 > xref1.test.2
-diff -u xref1.test xref1.test.2 || exit 1
+../tools/g-idl-compiler --raw --module=Foo $srcdir/xref1.test $srcdir/xref2.test > xref1.test.1
+../tools/g-idl-generate --raw xref1.test.1 > xref1.test.2
+diff -u $srcdir/xref1.test xref1.test.2 || exit 1
rm xref1.test.1 xref1.test.2
-../src/g-idl-compiler --raw --module=Bar xref1.test xref2.test > xref2.test.1
-../src/g-idl-generate --raw xref2.test.1 > xref2.test.2
-diff -u xref2.test xref2.test.2 || exit 1
+../tools/g-idl-compiler --raw --module=Bar $srcdir/xref1.test $srcdir/xref2.test > xref2.test.1
+../tools/g-idl-generate --raw xref2.test.1 > xref2.test.2
+diff -u $srcdir/xref2.test xref2.test.2 || exit 1
rm xref2.test.1 xref2.test.2
diff --git a/tools/Makefile.am b/tools/Makefile.am
new file mode 100644
index 00000000..eb2d144f
--- /dev/null
+++ b/tools/Makefile.am
@@ -0,0 +1,39 @@
+## Process this file with automake to produce Makefile.in
+
+INCLUDES = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\""
+BUILT_SOURCES = scannerparser.c scannerparser.h scannerlexer.c scannerlexer.h
+CLEANFILES = scannerparser.c scannerparser.h scannerlexer.c scannerlexer.h
+AM_YFLAGS = -d
+
+# Why do I have to do this automake?
+scannerlexer.h: scannerlexer.c
+
+noinst_LTLIBRARIES = libgirepository-parser.la
+bin_PROGRAMS = g-idl-compiler g-idl-generate g-idl-scanner
+
+libgirepository_parser_la_SOURCES = \
+ gidlmodule.c \
+ gidlmodule.h \
+ gidlnode.c \
+ gidlnode.h \
+ gidlparser.c \
+ gidlparser.h
+libgirepository_parser_la_CFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
+
+g_idl_compiler_SOURCES = compiler.c
+g_idl_compiler_CFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
+g_idl_compiler_LDADD = $(GIREPO_LIBS) $(top_builddir)/girepository/libgirepository.la libgirepository-parser.la
+
+g_idl_generate_SOURCES = generate.c
+g_idl_generate_CFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
+g_idl_generate_LDADD = $(GIREPO_LIBS) $(top_builddir)/girepository/libgirepository.la
+
+g_idl_scanner_SOURCES = \
+ scanner.c \
+ scanner.h \
+ scannerlexer.l \
+ scannerparser.y \
+ gidlwriter.c \
+ gidlwriter.h
+g_idl_scanner_CFLAGS = $(GIREPO_CFLAGS) $(SCANNER_CFLAGS) -I$(top_srcdir)/girepository
+g_idl_scanner_LDADD = $(GIREPO_LIBS) $(SCANNER_LIBS) $(top_builddir)/girepository/libgirepository.la libgirepository-parser.la
diff --git a/src/compiler.c b/tools/compiler.c
index 1c91632e..1c91632e 100644
--- a/src/compiler.c
+++ b/tools/compiler.c
diff --git a/src/g-idl-offsets.pl b/tools/g-idl-offsets.pl
index 55318708..55318708 100755
--- a/src/g-idl-offsets.pl
+++ b/tools/g-idl-offsets.pl
diff --git a/src/generate.c b/tools/generate.c
index 8ae6fc35..8ae6fc35 100644
--- a/src/generate.c
+++ b/tools/generate.c
diff --git a/src/gidlmodule.c b/tools/gidlmodule.c
index d17a249a..d17a249a 100644
--- a/src/gidlmodule.c
+++ b/tools/gidlmodule.c
diff --git a/src/gidlmodule.h b/tools/gidlmodule.h
index 3564a75f..3564a75f 100644
--- a/src/gidlmodule.h
+++ b/tools/gidlmodule.h
diff --git a/src/gidlnode.c b/tools/gidlnode.c
index f70cffb5..f70cffb5 100644
--- a/src/gidlnode.c
+++ b/tools/gidlnode.c
diff --git a/src/gidlnode.h b/tools/gidlnode.h
index 4ba97b1b..4ba97b1b 100644
--- a/src/gidlnode.h
+++ b/tools/gidlnode.h
diff --git a/src/gidlparser.c b/tools/gidlparser.c
index 3d529261..3d529261 100644
--- a/src/gidlparser.c
+++ b/tools/gidlparser.c
diff --git a/src/gidlparser.h b/tools/gidlparser.h
index 2d71aaa0..2d71aaa0 100644
--- a/src/gidlparser.h
+++ b/tools/gidlparser.h
diff --git a/src/gidlwriter.c b/tools/gidlwriter.c
index d46762bc..d46762bc 100644
--- a/src/gidlwriter.c
+++ b/tools/gidlwriter.c
diff --git a/src/gidlwriter.h b/tools/gidlwriter.h
index 5d41a0c6..5d41a0c6 100644
--- a/src/gidlwriter.h
+++ b/tools/gidlwriter.h
diff --git a/src/scanner.c b/tools/scanner.c
index abbe2156..abbe2156 100644
--- a/src/scanner.c
+++ b/tools/scanner.c
diff --git a/src/scanner.h b/tools/scanner.h
index b2140759..b2140759 100644
--- a/src/scanner.h
+++ b/tools/scanner.h
diff --git a/src/scannerlexer.l b/tools/scannerlexer.l
index 114b736c..114b736c 100644
--- a/src/scannerlexer.l
+++ b/tools/scannerlexer.l
diff --git a/src/scannerparser.y b/tools/scannerparser.y
index fae5067d..fae5067d 100644
--- a/src/scannerparser.y
+++ b/tools/scannerparser.y
View Lorry Controller Status