hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed dist package generation.

Browse source
This commit is contained in:
Thulinma 2013-01-10 16:54:13 +01:00
parent 17d29497ed
commit 48355ff136
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Makefile.am
View file

@ -1,9 +1,11 @@
lspdir=$(srcdir)/../lsp CLOSUREJAR=../lsp/closure-compiler.jar
CLOSUREJAR=$(lspdir)/closure-compiler.jar
CLOSURE=java -jar $(CLOSUREJAR) --warning_level QUIET CLOSURE=java -jar $(CLOSUREJAR) --warning_level QUIET
BUILT_SOURCES=server.html.h embed.js.h BUILT_SOURCES=server.html.h embed.js.h
lspSOURCES=../lsp/jquery.js ../lsp/placeholder.js ../lsp/md5.js ../lsp/main.js ../lsp/functions.js ../lsp/tablesort.js
lspDATA=../lsp/header.html ../lsp/style.css ../lsp/footer.html
# Do not clean below files, build machines do not have closure installed # Do not clean below files, build machines do not have closure installed
EXTRA_DIST=server.html server.html.h embed.js.h EXTRA_DIST=server.html server.html.h embed.js.h $(lspSOURCES) $(lspDATA)
RELEASE ?= "Generic_`getconf LONG_BIT`" RELEASE ?= "Generic_`getconf LONG_BIT`"
@ -26,8 +28,6 @@ MistConnTS_SOURCES=conn_ts.cpp ../VERSION
MistPlayer_SOURCES=player.cpp MistPlayer_SOURCES=player.cpp
MistPlayer_LDADD=$(MIST_LIBS) MistPlayer_LDADD=$(MIST_LIBS)
lspSOURCES=$(lspdir)/jquery.js $(lspdir)/placeholder.js $(lspdir)/md5.js $(lspdir)/main.js $(lspdir)/functions.js $(lspdir)/tablesort.js
lspDATA=$(lspdir)/header.html $(lspdir)/style.css $(lspdir)/footer.html
embed.js.h: $(srcdir)/embed.js embed.js.h: $(srcdir)/embed.js
$(CLOSURE) $< > embed.min.js $(CLOSURE) $< > embed.min.js
@ -36,14 +36,14 @@ embed.js.h: $(srcdir)/embed.js
server.html: $(lspDATA) $(lspSOURCES) server.html: $(lspDATA) $(lspSOURCES)
$(CLOSURE) $(lspSOURCES) > compressed.js $(CLOSURE) $(lspSOURCES) > compressed.js
cat $(lspdir)/header.html > $@ cat ../lsp/header.html > $@
echo "<script>" >> $@ echo "<script>" >> $@
cat compressed.js >> $@ cat compressed.js >> $@
rm compressed.js rm compressed.js
echo "</script><style>" >> $@ echo "</script><style>" >> $@
cat $(lspdir)/style.css >> $@ cat ../lsp/style.css >> $@
echo "</style>" >> $@ echo "</style>" >> $@
cat $(lspdir)/footer.html >> $@ cat ../lsp/footer.html >> $@
server.html.h: server.html server.html.h: server.html
xxd -i server.html server.html.h xxd -i server.html server.html.h