aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-01-03 14:57:44 -05:00
Code

Merge with http://elinks.or.cz/elinks.git

Browse Source
This commit is contained in:
Frobozz the Neuromancer,668,302-521-2606,609-645-8080 2005-09-15 21:09:17 -04:00
commit 9c0a913339
15 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

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

1
Makefile.config.in
View File

@ -6,6 +6,7 @@
SHELL = @SHELL@ SHELL = @SHELL@
top_srcdir = $(path_to_top)/@top_srcdir@ top_srcdir = $(path_to_top)/@top_srcdir@
srcdir = $(top_srcdir)/$(shell pwd | sed 's!.*/\($(shell echo $(path_to_top) | sed 's!\.\.![^/]*!')\)$$!\1!')
top_builddir = $(path_to_top) top_builddir = $(path_to_top)
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@

2
Makefile.lib
View File

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

1
configure.in
View File

@ -1267,7 +1267,6 @@ AC_OUTPUT([ \
contrib/lua/hooks.lua \ contrib/lua/hooks.lua \
contrib/conv/w3m2links.awk \ contrib/conv/w3m2links.awk \
doc/Makefile \ doc/Makefile \
po/Makefile \
src/Makefile \ src/Makefile \
src/bfu/Makefile \ src/bfu/Makefile \
src/bookmarks/Makefile \ src/bookmarks/Makefile \

5
doc/man/Makefile
View File

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

5
doc/man/man1/Makefile
View File

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

5
doc/man/man5/Makefile
View File

@ -1,7 +1,8 @@
include ../../../Makefile.config path_to_top=../../..
include $(path_to_top)/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 $(path_to_top)/Makefile.lib

6
po/Makefile
View File

@ -1,4 +1,5 @@
include ../Makefile.config path_to_top=..
include $(path_to_top)/Makefile.config
# Where to install the catalog files. # Where to install the catalog files.
localedir = $(datadir)/locale localedir = $(datadir)/locale
@ -11,6 +12,7 @@ POTFILES_ABS = $(shell cd $(top_srcdir); find src/ -name '*.[ch]' -o -name optio
SUFFIXES = .po .gmo .mo SUFFIXES = .po .gmo .mo
.SUFFIXES: .gmo .mo .po
.po.mo: .po.mo:
$(MSGFMT) -o $@ $< $(MSGFMT) -o $@ $<
@ -129,4 +131,4 @@ dist: update-po distdir
clean: clean:
rm -f $(PACKAGE).po *.new.po 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 OBJS = cache.o dialogs.o
all-l: libcache.a all-l: libcache.a
libcache.a: $(OBJS) libcache.a: $(OBJS)
include ../../Makefile.lib include $(path_to_top)/Makefile.lib

5
src/config/Makefile
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 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 $(path_to_top)/Makefile.lib

5
src/ecmascript/Makefile
View File

@ -1,4 +1,5 @@
include ../../Makefile.config path_to_top=../..
include $(path_to_top)/Makefile.config
INCLUDES += $(SPIDERMONKEY_CFLAGS) INCLUDES += $(SPIDERMONKEY_CFLAGS)
SUBDIRS = spidermonkey SUBDIRS = spidermonkey
@ -9,4 +10,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 $(path_to_top)/Makefile.lib

5
src/ecmascript/spidermonkey/Makefile
View File

@ -1,4 +1,5 @@
include ../../../Makefile.config path_to_top=../../..
include $(path_to_top)/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 +7,4 @@ OBJS = document.o form.o location.o navigator.o unibar.o window.o
all-l: $(OBJS) all-l: $(OBJS)
include ../../../Makefile.lib include $(path_to_top)/Makefile.lib

5
src/formhist/Makefile
View File

@ -1,8 +1,9 @@
include ../../Makefile.config path_to_top=../..
include $(path_to_top)/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 $(path_to_top)/Makefile.lib

5
src/globhist/Makefile
View File

@ -1,8 +1,9 @@
include ../../Makefile.config path_to_top=../..
include $(path_to_top)/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 $(path_to_top)/Makefile.lib

5
src/session/Makefile
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 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 $(path_to_top)/Makefile.lib