@import url("/assets/md.css")Move bundled zopfli sources into a new zopfli/ subdirectory.

@import url("/assets/md.css")Separating source files by origin (and license) makes it easy for users who
want to build with an external zopfli library to remove the bundled sources,
ensuring they are not used. Unbundling libraries is mandatory for packaging in
many popular Linux distributions, and can be useful for other applications as
well. Additional changes will be needed to make it easy to select an external
zopfli library.

26 files changed, 3 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index cb2577a..2f644f2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
-FILES=blocksplitter.c cache.c deflate.c gzip_container.c hash.c katajainen.c lz77.c squeeze.c tree.c util.c zlib_container.c zopfli_lib.c woff.c
+FILES=zopfli/blocksplitter.c zopfli/cache.c zopfli/deflate.c zopfli/gzip_container.c zopfli/hash.c zopfli/katajainen.c zopfli/lz77.c zopfli/squeeze.c zopfli/tree.c zopfli/util.c zopfli/zlib_container.c zopfli/zopfli_lib.c woff.c
 
 all: sfnt2woff-zopfli woff2sfnt-zopfli
 
 sfnt2woff-zopfli: sfnt2woff.c $(FILES) Makefile
-	$(CC) $(LDFLAGS) $(FILES) $< -o $@ -lz -lm
+	$(CC) -Izopfli $(LDFLAGS) $(FILES) $< -o $@ -lz -lm
 
 woff2sfnt-zopfli: woff2sfnt.c $(FILES) Makefile
-	$(CC) $(LDFLAGS) $(FILES) $< -o $@ -lz -lm
+	$(CC) -Izopfli $(LDFLAGS) $(FILES) $< -o $@ -lz -lm
 
 clean:
 	$(RM) -r *.o *.dSYM sfnt2woff-zopfli woff2sfnt-zopfli *.gch *.out
diff --git a/blocksplitter.c b/zopfli/blocksplitter.c
index 68f5ff3..68f5ff3 100644
--- a/blocksplitter.c
+++ b/zopfli/blocksplitter.c
diff --git a/blocksplitter.h b/zopfli/blocksplitter.h
index 6791702..6791702 100644
--- a/blocksplitter.h
+++ b/zopfli/blocksplitter.h
diff --git a/cache.c b/zopfli/cache.c
index 88a49ac..88a49ac 100644
--- a/cache.c
+++ b/zopfli/cache.c
diff --git a/cache.h b/zopfli/cache.h
index 5ca0c50..5ca0c50 100644
--- a/cache.h
+++ b/zopfli/cache.h
diff --git a/deflate.c b/zopfli/deflate.c
index 4b0724b..4b0724b 100644
--- a/deflate.c
+++ b/zopfli/deflate.c
diff --git a/deflate.h b/zopfli/deflate.h
index 189c77a..189c77a 100644
--- a/deflate.h
+++ b/zopfli/deflate.h
diff --git a/gzip_container.c b/zopfli/gzip_container.c
index 8a062f2..8a062f2 100644
--- a/gzip_container.c
+++ b/zopfli/gzip_container.c
diff --git a/gzip_container.h b/zopfli/gzip_container.h
index 8f5ed90..8f5ed90 100644
--- a/gzip_container.h
+++ b/zopfli/gzip_container.h
diff --git a/hash.c b/zopfli/hash.c
index a3b294f..a3b294f 100644
--- a/hash.c
+++ b/zopfli/hash.c
diff --git a/hash.h b/zopfli/hash.h
index 79c2479..79c2479 100644
--- a/hash.h
+++ b/zopfli/hash.h
diff --git a/katajainen.c b/zopfli/katajainen.c
index 783ea08..783ea08 100644
--- a/katajainen.c
+++ b/zopfli/katajainen.c
diff --git a/katajainen.h b/zopfli/katajainen.h
index ee8a91e..ee8a91e 100644
--- a/katajainen.h
+++ b/zopfli/katajainen.h
diff --git a/lz77.c b/zopfli/lz77.c
index 26186b4..26186b4 100644
--- a/lz77.c
+++ b/zopfli/lz77.c
diff --git a/lz77.h b/zopfli/lz77.h
index 55186a7..55186a7 100644
--- a/lz77.h
+++ b/zopfli/lz77.h
diff --git a/squeeze.c b/zopfli/squeeze.c
index 09e7e2e..09e7e2e 100644
--- a/squeeze.c
+++ b/zopfli/squeeze.c
diff --git a/squeeze.h b/zopfli/squeeze.h
index e850aaa..e850aaa 100644
--- a/squeeze.h
+++ b/zopfli/squeeze.h
diff --git a/tree.c b/zopfli/tree.c
index c457511..c457511 100644
--- a/tree.c
+++ b/zopfli/tree.c
diff --git a/tree.h b/zopfli/tree.h
index 4d6f469..4d6f469 100644
--- a/tree.h
+++ b/zopfli/tree.h
diff --git a/util.c b/zopfli/util.c
index d207145..d207145 100644
--- a/util.c
+++ b/zopfli/util.c
diff --git a/util.h b/zopfli/util.h
index 4188f51..4188f51 100644
--- a/util.h
+++ b/zopfli/util.h
diff --git a/zlib_container.c b/zopfli/zlib_container.c
index 5b7d0aa..5b7d0aa 100644
--- a/zlib_container.c
+++ b/zopfli/zlib_container.c
diff --git a/zlib_container.h b/zopfli/zlib_container.h
index 9ddfb9c..9ddfb9c 100644
--- a/zlib_container.h
+++ b/zopfli/zlib_container.h
diff --git a/zopfli.h b/zopfli/zopfli.h
index 56512a2..56512a2 100644
--- a/zopfli.h
+++ b/zopfli/zopfli.h
diff --git a/zopfli_bin.c b/zopfli/zopfli_bin.c
index 8a147ef..8a147ef 100644
--- a/zopfli_bin.c
+++ b/zopfli/zopfli_bin.c
diff --git a/zopfli_lib.c b/zopfli/zopfli_lib.c
index 5f5b214..5f5b214 100644
--- a/zopfli_lib.c
+++ b/zopfli/zopfli_lib.c