Rename gobject directory to codegen

diff --git a/Makefile.am b/Makefile.am
index e816fb0a8248f0b00567c61c943ecbe32690f442..fd434c9443c152b3d0aa906d800a8deaa6365cc3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ SUBDIRS = \
        gee \
        ccode \
        vala \
-       gobject \
+       codegen \
        compiler \
        vapi \
        tests \
@@ -23,7 +23,7 @@ DIST_SUBDIRS = \
        gee \
        ccode \
        vala \
-       gobject \
+       codegen \
        compiler \
        vapi \
        tests \

diff --git a/codegen/.gitignore b/codegen/.gitignore
new file mode 100644 (file)
index 0000000..b87c347
--- /dev/null
+++ b/codegen/.gitignore
@@ -0,0 +1 @@
+codegen.vapi

diff --git a/gobject/Makefile.am b/codegen/Makefile.am
similarity index 79%
rename from gobject/Makefile.am
rename to codegen/Makefile.am
index 0c7a1e4bef3faab24ff75db39f995ce1c8da0c61..1bd5fe9cc27f382990e9f862d338dfdba2c0fb15 100644 (file)
--- a/gobject/Makefile.am
+++ b/codegen/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(NULL)
 
-BUILT_SOURCES = gobject.vala.stamp
+BUILT_SOURCES = codegen.vala.stamp
 
 lib_LTLIBRARIES = \
        libvala.la
@@ -43,18 +43,18 @@ libvala_la_VALASOURCES = \
        $(NULL)
 
 libvala_la_SOURCES = \
-       gobject.vala.stamp \
+       codegen.vala.stamp \
        $(libvala_la_VALASOURCES:.vala=.c) \
        $(NULL)
 
-gobjectincludedir = $(includedir)/vala-1.0
+codegenincludedir = $(includedir)/vala-1.0
 
-gobjectinclude_HEADERS = \
-       valagobject.h \
+codegeninclude_HEADERS = \
+       valacodegen.h \
        $(NULL)
 
-gobject.vapi gobject.vala.stamp: $(libvala_la_VALASOURCES)
-       $(VALAC) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala -H valagobject.h --library gobject $^
+codegen.vapi codegen.vala.stamp: $(libvala_la_VALASOURCES)
+       $(VALAC) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala -H valacodegen.h --library codegen $^
        touch $@
 
 libvala_la_LDFLAGS = -no-undefined
@@ -64,11 +64,11 @@ libvala_la_LIBADD = \
        ../vala/libvalacore.la \
        $(NULL)
 
-EXTRA_DIST = $(libvala_la_VALASOURCES) gobject.vapi gobject.vala.stamp
+EXTRA_DIST = $(libvala_la_VALASOURCES) codegen.vapi codegen.vala.stamp
 
 MAINTAINERCLEANFILES = \
-       gobject.vapi \
-       valagobject.h \
+       codegen.vapi \
+       valacodegen.h \
        $(libvala_la_VALASOURCES:.vala=.c) \
        $(NULL)
 

diff --git a/gobject/valaccodearraymodule.vala b/codegen/valaccodearraymodule.vala
similarity index 100%
rename from gobject/valaccodearraymodule.vala
rename to codegen/valaccodearraymodule.vala

diff --git a/gobject/valaccodeassignmentmodule.vala b/codegen/valaccodeassignmentmodule.vala
similarity index 100%
rename from gobject/valaccodeassignmentmodule.vala
rename to codegen/valaccodeassignmentmodule.vala

diff --git a/gobject/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
similarity index 100%
rename from gobject/valaccodebasemodule.vala
rename to codegen/valaccodebasemodule.vala

diff --git a/gobject/valaccodecompiler.vala b/codegen/valaccodecompiler.vala
similarity index 100%
rename from gobject/valaccodecompiler.vala
rename to codegen/valaccodecompiler.vala

diff --git a/gobject/valaccodecontrolflowmodule.vala b/codegen/valaccodecontrolflowmodule.vala
similarity index 100%
rename from gobject/valaccodecontrolflowmodule.vala
rename to codegen/valaccodecontrolflowmodule.vala

diff --git a/gobject/valaccodedeclarationspace.vala b/codegen/valaccodedeclarationspace.vala
similarity index 100%
rename from gobject/valaccodedeclarationspace.vala
rename to codegen/valaccodedeclarationspace.vala

diff --git a/gobject/valaccodedelegatemodule.vala b/codegen/valaccodedelegatemodule.vala
similarity index 100%
rename from gobject/valaccodedelegatemodule.vala
rename to codegen/valaccodedelegatemodule.vala

diff --git a/gobject/valaccodegenerator.vala b/codegen/valaccodegenerator.vala
similarity index 100%
rename from gobject/valaccodegenerator.vala
rename to codegen/valaccodegenerator.vala

diff --git a/gobject/valaccodememberaccessmodule.vala b/codegen/valaccodememberaccessmodule.vala
similarity index 100%
rename from gobject/valaccodememberaccessmodule.vala
rename to codegen/valaccodememberaccessmodule.vala

diff --git a/gobject/valaccodemethodcallmodule.vala b/codegen/valaccodemethodcallmodule.vala
similarity index 100%
rename from gobject/valaccodemethodcallmodule.vala
rename to codegen/valaccodemethodcallmodule.vala

diff --git a/gobject/valaccodemethodmodule.vala b/codegen/valaccodemethodmodule.vala
similarity index 100%
rename from gobject/valaccodemethodmodule.vala
rename to codegen/valaccodemethodmodule.vala

diff --git a/gobject/valaccodemodule.vala b/codegen/valaccodemodule.vala
similarity index 100%
rename from gobject/valaccodemodule.vala
rename to codegen/valaccodemodule.vala

diff --git a/gobject/valaccodestructmodule.vala b/codegen/valaccodestructmodule.vala
similarity index 100%
rename from gobject/valaccodestructmodule.vala
rename to codegen/valaccodestructmodule.vala

diff --git a/gobject/valaclassregisterfunction.vala b/codegen/valaclassregisterfunction.vala
similarity index 100%
rename from gobject/valaclassregisterfunction.vala
rename to codegen/valaclassregisterfunction.vala

diff --git a/gobject/valadbusclientmodule.vala b/codegen/valadbusclientmodule.vala
similarity index 100%
rename from gobject/valadbusclientmodule.vala
rename to codegen/valadbusclientmodule.vala

diff --git a/gobject/valadbusmodule.vala b/codegen/valadbusmodule.vala
similarity index 100%
rename from gobject/valadbusmodule.vala
rename to codegen/valadbusmodule.vala

diff --git a/gobject/valadbusservermodule.vala b/codegen/valadbusservermodule.vala
similarity index 100%
rename from gobject/valadbusservermodule.vala
rename to codegen/valadbusservermodule.vala

diff --git a/gobject/valagasyncmodule.vala b/codegen/valagasyncmodule.vala
similarity index 100%
rename from gobject/valagasyncmodule.vala
rename to codegen/valagasyncmodule.vala

diff --git a/gobject/valagerrormodule.vala b/codegen/valagerrormodule.vala
similarity index 100%
rename from gobject/valagerrormodule.vala
rename to codegen/valagerrormodule.vala

diff --git a/gobject/valagirwriter.vala b/codegen/valagirwriter.vala
similarity index 100%
rename from gobject/valagirwriter.vala
rename to codegen/valagirwriter.vala

diff --git a/gobject/valagobjectmodule.vala b/codegen/valagobjectmodule.vala
similarity index 100%
rename from gobject/valagobjectmodule.vala
rename to codegen/valagobjectmodule.vala

diff --git a/gobject/valagsignalmodule.vala b/codegen/valagsignalmodule.vala
similarity index 100%
rename from gobject/valagsignalmodule.vala
rename to codegen/valagsignalmodule.vala

diff --git a/gobject/valagtypemodule.vala b/codegen/valagtypemodule.vala
similarity index 100%
rename from gobject/valagtypemodule.vala
rename to codegen/valagtypemodule.vala

diff --git a/gobject/valainterfaceregisterfunction.vala b/codegen/valainterfaceregisterfunction.vala
similarity index 100%
rename from gobject/valainterfaceregisterfunction.vala
rename to codegen/valainterfaceregisterfunction.vala

diff --git a/gobject/valastructregisterfunction.vala b/codegen/valastructregisterfunction.vala
similarity index 100%
rename from gobject/valastructregisterfunction.vala
rename to codegen/valastructregisterfunction.vala

diff --git a/gobject/valatyperegisterfunction.vala b/codegen/valatyperegisterfunction.vala
similarity index 100%
rename from gobject/valatyperegisterfunction.vala
rename to codegen/valatyperegisterfunction.vala

diff --git a/compiler/Makefile.am b/compiler/Makefile.am
index a50bd40cc1f1d303506764a47eb13c42d33921f6..74868749e9463a3ad4c7a92f7527b2ba1b88fc80 100644 (file)
--- a/compiler/Makefile.am
+++ b/compiler/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/gee \
        -I$(top_srcdir)/ccode \
        -I$(top_srcdir)/vala \
-       -I$(top_srcdir)/gobject \
+       -I$(top_srcdir)/codegen \
        $(GLIB_CFLAGS) \
        -include config.h \
        -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
@@ -26,12 +26,12 @@ valac_SOURCES = \
        $(NULL)
 
 valac.vala.stamp: $(valac_VALASOURCES)
-       $(VALAC) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject --pkg gobject --pkg config $^
+       $(VALAC) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../codegen --pkg codegen --pkg config $^
        touch $@
 
 valac_LDADD = \
        $(GLIB_LIBS) \
-       ../gobject/libvala.la \
+       ../codegen/libvala.la \
        $(NULL)
 
 EXTRA_DIST = $(valac_VALASOURCES) valac.vala.stamp

diff --git a/configure.ac b/configure.ac
index cbf5bad6c9ba704a6648b58c8e5eed6c2d2458a4..b8e21398cfd08c03efd259f6dc7dd0e208a302fa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -68,7 +68,7 @@ AC_CONFIG_FILES([Makefile
            gee/Makefile
            ccode/Makefile
            vala/Makefile
-           gobject/Makefile
+           codegen/Makefile
            compiler/Makefile
            vapi/Makefile
            tests/Makefile

diff --git a/gobject/.gitignore b/gobject/.gitignore
deleted file mode 100644 (file)
index 6371cb0..0000000
--- a/gobject/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-gobject.vapi

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index e2733b9f825922f79445101ce4f77be29101e410..1204a0150614f669147281707abb67bd95f135c3 100644 (file)
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 vapidir = $(pkgdatadir)/vapi
 
-vala-1.0.vapi: ../gee/gee.vapi ../ccode/ccode.vapi ../vala/vala.vapi ../gobject/gobject.vapi
+vala-1.0.vapi: ../gee/gee.vapi ../ccode/ccode.vapi ../vala/vala.vapi ../codegen/codegen.vapi
        cat $^ > $@
 
 dist_vapi_DATA = \

diff --git a/vapigen/Makefile.am b/vapigen/Makefile.am
index 83fccfa19101f4005f08658bb982992056982fdc..55fb4e176752fdb9ed7325e20368489309e9f46a 100644 (file)
--- a/vapigen/Makefile.am
+++ b/vapigen/Makefile.am
@@ -53,14 +53,14 @@ vapicheck.vala.stamp: $(vapicheck_VALASOURCES)
 vapigen_LDADD = \
        $(GLIB_LIBS) \
        ../gee/libgee.la \
-       ../gobject/libvala.la \
+       ../codegen/libvala.la \
        ../gobject-introspection/libgidl.la \
        $(NULL)
 
 vapicheck_LDADD = \
        $(GLIB_LIBS) \
        ../gee/libgee.la \
-       ../gobject/libvala.la \
+       ../codegen/libvala.la \
        ../gobject-introspection/libgidl.la \
        $(NULL)