gobject-introspection r337 - in trunk: . girepository tools

[johan svn gnome org]

Author: johan
Date: Sat Aug  9 12:46:48 2008
New Revision: 337
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=337&view=rev

Log:
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



Added:
   trunk/girepository/girmodule.c
      - copied unchanged from r333, /trunk/tools/girmodule.c
   trunk/girepository/girmodule.h
      - copied unchanged from r333, /trunk/tools/girmodule.h
   trunk/girepository/girnode.c
      - copied unchanged from r333, /trunk/tools/girnode.c
   trunk/girepository/girnode.h
      - copied unchanged from r333, /trunk/tools/girnode.h
   trunk/girepository/girparser.c
      - copied unchanged from r333, /trunk/tools/girparser.c
   trunk/girepository/girparser.h
      - copied unchanged from r333, /trunk/tools/girparser.h
   trunk/girepository/girwriter.c
      - copied unchanged from r333, /trunk/tools/girwriter.c
   trunk/girepository/girwriter.h
      - copied unchanged from r333, /trunk/tools/girwriter.h
Removed:
   trunk/tools/girmodule.c
   trunk/tools/girmodule.h
   trunk/tools/girnode.c
   trunk/tools/girnode.h
   trunk/tools/girparser.c
   trunk/tools/girparser.h
   trunk/tools/girwriter.c
   trunk/tools/girwriter.h
Modified:
   trunk/ChangeLog
   trunk/girepository/Makefile.am
   trunk/tools/Makefile.am

Modified: trunk/girepository/Makefile.am
==============================================================================
--- trunk/girepository/Makefile.am	(original)
+++ trunk/girepository/Makefile.am	Sat Aug  9 12:46:48 2008
@@ -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_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)

Modified: trunk/tools/Makefile.am
==============================================================================
--- trunk/tools/Makefile.am	(original)
+++ trunk/tools/Makefile.am	Sat Aug  9 12:46:48 2008
@@ -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