Index: Makefile
--- Makefile.orig	2009-08-27 19:59:54.000000000 +0200
+++ Makefile	2018-09-02 00:14:15.714230000 +0200
@@ -1,5 +1,8 @@
 all: sfnt2woff woff2sfnt
 
+.c.o:
+	$(CC) $(CFLAGS) -o $@ -c $<
+
 sfnt2woff: sfnt2woff.o woff.o woff.h Makefile
 	$(CC) $(LDFLAGS) -o $@ $< woff.o -lz
 
Index: woff-private.h
--- woff-private.h.orig	2009-09-16 14:08:54.000000000 +0200
+++ woff-private.h	2018-09-02 00:14:15.714420000 +0200
@@ -77,8 +77,6 @@
                          (uint16_t) ((uint8_t*)&(x))[1]          )
 #endif
 
-#pragma pack(push,1)
-
 typedef struct {
   uint32_t version;
   uint16_t numTables;
@@ -146,6 +144,4 @@
   uint16_t newIndex;
 } tableOrderRec;
 
-#pragma pack(pop)
-
 #endif
Index: woff2/Makefile
--- woff2/Makefile.orig	2017-12-02 11:36:27.000000000 +0100
+++ woff2/Makefile	2018-09-02 00:27:34.419187000 +0200
@@ -1,6 +1,6 @@
 OS := $(shell uname)
 
-CPPFLAGS = -I./brotli/c/include/ -I./src -I./include
+CPPFLAGS = -I./brotli/include/ -I./src -I./include
 
 AR ?= ar
 CC ?= gcc
@@ -31,7 +31,7 @@
          variable_length.o
 
 BROTLI = brotli
-BROTLIOBJ = $(BROTLI)/bin/obj/c
+BROTLIOBJ = $(BROTLI)/bin/obj
 ENCOBJ = $(BROTLIOBJ)/enc/*.o
 DECOBJ = $(BROTLIOBJ)/dec/*.o
 COMMONOBJ = $(BROTLIOBJ)/common/*.o
Index: woff2/src/woff2_compress.cc
--- woff2/src/woff2_compress.cc.orig	2017-12-02 11:36:27.000000000 +0100
+++ woff2/src/woff2_compress.cc	2018-09-02 00:14:15.714763000 +0200
@@ -15,13 +15,13 @@
 int main(int argc, char **argv) {
   using std::string;
 
-  if (argc != 2) {
-    fprintf(stderr, "One argument, the input filename, must be provided.\n");
+  if (argc != 2 && argc != 3) {
+    fprintf(stderr, "Usage: woff2_compress <input-ttf> [<output-woff2>]\n");
     return 1;
   }
 
   string filename(argv[1]);
-  string outfilename = filename.substr(0, filename.find_last_of(".")) + ".woff2";
+  string outfilename = argc == 3 ? argv[2] : filename.substr(0, filename.find_last_of(".")) + ".woff2";
   fprintf(stdout, "Processing %s => %s\n",
     filename.c_str(), outfilename.c_str());
   string input = woff2::GetFileContent(filename);
Index: woff2/src/woff2_decompress.cc
--- woff2/src/woff2_decompress.cc.orig	2017-12-02 11:36:27.000000000 +0100
+++ woff2/src/woff2_decompress.cc	2018-09-02 00:14:15.714919000 +0200
@@ -16,13 +16,13 @@
 int main(int argc, char **argv) {
   using std::string;
 
-  if (argc != 2) {
-    fprintf(stderr, "One argument, the input filename, must be provided.\n");
+  if (argc != 2 && argc != 3) {
+    fprintf(stderr, "Usage: woff2_decompress <input-woff2> [<output-ttf>]\n");
     return 1;
   }
 
   string filename(argv[1]);
-  string outfilename = filename.substr(0, filename.find_last_of(".")) + ".ttf";
+  string outfilename = argc == 3 ? argv[2] : filename.substr(0, filename.find_last_of(".")) + ".ttf";
 
   // Note: update woff2_dec_fuzzer_new_entry.cc if this pattern changes.
   string input = woff2::GetFileContent(filename);