Moved pkg-config to a module so we no longer need special case code in core for it.

1 files changed, 4 insertions, 16 deletions

diff --git a/ninjabackend.py b/ninjabackend.py
index 74892f0..121fba1 100644
--- a/ninjabackend.py
+++ b/ninjabackend.py
@@ -162,7 +162,6 @@ int dummy;
         outfilename = os.path.join(self.environment.get_build_dir(), self.ninja_filename)
         tempfilename = outfilename + '~'
         outfile = open(tempfilename, 'w')
-        self.generate_pkgconfig_files()
         outfile.write('# This is the build file for project "%s"\n' % self.build.get_project())
         outfile.write('# It is autogenerated by the Meson build system.\n')
         outfile.write('# Do not edit by hand.\n\n')
@@ -470,7 +469,6 @@ int dummy;
         self.generate_man_install(d)
         self.generate_data_install(d)
         self.generate_po_install(d, elem)
-        self.generate_pkgconfig_install(d)
         self.generate_custom_install_script(d)
         self.generate_subdir_install(d)
         elem.write(outfile)
@@ -507,17 +505,6 @@ int dummy;
                     should_strip, t.install_rpath]
                 d.targets.append(i)
 
-    def generate_pkgconfig_install(self, d):
-        pkgroot = os.path.join(self.environment.coredata.get_builtin_option('libdir'), 'pkgconfig')
-
-        for p in self.build.pkgconfig_gens:
-            pcfile = p.filebase + '.pc'
-            srcabs = os.path.join(self.environment.get_scratch_dir(),
-                                  pcfile)
-            dstrel = os.path.join(pkgroot, pcfile)
-            i = [srcabs, dstrel]
-            d.man.append(i)
-
     def generate_custom_install_script(self, d):
         d.install_scripts = self.build.install_scripts
 
@@ -551,13 +538,14 @@ int dummy;
     def generate_data_install(self, d):
         data = self.build.get_data()
         for de in data:
-            subdir = de.get_install_dir()
-            for f in de.get_sources():
+            assert(isinstance(de, build.Data))
+            subdir = de.install_dir
+            for f in de.sources:
                 if de.in_sourcetree:
                     srcprefix = self.environment.get_source_dir()
                 else:
                     srcprefix = self.environment.get_build_dir()
-                srcabs = os.path.join(srcprefix, de.get_source_subdir(), f)
+                srcabs = os.path.join(srcprefix, de.source_subdir, f)
                 dstabs = os.path.join(subdir, f)
                 i = [srcabs, dstabs]
                 d.data.append(i)