1
0
Fork 0

Fix starting a build from a subdirectory ELBuild-wise

Now all the submakefiles contain informationa buot where in the directory
hierarchy they stay.
This commit is contained in:
Petr Baudis 2005-09-16 02:07:36 +02:00
parent 22b6d3f623
commit 204bbe5d2c
13 changed files with 37 additions and 28 deletions

View File

@ -1,7 +1,5 @@
include Makefile.config
# This should be _really_ ., but only after we have src/Makefile.
# Otherwise, it wouldn't be set right in the submakefiles.
path_to_top = ..
path_to_top = .
include $(path_to_top)/Makefile.config
# TODO: Automagically rerun autoconf.
@ -11,4 +9,4 @@ SUBDIRS = doc po src
clean-l:
rm -rf features.log
include Makefile.lib
include $(path_to_top)/Makefile.lib

View File

@ -32,7 +32,7 @@ quiet_cmd_archive = '[AR] $@'
# Recursive make
quiet_cmd_recmake = "[MAKE $$target] $$subdir"
cmd_recmake = $(MAKE) -C $$subdir $$target path_to_top="$(path_to_top)/.."
cmd_recmake = $(MAKE) -C $$subdir $$target

View File

@ -1,5 +1,6 @@
include ../../Makefile.config
path_to_top=../..
include $(path_to_top)/Makefile.config
SUBDIRS = man1 man5
include ../../Makefile.lib
include $(path_to_top)/Makefile.lib

View File

@ -1,6 +1,7 @@
include ../../../Makefile.config
path_to_top=../../..
include $(path_to_top)/Makefile.config
install-l:
$(INSTALL_DATA) elinks.1 $(DESTDIR)$(mandir)/man1
include ../../../Makefile.lib
include $(path_to_top)/Makefile.lib

View File

@ -1,7 +1,8 @@
include ../../../Makefile.config
path_to_top=../../..
include $(path_to_top)/Makefile.config
install-l:
$(INSTALL_DATA) elinks.conf.5 $(DESTDIR)$(mandir)/man5
$(INSTALL_DATA) elinkskeys.5 $(DESTDIR)$(mandir)/man5
include ../../../Makefile.lib
include $(path_to_top)/Makefile.lib

View File

@ -1,4 +1,5 @@
include ../Makefile.config
path_to_top=..
include $(path_to_top)/Makefile.config
# Where to install the catalog files.
localedir = $(datadir)/locale
@ -129,4 +130,4 @@ dist: update-po distdir
clean:
rm -f $(PACKAGE).po *.new.po
include ../Makefile.lib
include $(path_to_top)/Makefile.lib

5
src/cache/Makefile vendored
View File

@ -1,8 +1,9 @@
include ../../Makefile.config
path_to_top=../..
include $(path_to_top)/Makefile.config
OBJS = cache.o dialogs.o
all-l: libcache.a
libcache.a: $(OBJS)
include ../../Makefile.lib
include $(path_to_top)/Makefile.lib

View File

@ -1,8 +1,9 @@
include ../../Makefile.config
path_to_top=../..
include $(path_to_top)/Makefile.config
OBJS = cmdline.o conf.o dialogs.o home.o kbdbind.o options.o opttypes.o timer.o urlhist.o
all-l: libconfig.a
libconfig.a: $(OBJS)
include ../../Makefile.lib
include $(path_to_top)/Makefile.lib

View File

@ -1,4 +1,5 @@
include ../../Makefile.config
path_to_top=../..
include $(path_to_top)/Makefile.config
INCLUDES += $(SPIDERMONKEY_CFLAGS)
SUBDIRS = spidermonkey
@ -9,4 +10,4 @@ OBJS = ecmascript.o spidermonkey.o $(foreach obj,$(SM_OBJS),spidermonkey/$(obj))
all-l: libecmascript.a
libecmascript.a: $(OBJS)
include ../../Makefile.lib
include $(path_to_top)/Makefile.lib

View File

@ -1,4 +1,5 @@
include ../../../Makefile.config
path_to_top=../../..
include $(path_to_top)/Makefile.config
INCLUDES += $(SPIDERMONKEY_CFLAGS)
# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
@ -6,4 +7,4 @@ OBJS = document.o form.o location.o navigator.o unibar.o window.o
all-l: $(OBJS)
include ../../../Makefile.lib
include $(path_to_top)/Makefile.lib

View File

@ -1,8 +1,9 @@
include ../../Makefile.config
path_to_top=../..
include $(path_to_top)/Makefile.config
OBJS = formhist.o dialogs.o
all-l: libformhist.a
libformhist.a: $(OBJS)
include ../../Makefile.lib
include $(path_to_top)/Makefile.lib

View File

@ -1,8 +1,9 @@
include ../../Makefile.config
path_to_top=../..
include $(path_to_top)/Makefile.config
OBJS = globhist.o dialogs.o
all-l: libglobhist.a
libglobhist.a: $(OBJS)
include ../../Makefile.lib
include $(path_to_top)/Makefile.lib

View File

@ -1,8 +1,9 @@
include ../../Makefile.config
path_to_top=../..
include $(path_to_top)/Makefile.config
OBJS = download.o history.o location.o session.o task.o
all-l: libsession.a
libsession.a: $(OBJS)
include ../../Makefile.lib
include $(path_to_top)/Makefile.lib