comparison src/c/Makefile.in @ 1739:c414850f206f

Add support for -boot flag, which allows in-tree execution of Ur/Web The boot flag rewrites most hardcoded paths to point to the build directory, and also forces static compilation. This is convenient for developing Ur/Web, or if you cannot 'sudo make install' Ur/Web. The following changes were made: * Header files were moved to include/urweb instead of include; this lets FFI users point their C_INCLUDE_PATH at this directory at write <urweb/urweb.h>. For internal Ur/Web executables, we simply pass -I$PATH/include/urweb as normal. * Differentiate between LIB and SRCLIB; SRCLIB is Ur and JavaScript source files, while LIB is compiled products from libtool. For in-tree compilation these live in different places. * No longer reference Config for paths; instead use Settings; these settings can be changed dynamically by Compiler.enableBoot () (TODO: add a disableBoot function.) * config.h is now generated directly in include/urweb/config.h, for consistency's sake (especially since it gets installed along with the rest of the headers!) * All of the autotools build products got updated. * The linkStatic field in protocols now only contains the name of the build product, and not the absolute path. Future users have to be careful not to reference the Settings files to early, lest they get an old version (this was the source of two bugs during development of this patch.)
author Edward Z. Yang <ezyang@mit.edu>
date Wed, 02 May 2012 17:17:57 -0400
parents 27d68ccb2c9e
children d2ec62c5ad81
comparison
equal deleted inserted replaced
1738:1a35e75b6967 1739:c414850f206f
1 # Makefile.in generated by automake 1.11.3 from Makefile.am. 1 # Makefile.in generated by automake 1.11.1 from Makefile.am.
2 # @configure_input@ 2 # @configure_input@
3 3
4 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 4 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
6 # Foundation, Inc. 6 # Inc.
7 # This Makefile.in is free software; the Free Software Foundation 7 # This Makefile.in is free software; the Free Software Foundation
8 # gives unlimited permission to copy and/or distribute it, 8 # gives unlimited permission to copy and/or distribute it,
9 # with or without modifications, as long as this notice is preserved. 9 # with or without modifications, as long as this notice is preserved.
10 10
11 # This program is distributed in the hope that it will be useful, 11 # This program is distributed in the hope that it will be useful,
43 $(top_srcdir)/m4/lt~obsolete.m4 \ 43 $(top_srcdir)/m4/lt~obsolete.m4 \
44 $(top_srcdir)/m4/m4_ax_pthread.m4 $(top_srcdir)/configure.ac 44 $(top_srcdir)/m4/m4_ax_pthread.m4 $(top_srcdir)/configure.ac
45 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 45 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
46 $(ACLOCAL_M4) 46 $(ACLOCAL_M4)
47 mkinstalldirs = $(install_sh) -d 47 mkinstalldirs = $(install_sh) -d
48 CONFIG_HEADER = $(top_builddir)/config.h 48 CONFIG_HEADER = $(top_builddir)/include/urweb/config.h
49 CONFIG_CLEAN_FILES = 49 CONFIG_CLEAN_FILES =
50 CONFIG_CLEAN_VPATH_FILES = 50 CONFIG_CLEAN_VPATH_FILES =
51 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; 51 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
52 am__vpath_adj = case $$p in \ 52 am__vpath_adj = case $$p in \
53 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ 53 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
67 { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ 67 { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
68 END { for (dir in files) print dir, files[dir] }' 68 END { for (dir in files) print dir, files[dir] }'
69 am__base_list = \ 69 am__base_list = \
70 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ 70 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
71 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' 71 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
72 am__uninstall_files_from_dir = { \
73 test -z "$$files" \
74 || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
75 || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
76 $(am__cd) "$$dir" && rm -f $$files; }; \
77 }
78 am__installdirs = "$(DESTDIR)$(libdir)" 72 am__installdirs = "$(DESTDIR)$(libdir)"
79 LTLIBRARIES = $(lib_LTLIBRARIES) 73 LTLIBRARIES = $(lib_LTLIBRARIES)
80 liburweb_la_LIBADD = 74 liburweb_la_LIBADD =
81 am_liburweb_la_OBJECTS = memmem.lo openssl.lo urweb.lo request.lo \ 75 am_liburweb_la_OBJECTS = memmem.lo openssl.lo urweb.lo request.lo \
82 queue.lo 76 queue.lo
91 am_liburweb_http_la_OBJECTS = http.lo 85 am_liburweb_http_la_OBJECTS = http.lo
92 liburweb_http_la_OBJECTS = $(am_liburweb_http_la_OBJECTS) 86 liburweb_http_la_OBJECTS = $(am_liburweb_http_la_OBJECTS)
93 liburweb_static_la_LIBADD = 87 liburweb_static_la_LIBADD =
94 am_liburweb_static_la_OBJECTS = static.lo 88 am_liburweb_static_la_OBJECTS = static.lo
95 liburweb_static_la_OBJECTS = $(am_liburweb_static_la_OBJECTS) 89 liburweb_static_la_OBJECTS = $(am_liburweb_static_la_OBJECTS)
96 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) 90 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/urweb
97 depcomp = $(SHELL) $(top_srcdir)/depcomp 91 depcomp = $(SHELL) $(top_srcdir)/depcomp
98 am__depfiles_maybe = depfiles 92 am__depfiles_maybe = depfiles
99 am__mv = mv -f 93 am__mv = mv -f
100 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 94 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
101 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 95 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
190 SED = @SED@ 184 SED = @SED@
191 SET_MAKE = @SET_MAKE@ 185 SET_MAKE = @SET_MAKE@
192 SHELL = @SHELL@ 186 SHELL = @SHELL@
193 SITELISP = @SITELISP@ 187 SITELISP = @SITELISP@
194 SQHEADER = @SQHEADER@ 188 SQHEADER = @SQHEADER@
189 SRCLIB = @SRCLIB@
195 STRIP = @STRIP@ 190 STRIP = @STRIP@
196 VERSION = @VERSION@ 191 VERSION = @VERSION@
197 abs_builddir = @abs_builddir@ 192 abs_builddir = @abs_builddir@
198 abs_srcdir = @abs_srcdir@ 193 abs_srcdir = @abs_srcdir@
199 abs_top_builddir = @abs_top_builddir@ 194 abs_top_builddir = @abs_top_builddir@
251 liburweb_la_SOURCES = memmem.c openssl.c urweb.c request.c queue.c 246 liburweb_la_SOURCES = memmem.c openssl.c urweb.c request.c queue.c
252 liburweb_http_la_SOURCES = http.c 247 liburweb_http_la_SOURCES = http.c
253 liburweb_cgi_la_SOURCES = cgi.c 248 liburweb_cgi_la_SOURCES = cgi.c
254 liburweb_fastcgi_la_SOURCES = fastcgi.c 249 liburweb_fastcgi_la_SOURCES = fastcgi.c
255 liburweb_static_la_SOURCES = static.c 250 liburweb_static_la_SOURCES = static.c
256 AM_CPPFLAGS = -I../../include @OPENSSL_INCLUDES@ 251 AM_CPPFLAGS = -I../../include/urweb @OPENSSL_INCLUDES@
257 AM_CFLAGS = -Wimplicit -Wall -Werror -Wno-format-security -Wno-deprecated-declarations 252 AM_CFLAGS = -Wimplicit -Wall -Werror -Wno-format-security -Wno-deprecated-declarations
258 all: all-am 253 all: all-am
259 254
260 .SUFFIXES: 255 .SUFFIXES:
261 .SUFFIXES: .c .lo .o .obj 256 .SUFFIXES: .c .lo .o .obj
318 dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ 313 dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
319 test "$$dir" != "$$p" || dir=.; \ 314 test "$$dir" != "$$p" || dir=.; \
320 echo "rm -f \"$${dir}/so_locations\""; \ 315 echo "rm -f \"$${dir}/so_locations\""; \
321 rm -f "$${dir}/so_locations"; \ 316 rm -f "$${dir}/so_locations"; \
322 done 317 done
323 liburweb.la: $(liburweb_la_OBJECTS) $(liburweb_la_DEPENDENCIES) $(EXTRA_liburweb_la_DEPENDENCIES) 318 liburweb.la: $(liburweb_la_OBJECTS) $(liburweb_la_DEPENDENCIES)
324 $(LINK) -rpath $(libdir) $(liburweb_la_OBJECTS) $(liburweb_la_LIBADD) $(LIBS) 319 $(LINK) -rpath $(libdir) $(liburweb_la_OBJECTS) $(liburweb_la_LIBADD) $(LIBS)
325 liburweb_cgi.la: $(liburweb_cgi_la_OBJECTS) $(liburweb_cgi_la_DEPENDENCIES) $(EXTRA_liburweb_cgi_la_DEPENDENCIES) 320 liburweb_cgi.la: $(liburweb_cgi_la_OBJECTS) $(liburweb_cgi_la_DEPENDENCIES)
326 $(LINK) -rpath $(libdir) $(liburweb_cgi_la_OBJECTS) $(liburweb_cgi_la_LIBADD) $(LIBS) 321 $(LINK) -rpath $(libdir) $(liburweb_cgi_la_OBJECTS) $(liburweb_cgi_la_LIBADD) $(LIBS)
327 liburweb_fastcgi.la: $(liburweb_fastcgi_la_OBJECTS) $(liburweb_fastcgi_la_DEPENDENCIES) $(EXTRA_liburweb_fastcgi_la_DEPENDENCIES) 322 liburweb_fastcgi.la: $(liburweb_fastcgi_la_OBJECTS) $(liburweb_fastcgi_la_DEPENDENCIES)
328 $(LINK) -rpath $(libdir) $(liburweb_fastcgi_la_OBJECTS) $(liburweb_fastcgi_la_LIBADD) $(LIBS) 323 $(LINK) -rpath $(libdir) $(liburweb_fastcgi_la_OBJECTS) $(liburweb_fastcgi_la_LIBADD) $(LIBS)
329 liburweb_http.la: $(liburweb_http_la_OBJECTS) $(liburweb_http_la_DEPENDENCIES) $(EXTRA_liburweb_http_la_DEPENDENCIES) 324 liburweb_http.la: $(liburweb_http_la_OBJECTS) $(liburweb_http_la_DEPENDENCIES)
330 $(LINK) -rpath $(libdir) $(liburweb_http_la_OBJECTS) $(liburweb_http_la_LIBADD) $(LIBS) 325 $(LINK) -rpath $(libdir) $(liburweb_http_la_OBJECTS) $(liburweb_http_la_LIBADD) $(LIBS)
331 liburweb_static.la: $(liburweb_static_la_OBJECTS) $(liburweb_static_la_DEPENDENCIES) $(EXTRA_liburweb_static_la_DEPENDENCIES) 326 liburweb_static.la: $(liburweb_static_la_OBJECTS) $(liburweb_static_la_DEPENDENCIES)
332 $(LINK) -rpath $(libdir) $(liburweb_static_la_OBJECTS) $(liburweb_static_la_LIBADD) $(LIBS) 327 $(LINK) -rpath $(libdir) $(liburweb_static_la_OBJECTS) $(liburweb_static_la_LIBADD) $(LIBS)
333 328
334 mostlyclean-compile: 329 mostlyclean-compile:
335 -rm -f *.$(OBJEXT) 330 -rm -f *.$(OBJEXT)
336 331
471 install-am: all-am 466 install-am: all-am
472 @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am 467 @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
473 468
474 installcheck: installcheck-am 469 installcheck: installcheck-am
475 install-strip: 470 install-strip:
476 if test -z '$(STRIP)'; then \ 471 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
477 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ 472 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
478 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ 473 `test -z '$(STRIP)' || \
479 install; \ 474 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
480 else \
481 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
482 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
483 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
484 fi
485 mostlyclean-generic: 475 mostlyclean-generic:
486 476
487 clean-generic: 477 clean-generic:
488 478
489 distclean-generic: 479 distclean-generic: