From 2732482d3607d9ae440ff73279711cd9f30d42c3 Mon Sep 17 00:00:00 2001 From: Devaev Maxim Date: Mon, 5 Nov 2018 04:39:20 +0300 Subject: [PATCH] refactoring, html fixes --- Makefile | 6 +++--- src/data/{blank.h => blank_jpeg.h} | 0 src/data/index.html | 26 ++++++++++++------------- src/data/{html_index.h => index_html.h} | 22 ++++++++++----------- src/http.c | 14 ++++++------- src/tools.h | 5 +++++ tools/make-html-h.py | 1 + 7 files changed, 40 insertions(+), 34 deletions(-) rename src/data/{blank.h => blank_jpeg.h} (100%) rename src/data/{html_index.h => index_html.h} (80%) diff --git a/Makefile b/Makefile index 693b130..670d437 100644 --- a/Makefile +++ b/Makefile @@ -29,8 +29,8 @@ install: $(PROG) regen: - tools/make-jpeg-h.py src/data/blank.jpeg src/data/blank.h BLANK 640 480 - tools/make-html-h.py src/data/index.html src/data/html_index.h HTML_INDEX_PAGE + tools/make-jpeg-h.py src/data/blank.jpeg src/data/blank_jpeg.h BLANK 640 480 + tools/make-html-h.py src/data/index.html src/data/index_html.h HTML_INDEX_PAGE $(PROG): $(OBJECTS) @@ -57,7 +57,7 @@ push: git push git push --tags - +clean-all: clean clean: rm -f src/*.o src/{jpeg,omx}/*.o vgcore.* $(PROG) rm -rf pkg src/$(PROG)-* src/v*.tar.gz v*.tar.gz $(PROG)-*.pkg.tar.xz diff --git a/src/data/blank.h b/src/data/blank_jpeg.h similarity index 100% rename from src/data/blank.h rename to src/data/blank_jpeg.h diff --git a/src/data/index.html b/src/data/index.html index 6db51b6..8969dba 100644 --- a/src/data/index.html +++ b/src/data/index.html @@ -2,7 +2,7 @@ - + uStreamer @@ -11,35 +11,35 @@

- Sources & docs + Sources & docs diff --git a/src/data/html_index.h b/src/data/index_html.h similarity index 80% rename from src/data/html_index.h rename to src/data/index_html.h index d75f847..ce1bf60 100644 --- a/src/data/html_index.h +++ b/src/data/index_html.h @@ -29,7 +29,7 @@ const char *HTML_INDEX_PAGE = " \ \ \ \ - \ + \ uStreamer \ \ \ @@ -38,35 +38,35 @@ const char *HTML_INDEX_PAGE = " \
\