X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=Makefile;h=e46eb6d1aca16c11b2db7f8a8ec56f8942137252;hb=948ce5be6ef6bba36edfb544565ca22e316afb0a;hp=94a17d8352d8e47a413b31e142db3e894ad4f7a2;hpb=48eec2e56ddb2e1d87866ee3dad6645ab6deaed7;p=blerg.git

diff --git a/Makefile b/Makefile
index 94a17d8..e46eb6d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 include libs.mk
 
 ARCH=$(shell uname -m)
-CFLAGS ?= -g
+CFLAGS ?= -g -Wall
 ifeq ($(ARCH),x86_64)
 	CFLAGS += -fPIC
 endif
@@ -13,7 +13,7 @@ HTTP_LIBDIRS = $(MHD_LIBDIR) $(YAJL_LIBDIR)
 CGI_LIBDIRS = $(CGI_UTIL_LIBDIR) $(YAJL_LIBDIR)
 
 targets = blerg.a blerg_auth.a blergtool blerglatest blerg.cgi perl-lib www/build/enyo-blerg.js
-blerg_a_objects = database/database.o database/tags.o database/util.o database/configuration.o database/subscription.o common/stringbucket.o
+blerg_a_objects = database/database.o database/tags.o database/util.o database/configuration.o database/subscription.o common/stringbucket.o common/stringring.o
 blerg_auth_a_objects = common/auth.o common/md5.o
 blergtool_objects = tools/blergtool.o blerg.a
 blerglatest_objects = tools/blerglatest.o blerg.a common/json.o
@@ -28,7 +28,7 @@ clean:
 	@-make -C builddeps/scrypt-1.1.6/lib/crypto clean
 	@-make -C lib/perl/Blerg-Database clean
 
-.phony: perl-lib
+.PHONY: perl-lib
 perl-lib:
 	cd lib/perl/Blerg-Database && perl Makefile.PL
 	make -C lib/perl/Blerg-Database
@@ -70,3 +70,56 @@ builddeps/scrypt-1.1.6/config.h:
 builddeps/scrypt.a: builddeps/scrypt-1.1.6/config.h
 	make -C builddeps/scrypt-1.1.6/lib/crypto CFLAGS="$(CFLAGS)"
 	cp builddeps/scrypt-1.1.6/lib/crypto/scrypt.a builddeps/
+
+.PHONY: docs
+docs: www/doc/perl www/doc/perl/Blerg-Database.html
+
+www/doc/perl:
+	mkdir $@
+
+www/doc/perl/Blerg-Database.html: lib/perl/Blerg-Database/lib/Blerg/Database.pm
+	pod2html $< > $@
+
+.PHONY: install
+install:
+	@echo "Please use 'make install-environment' to install Blërg to an environment"
+
+.PHONY: install-environment
+install-environment: all docs
+	@if [ -z "$(ENV_DIR)" ]; then \
+		echo "Specify the install directory in the ENV_DIR variable"; \
+		exit 1; \
+	fi
+	install --mode 755 -d \
+		$(ENV_DIR)/bin \
+		$(ENV_DIR)/lib/cgi-bin \
+		$(ENV_DIR)/etc \
+		$(ENV_DIR)/data/data \
+		$(ENV_DIR)/data/hash_tags \
+		$(ENV_DIR)/data/ref_tags \
+		$(ENV_DIR)/www/build \
+		$(ENV_DIR)/www/css \
+		$(ENV_DIR)/www/doc/perl \
+		$(ENV_DIR)/www/images
+	install --mode 755 blerg.cgi rss.cgi $(ENV_DIR)/lib/cgi-bin/
+	install --mode 755 blergtool blerglatest $(ENV_DIR)/bin/
+	install --mode 644 www/favicon.gif www/favicon.ico www/index.html \
+		www/welcome.html \
+		$(ENV_DIR)/www/
+	install --mode 644 www/build/enyo-blerg.js www/build/enyo-blerg.css \
+		$(ENV_DIR)/www/build/
+	install --mode 644 www/css/blerg.css www/css/doc.css \
+		$(ENV_DIR)/www/css/
+	install --mode 644 www/doc/changelog.html www/doc/index.html \
+		www/doc/post_help.html www/doc/privacy_data.html \
+		www/doc/contact.html \
+		$(ENV_DIR)/www/doc/
+	install --mode 644 www/doc/perl/Blerg-Database.html \
+		$(ENV_DIR)/www/doc/perl/
+	install --mode 644 www/images/blerglogo.png www/images/corner.svg \
+		www/images/play.png www/images/rss.png \
+		$(ENV_DIR)/www/images/
+	www/jssrc/lib/onyx/deploy.sh $(ENV_DIR)/www/jssrc/lib/onyx
+	cd lib/perl/Blerg-Database && perl Makefile.PL INSTALL_BASE="$(ENV_DIR)"
+	make -C lib/perl/Blerg-Database install
+	perl scripts/write-environment-configs.pl $(ENV_DIR)