diff --git a/cmd/wuffs-c/internal/cgen/cgen.go b/cmd/wuffs-c/internal/cgen/cgen.go index 5f62e2a0..2b8270ad 100644 --- a/cmd/wuffs-c/internal/cgen/cgen.go +++ b/cmd/wuffs-c/internal/cgen/cgen.go @@ -800,7 +800,7 @@ func (g *gen) writeUse(b *buffer, n *a.Use) error { } } - hdrFilename := filepath.Join(g.wuffsRoot, "gen", "h", filepath.FromSlash(useDirname)+".h") + hdrFilename := filepath.Join(g.wuffsRoot, "gen", "c", filepath.FromSlash(useDirname)+".h") hdr, err := ioutil.ReadFile(hdrFilename) if err != nil { return err diff --git a/cmd/wuffs/gen.go b/cmd/wuffs/gen.go index b2e7167e..abd49286 100644 --- a/cmd/wuffs/gen.go +++ b/cmd/wuffs/gen.go @@ -175,7 +175,7 @@ func (h *genHelper) genDir(dirname string, qualFilenames []string) error { return err } out := stdout.Bytes() - if err := h.genFile(dirname, lang, out); err != nil { + if err := h.genFile(dirname, lang, lang, out); err != nil { return err } @@ -189,7 +189,7 @@ func (h *genHelper) genDir(dirname string, qualFilenames []string) error { } else { return fmt.Errorf("%s: output did not contain %q", command, cHeaderEndsHere) } - if err := h.genFile(dirname, "h", out); err != nil { + if err := h.genFile(dirname, "c", "h", out); err != nil { return err } } @@ -223,9 +223,9 @@ func (h *genHelper) genDirDependencies(qualifiedFilenames []string) error { return h.gen("base", false) } -func (h *genHelper) genFile(dirname string, lang string, out []byte) error { +func (h *genHelper) genFile(dirname string, lang string, suffix string, out []byte) error { return writeFile( - filepath.Join(h.wuffsRoot, "gen", lang, filepath.FromSlash(dirname)+"."+lang), + filepath.Join(h.wuffsRoot, "gen", lang, filepath.FromSlash(dirname)+"."+suffix), out, ) } @@ -320,7 +320,7 @@ func (h *genHelper) genWuffs(dirname string, qualifiedFilenames []string) error } } } - return h.genFile(dirname, "wuffs", out.Bytes()) + return h.genFile(dirname, "wuffs", "wuffs", out.Bytes()) } func (h *genHelper) genlibAffected() error { diff --git a/gen/h/std/adler32.h b/gen/c/std/adler32.h similarity index 100% rename from gen/h/std/adler32.h rename to gen/c/std/adler32.h diff --git a/gen/h/std/crc32.h b/gen/c/std/crc32.h similarity index 100% rename from gen/h/std/crc32.h rename to gen/c/std/crc32.h diff --git a/gen/h/std/deflate.h b/gen/c/std/deflate.h similarity index 100% rename from gen/h/std/deflate.h rename to gen/c/std/deflate.h diff --git a/gen/h/std/gif.h b/gen/c/std/gif.h similarity index 100% rename from gen/h/std/gif.h rename to gen/c/std/gif.h diff --git a/gen/h/std/gzip.h b/gen/c/std/gzip.h similarity index 100% rename from gen/h/std/gzip.h rename to gen/c/std/gzip.h diff --git a/gen/h/std/lzw.h b/gen/c/std/lzw.h similarity index 100% rename from gen/h/std/lzw.h rename to gen/c/std/lzw.h diff --git a/gen/h/std/zlib.h b/gen/c/std/zlib.h similarity index 100% rename from gen/h/std/zlib.h rename to gen/c/std/zlib.h