Move shared *.[ch] files to girepository from tools

2008-08-09  Johan Dahlin  <johan@gnome.org>

    * girepository/Makefile.am:
    * tools/Makefile.am:
    * tools/girmodule.c:
    * tools/girmodule.h:
    * tools/girnode.c:
    * tools/girnode.h:
    * tools/girparser.c:
    * tools/girparser.h:
    * tools/girwriter.c:
    * tools/girwriter.h:
    Move shared *.[ch] files to girepository from tools

svn path=/trunk/; revision=337

diff --git a/ChangeLog b/ChangeLog
index e49932c..c3f47ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2008-08-09  Johan Dahlin  <johan@gnome.org>
 
+       * girepository/Makefile.am:
+       * tools/Makefile.am:
+       * tools/girmodule.c:
+       * tools/girmodule.h:
+       * tools/girnode.c:
+       * tools/girnode.h:
+       * tools/girparser.c:
+       * tools/girparser.h:
+       * tools/girwriter.c:
+       * tools/girwriter.h:
+       Move shared *.[ch] files to girepository from tools
+
+2008-08-09  Johan Dahlin  <johan@gnome.org>
+
        * tests/Makefile.am:
        * tests/array.test:
        * tests/boxed.test:

diff --git a/girepository/Makefile.am b/girepository/Makefile.am
index 7903363..36e7baf 100644 (file)
--- a/girepository/Makefile.am
+++ b/girepository/Makefile.am
@@ -1,10 +1,14 @@
-## Process this file with automake to produce Makefile.in
-
 include $(top_srcdir)/gcov.mak
 
+GCOVSOURCES = $(libgirepository_la_SOURCES)
+
 INCLUDES = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\""
 
+girepodir = $(includedir)/gobject-introspection-1.0/
+girepo_HEADERS = girepository.h
+
 lib_LTLIBRARIES = libgirepository.la
+noinst_LTLIBRARIES = libgirepository-parser.la
 
 libgirepository_la_SOURCES =                   \
        girepository.c                          \
@@ -15,7 +19,12 @@ libgirepository_la_SOURCES =                 \
 libgirepository_la_CPPFLAGS = $(GIREPO_CFLAGS)
 libgirepository_la_LIBADD = $(GIREPO_LIBS)
 
-girepodir = $(includedir)/gobject-introspection-1.0/
-girepo_HEADERS = girepository.h
+libgirepository_parser_la_SOURCES =            \
+       girmodule.c                             \
+       girmodule.h                             \
+       girnode.c                               \
+       girnode.h                               \
+       girparser.c                             \
+       girparser.h
+libgirepository_parser_la_CFLAGS = $(GIREPO_CFLAGS)
 
-GCOVSOURCES = $(libgirepository_la_SOURCES)

diff --git a/tools/girmodule.c b/girepository/girmodule.c
similarity index 100%
rename from tools/girmodule.c
rename to girepository/girmodule.c

diff --git a/tools/girmodule.h b/girepository/girmodule.h
similarity index 100%
rename from tools/girmodule.h
rename to girepository/girmodule.h

diff --git a/tools/girnode.c b/girepository/girnode.c
similarity index 100%
rename from tools/girnode.c
rename to girepository/girnode.c

diff --git a/tools/girnode.h b/girepository/girnode.h
similarity index 100%
rename from tools/girnode.h
rename to girepository/girnode.h

diff --git a/tools/girparser.c b/girepository/girparser.c
similarity index 100%
rename from tools/girparser.c
rename to girepository/girparser.c

diff --git a/tools/girparser.h b/girepository/girparser.h
similarity index 100%
rename from tools/girparser.h
rename to girepository/girparser.h

diff --git a/tools/girwriter.c b/girepository/girwriter.c
similarity index 100%
rename from tools/girwriter.c
rename to girepository/girwriter.c

diff --git a/tools/girwriter.h b/girepository/girwriter.h
similarity index 100%
rename from tools/girwriter.h
rename to girepository/girwriter.h

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 2fb0e66..17fd008 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,36 +1,25 @@
-## Process this file with automake to produce Makefile.in
+include $(top_srcdir)/gcov.mak
 
 INCLUDES = \
        -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\"" \
-       -I$(top_srcdir)/girepository \
-       -I$(top_srcdir)/giscanner
-
-EXTRA_DIST = g-ir-scanner
+       -I$(top_srcdir)/girepository
 
-noinst_LTLIBRARIES = libgirepository-parser.la
 bin_PROGRAMS = g-ir-compiler g-ir-generate
 bin_SCRIPTS = g-ir-scanner
 
-libgirepository_parser_la_SOURCES =            \
-       girmodule.c                             \
-       girmodule.h                             \
-       girnode.c                               \
-       girnode.h                               \
-       girparser.c                             \
-       girparser.h
-libgirepository_parser_la_CFLAGS = $(GIREPO_CFLAGS)
-
 g_ir_compiler_SOURCES = compiler.c     
 g_ir_compiler_CFLAGS = $(GIREPO_CFLAGS)
-g_ir_compiler_LDADD = $(GIREPO_LIBS) $(top_builddir)/girepository/libgirepository.la libgirepository-parser.la
+g_ir_compiler_LDADD = \
+       $(GIREPO_LIBS) \
+       $(top_builddir)/girepository/libgirepository.la \
+       $(top_builddir)/girepository/libgirepository-parser.la
 
 g_ir_generate_SOURCES = generate.c
 g_ir_generate_CFLAGS = $(GIREPO_CFLAGS)
-g_ir_generate_LDADD = $(GIREPO_LIBS) $(top_builddir)/girepository/libgirepository.la
+g_ir_generate_LDADD = \
+       $(GIREPO_LIBS) \
+       $(top_builddir)/girepository/libgirepository.la
 
 GCOVSOURCES =                                  \
-       $(libgirepository_la_SOURCES)           \
        $(g_ir_compiler_SOURCES)                \
        $(g_ir_generate_SOURCES)
-
-include $(top_srcdir)/gcov.mak