Permalink
Browse files

git-svn-id: svn://cherokee-project.com/cherokee/trunk@1282 5dc97367-9…

…7f1-0310-9951-d761b3857238
  • Loading branch information...
alobbs committed Mar 16, 2008
1 parent 6587290 commit 603d94ee50f06cd68b91ae37ed9b1966578d8f9d
View
@@ -1,11 +1,17 @@
2008-03-16 Alvaro Lopez Ortega <alvaro@alobbs.com>
+ * cherokee/Makefile.am (INCLUDES), constants.h.pre,
+ Makefile.am (SUBDIRS), cget/Makefile.am (INCLUDES),
+ contrib/Makefile.am (INCLUDES): Most of the compilation
+ definitions have been moved to a file that is built just before
+ the main compilation.
+
* doc/Makefile.am (.NOTPARALLEL): Documentation shouldn't be
generated in pararell. At this moment a simple call to
build_docs.py compiles it all. When it compiles in pararell, make
calls many times to build_docs.py so the documentation is
regenerated and overwritten many times.
-
+
2008-03-15 Alvaro Lopez Ortega <alvaro@alobbs.com>
* cherokee/handler_dirlist.h: Removed configuration property list.
View
@@ -1,8 +1,8 @@
## Cherokee: Makefile.am -*- makefile -*-
-SUBDIRS = m4 contrib www icons doc themes qa cherokee cget windows admin
+SUBDIRS = m4 www icons themes qa doc . admin contrib cherokee cget windows
bin_SCRIPTS = cherokee-config
-SUFFIXES = .sample.pre .sample
+SUFFIXES = .sample.pre .sample .h.pre .h
# M4 macro file for inclusion with autoconf
m4datadir = "$(datadir)/aclocal"
@@ -23,8 +23,18 @@ pkgconfig_DATA = cherokee.pc
cherokeeconfdir = $(sysconfdir)/cherokee
cherokeeadmindir = $(datadir)/cherokee/admin
+.h.pre.h:
+ sed -e "s|%sysconfdir%|${sysconfdir}|g; s|%datadir%|${datadir}|g; s|%prefix%|${prefix}|g; s|%libdir%|${libdir}|g; s|%localstatedir%|${localstatedir}|g; s|%wwwroot%|${WWW_ROOT}|g; s|%phpcgi%|${PHPCGI}|g" $< > $@
.sample.pre.sample:
- sed -e "s|%sysconfdir%|${sysconfdir}|g; s|%datadir%|${datadir}|g; s|%prefix%|${prefix}|g; s|%localstatedir%|${localstatedir}|g; s|%wwwroot%|${WWW_ROOT}|g; s|%phpcgi%|${PHPCGI}|g" $< > $@
+ sed -e "s|%sysconfdir%|${sysconfdir}|g; s|%datadir%|${datadir}|g; s|%prefix%|${prefix}|g; s|%libdir%|${libdir}|g; s|%localstatedir%|${localstatedir}|g; s|%wwwroot%|${WWW_ROOT}|g; s|%phpcgi%|${PHPCGI}|g" $< > $@
+
+
+CONSTANTS_PRE = \
+constants.h.pre
+
+CONSTANTS = \
+$(CONSTANTS_PRE:.h.pre=.h)
+
CONFS_PRE = \
cherokee.conf.sample.pre \
@@ -41,7 +51,8 @@ WINDOWS_PORT_FILES = \
config.h.win32
CLEANFILES = \
-$(CONFS)
+$(CONFS) \
+$(CONSTANTS)
DISTCLEANFILES = \
cherokee.pc
@@ -62,10 +73,12 @@ cherokee.pc.in \
$(m4data_DATA) \
$(CONFS_DONE) \
$(CONFS_PRE) \
+$(CONSTANTS_PRE) \
$(man_MANS) \
$(WINDOWS_PORT_FILES) \
$(COMPILATION_TESTS)
+all-local: $(CONSTANTS) $(CONFS)
install-data-local-config:
@$(mkinstalldirs) $(DESTDIR)$(pkgincludedir);
@@ -77,7 +90,6 @@ uninstall-local-config:
$(RM) -f $(DESTDIR)$(pkgincludedir)/cherokee-config.h; \
fi
-
install-data-local: $(CONFS) $(CONFS_DONE) install-data-local-config
@$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)
@$(mkinstalldirs) $(DESTDIR)$(cherokeeconfdir)/ssl
View
@@ -1,8 +1,6 @@
## Cherokee: src/cget/Makefile.am -*- makefile -*-
INCLUDES = -I. \
--DCHEROKEE_COMPILATION \
--I${top_srcdir} \
-I${top_srcdir}/cherokee \
$(TLS_CFLAGS) \
$(PTHREAD_CFLAGS) \
View
@@ -1,20 +1,8 @@
## Cherokee: cherokee/Makefile.am -*- makefile -*-
INCLUDES = \
--DPCRE_STATIC \
$(TLS_CFLAGS) \
-$(PTHREAD_CFLAGS) \
--I$(top_srcdir) \
--DCHEROKEE_COMPILATION \
--DCHEROKEE_PLUGINDIR="\"$(plugindir)\"" \
--DCHEROKEE_DEPSDIR=\""$(cherokeedepsdir)"\" \
--DCHEROKEE_DATADIR=\""$(cherokeedatadir)"\" \
--DCHEROKEE_VAR_RUN=\""$(localstatedir)/run"\" \
--DCHEROKEE_CONFDIR=\""$(sysconfdir)/cherokee"\" \
--DCHEROKEE_SRV_PATH=\""$(prefix)/sbin/cherokee"\" \
--DCHEROKEE_ICONSDIR=\""$(prefix)/share/cherokee/icons"\" \
--DCHEROKEE_THEMEDIR=\""$(prefix)/share/cherokee/themes"\" \
--DCHEROKEE_PANIC_PATH=\""$(prefix)/bin/cherokee-panic"\"
+$(PTHREAD_CFLAGS)
#
# Scripts
View
@@ -22,7 +22,9 @@
* USA
*/
+#include "common-internal.h"
#include "admin_server.h"
+
#include "server-protected.h"
#include "connection-protected.h"
#include "connection_info.h"
@@ -26,6 +26,7 @@
#define CHEROKEE_COMMON_INTERNAL_H
#include <config.h>
+#include <constants.h>
#ifdef _WIN32
# include "unix4win32.h"
View
@@ -22,6 +22,7 @@
* USA
*/
+#include "common-internal.h"
#include "dirs_table.h"
#include <stdio.h>
View
@@ -22,6 +22,7 @@
* USA
*/
+#include "common-internal.h"
#include "exts_table.h"
#define ENTRIES "exts"
@@ -5,6 +5,7 @@
*
*/
+#include "common-internal.h"
#include "levenshtein_distance.h"
#include <stdlib.h>
View
@@ -25,8 +25,8 @@
* USA
*/
-#include "logger.h"
#include "common-internal.h"
+#include "logger.h"
#include <stdlib.h>
#include <string.h>
View
@@ -22,7 +22,7 @@
/* Thanks to Dimitri PAPADOPOULOS-ORFANOS for researching many of the methods
* in this file. */
-#include "config.h"
+#include "common-internal.h"
#include "ncpus.h"
#include "util.h"
View
@@ -0,0 +1,18 @@
+#ifndef CHEROKEE_COMPILATION_CONSTANTS_H
+#define CHEROKEE_COMPILATION_CONSTANTS_H
+
+# define CHEROKEE_COMPILATION
+# define PCRE_STATIC
+
+# define CHEROKEE_PLUGINDIR "%libdir%/cherokee"
+# define CHEROKEE_DEPSDIR "%datadir%/cherokee/deps"
+# define CHEROKEE_DATADIR "%datadir%/cherokee"
+
+# define CHEROKEE_VAR_RUN "%localstatedir%/run"
+# define CHEROKEE_CONFDIR "%sysconfdir%/cherokee"
+# define CHEROKEE_SRV_PATH "%prefix%/sbin/cherokee"
+# define CHEROKEE_ICONSDIR "%prefix%/share/cherokee/icons"
+# define CHEROKEE_THEMEDIR "%prefix%/share/cherokee/themes"
+# define CHEROKEE_PANIC_PATH "%prefix%/bin/cherokee-panic"
+
+#endif
View
@@ -1,12 +1,9 @@
INCLUDES = \
--I$(top_srcdir) \
--I$(top_srcdir)/cherokee \
--DCHEROKEE_COMPILATION
+-I$(top_srcdir)/cherokee
bin_PROGRAMS = spawn-fcgi
spawn_fcgi_SOURCES = spawn-fcgi.c
-
EXTRA_DIST = \
cherokee \
bin2buffer.py \

0 comments on commit 603d94e

Please sign in to comment.