build: Make ccode and codegen private API

valac is the only consumer and will statically link these libraries.

diff --git a/Makefile.am b/Makefile.am
index eb4f1ad569abb3ec6f3e2306437967e3793e9951..813b3fc089cba8ff6980e918ed78d0a663bb6f7e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,8 @@ NULL =
 
 SUBDIRS = \
        gee \
-       ccode \
        vala \
+       ccode \
        codegen \
        compiler \
        vapi \

diff --git a/ccode/Makefile.am b/ccode/Makefile.am
index 0402f62695d4d3b12186533ab6240514509b8d4c..3e384d784b402924d3a19492a359a1c35872d03a 100644 (file)
--- a/ccode/Makefile.am
+++ b/ccode/Makefile.am
@@ -75,12 +75,6 @@ libvalaccode_la_SOURCES = \
        $(libvalaccode_la_VALASOURCES:.vala=.c) \
        $(NULL)
 
-ccodeincludedir = $(includedir)/vala@PACKAGE_SUFFIX@
-
-ccodeinclude_HEADERS = \
-       valaccode.h \
-       $(NULL)
-
 ccode.vapi ccode.vala.stamp: $(libvalaccode_la_VALASOURCES)
        $(VALA_V)$(VALAC) \
                $(COVERAGE_VALAFLAGS) \
@@ -97,6 +91,7 @@ ccode.vapi ccode.vala.stamp: $(libvalaccode_la_VALASOURCES)
 libvalaccode_la_LIBADD = \
        $(COVERAGE_LIBS) \
        $(GLIB_LIBS) \
+       $(top_builddir)/vala/libvala@PACKAGE_SUFFIX@.la \
        $(NULL)
 
 EXTRA_DIST = $(libvalaccode_la_VALASOURCES) ccode.vapi ccode.vala.stamp

diff --git a/codegen/Makefile.am b/codegen/Makefile.am
index a20e24f36a134142958d8cda1612d2c3e8f44184..e0e3ec97217a368095ec2c0385f47559a7bee3d8 100644 (file)
--- a/codegen/Makefile.am
+++ b/codegen/Makefile.am
@@ -12,11 +12,11 @@ AM_CPPFLAGS = \
 
 BUILT_SOURCES = codegen.vala.stamp
 
-lib_LTLIBRARIES = \
-       libvala@PACKAGE_SUFFIX@.la \
+noinst_LTLIBRARIES = \
+       libvalaccodegen.la \
        $(NULL)
 
-libvala_la_VALASOURCES = \
+libvalaccodegen_la_VALASOURCES = \
        valaccodearraymodule.vala \
        valaccodeassignmentmodule.vala \
        valaccodeattribute.vala \
@@ -47,18 +47,12 @@ libvala_la_VALASOURCES = \
        valatyperegisterfunction.vala \
        $(NULL)
 
-libvala@PACKAGE_SUFFIX@_la_SOURCES = \
+libvalaccodegen_la_SOURCES = \
        codegen.vala.stamp \
-       $(libvala_la_VALASOURCES:.vala=.c) \
+       $(libvalaccodegen_la_VALASOURCES:.vala=.c) \
        $(NULL)
 
-codegenincludedir = $(includedir)/vala@PACKAGE_SUFFIX@
-
-codegeninclude_HEADERS = \
-       valacodegen.h \
-       $(NULL)
-
-codegen.vapi codegen.vala.stamp: $(libvala_la_VALASOURCES)
+codegen.vapi codegen.vala.stamp: $(libvalaccodegen_la_VALASOURCES)
        $(VALA_V)$(VALAC) \
                $(COVERAGE_VALAFLAGS) \
                $(VALAFLAGS) \
@@ -72,19 +66,17 @@ codegen.vapi codegen.vala.stamp: $(libvala_la_VALASOURCES)
                $^
        @touch $@
 
-libvala@PACKAGE_SUFFIX@_la_LDFLAGS = -no-undefined
-
-libvala@PACKAGE_SUFFIX@_la_LIBADD = \
+libvalaccodegen_la_LIBADD = \
        $(COVERAGE_LIBS) \
        $(GLIB_LIBS) \
-       $(top_builddir)/vala/libvalacore.la \
+       $(top_builddir)/vala/libvala@PACKAGE_SUFFIX@.la \
        $(top_builddir)/ccode/libvalaccode.la \
        $(NULL)
 
-EXTRA_DIST = $(libvala_la_VALASOURCES) codegen.vapi codegen.vala.stamp
+EXTRA_DIST = $(libvalaccodegen_la_VALASOURCES) codegen.vapi codegen.vala.stamp
 
 MAINTAINERCLEANFILES = \
        codegen.vapi \
        valacodegen.h \
-       $(libvala_la_VALASOURCES:.vala=.c) \
+       $(libvalaccodegen_la_VALASOURCES:.vala=.c) \
        $(NULL)

diff --git a/compiler/Makefile.am b/compiler/Makefile.am
index 1a513faa590d845feea4d143313bfe0043324952..ff8759e25e800b302a0c7a7a343aeae1de305063 100644 (file)
--- a/compiler/Makefile.am
+++ b/compiler/Makefile.am
@@ -44,7 +44,9 @@ valac.vala.stamp: $(valac_VALASOURCES)
 valac_LDADD = \
        $(COVERAGE_LIBS) \
        $(GLIB_LIBS) \
-       $(top_builddir)/codegen/libvala@PACKAGE_SUFFIX@.la \
+       $(top_builddir)/vala/libvala@PACKAGE_SUFFIX@.la \
+       $(top_builddir)/ccode/libvalaccode.la \
+       $(top_builddir)/codegen/libvalaccodegen.la \
        $(NULL)
 
 EXTRA_DIST = $(valac_VALASOURCES) valac.vala.stamp

diff --git a/vala/Makefile.am b/vala/Makefile.am
index 397594cdcb178fafe0b9cca714edff88f1f38fb1..5048a072280666d5b22f842c247f419a16920b8e 100644 (file)
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -12,11 +12,11 @@ AM_CPPFLAGS = \
 
 BUILT_SOURCES = vala.vala.stamp
 
-noinst_LTLIBRARIES = \
-       libvalacore.la \
+lib_LTLIBRARIES = \
+       libvala@PACKAGE_SUFFIX@.la \
        $(NULL)
 
-libvalacore_la_VALASOURCES = \
+libvala_la_VALASOURCES = \
        valaaddressofexpression.vala \
        valaarraycopymethod.vala \
        valaarraycreationexpression.vala \
@@ -168,9 +168,9 @@ libvalacore_la_VALASOURCES = \
        valayieldstatement.vala \
        $(NULL)
 
-libvalacore_la_SOURCES = \
+libvala@PACKAGE_SUFFIX@_la_SOURCES = \
        vala.vala.stamp \
-       $(libvalacore_la_VALASOURCES:.vala=.c) \
+       $(libvala_la_VALASOURCES:.vala=.c) \
        $(NULL)
 
 valaincludedir = $(includedir)/vala@PACKAGE_SUFFIX@
@@ -179,7 +179,7 @@ valainclude_HEADERS = \
        vala.h \
        $(NULL)
 
-vala.vapi vala.vala.stamp: $(libvalacore_la_VALASOURCES)
+vala.vapi vala.vala.stamp: $(libvala_la_VALASOURCES)
        $(VALA_V)$(VALAC) \
                $(COVERAGE_VALAFLAGS) \
                $(VALAFLAGS) \
@@ -192,17 +192,21 @@ vala.vapi vala.vala.stamp: $(libvalacore_la_VALASOURCES)
                $^
        @touch $@
 
-libvalacore_la_LIBADD = \
+libvala@PACKAGE_SUFFIX@_la_LDFLAGS = \
+       -no-undefined \
+       $(NULL)
+
+libvala@PACKAGE_SUFFIX@_la_LIBADD = \
        $(COVERAGE_LIBS) \
        $(GLIB_LIBS) \
        $(GMODULE_LIBS) \
        $(top_builddir)/gee/libgee.la \
        $(NULL)
 
-EXTRA_DIST = $(libvalacore_la_VALASOURCES) vala.vapi vala.vala.stamp
+EXTRA_DIST = $(libvala_la_VALASOURCES) vala.vapi vala.vala.stamp
 
 MAINTAINERCLEANFILES = \
        vala.vapi \
        vala.h \
-       $(libvalacore_la_VALASOURCES:.vala=.c) \
+       $(libvala_la_VALASOURCES:.vala=.c) \
        $(NULL)

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 6e5a0438fe8deeaa108757a8474f3454dd6223d2..49749543f99b0adcbb19b72d5c66a9263e06415e 100644 (file)
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 vapidir = $(pkgdatadir)/vapi
 
-libvala@PACKAGE_SUFFIX@.vapi: $(top_srcdir)/gee/gee.vapi $(top_srcdir)/ccode/ccode.vapi $(top_srcdir)/vala/vala.vapi $(top_srcdir)/codegen/codegen.vapi
+libvala@PACKAGE_SUFFIX@.vapi: $(top_srcdir)/gee/gee.vapi $(top_srcdir)/vala/vala.vapi
        cat $^ > $@
 
 dist_vapi_DATA = \

diff --git a/vapigen/Makefile.am b/vapigen/Makefile.am
index 0e681c5e931666e02465399538f228ffd96c0491..ece0c6c7a1819bf4c588fb2ba562f47a00d6d9cd 100644 (file)
--- a/vapigen/Makefile.am
+++ b/vapigen/Makefile.am
@@ -66,13 +66,13 @@ vapicheck.vala.stamp: $(vapicheck_VALASOURCES)
 
 vapigen_LDADD = \
        $(GLIB_LIBS) \
-       $(top_builddir)/codegen/libvala@PACKAGE_SUFFIX@.la \
+       $(top_builddir)/vala/libvala@PACKAGE_SUFFIX@.la \
        $(top_builddir)/gobject-introspection/libgidl.la \
        $(NULL)
 
 vapicheck_LDADD = \
        $(GLIB_LIBS) \
-       $(top_builddir)/codegen/libvala@PACKAGE_SUFFIX@.la \
+       $(top_builddir)/vala/libvala@PACKAGE_SUFFIX@.la \
        $(top_builddir)/gobject-introspection/libgidl.la \
        $(NULL)