1
0
mirror of https://github.com/rkd77/elinks.git synced 2024-06-27 01:25:34 +00:00

ELBuild: Use 'include' instead of '-include'

We _do_ want to error on when including .config and .lib failed.
This commit is contained in:
Petr Baudis 2005-09-16 01:09:42 +02:00
parent 201c7956cc
commit 32fe41fae7
12 changed files with 24 additions and 24 deletions

View File

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

View File

@ -1,5 +1,5 @@
-include ../../Makefile.config include ../../Makefile.config
SUBDIRS = man1 man5 SUBDIRS = man1 man5
-include ../../Makefile.lib include ../../Makefile.lib

View File

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

View File

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

View File

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

4
src/cache/Makefile vendored
View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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