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

Finalize and cleanup the denser Makefile format

Browse Source 
Convert remaining conditional file building to use

	OBJS-$(CONFIG_FOO) += foo.o

one problem with reverse meaining (in util/) fixed with local 'hack'.

Cleanup and remove stuff which is now default targets.
This commit is contained in:
Jonas Fonseca 2005-09-28 12:38:17 +02:00 committed by Jonas Fonseca
parent bd8f005413
commit 94ed6fa754
20 changed files with 48 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bfu/Makefile
View File

@ -1,9 +1,7 @@
path_to_top=../.. path_to_top=../..
include $(path_to_top)/Makefile.config include $(path_to_top)/Makefile.config
ifeq ($(CONFIG_LEDS),yes) OBJS-$(CONFIG_LEDS) += leds.o
ledsobj = leds.o
endif
OBJS = \ OBJS = \
button.o \ button.o \
@ -14,7 +12,6 @@ OBJS = \
hotkey.o \ hotkey.o \
inpfield.o \ inpfield.o \
inphist.o \ inphist.o \
$(ledsobj) \
listbox.o \ listbox.o \
listmenu.o \ listmenu.o \
menu.o \ menu.o \

1
src/bookmarks/Makefile
View File

@ -2,7 +2,6 @@ path_to_top=../..
include $(path_to_top)/Makefile.config include $(path_to_top)/Makefile.config
SUBDIRS = backend SUBDIRS = backend
OBJS = bookmarks.o dialogs.o OBJS = bookmarks.o dialogs.o
include $(path_to_top)/Makefile.lib include $(path_to_top)/Makefile.lib

10
src/bookmarks/backend/Makefile
View File

@ -1,13 +1,7 @@
path_to_top=../../.. path_to_top=../../..
include $(path_to_top)/Makefile.config include $(path_to_top)/Makefile.config
ifeq ($(CONFIG_XBEL_BOOKMARKS),yes) OBJS-$(CONFIG_XBEL_BOOKMARKS) += xbel.o
xbelobj = xbel.o OBJS = common.o default.o
endif
OBJS = common.o default.o $(xbelobj)
# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
all-local: $(OBJS)
include $(path_to_top)/Makefile.lib include $(path_to_top)/Makefile.lib

6
src/dialogs/Makefile
View File

@ -1,10 +1,8 @@
path_to_top=../.. path_to_top=../..
include $(path_to_top)/Makefile.config include $(path_to_top)/Makefile.config
ifeq ($(CONFIG_EXMODE),yes) OBJS-$(CONFIG_EXMODE) += exmode.o
exmodeobj = exmode.o
endif
OBJS = document.o download.o edit.o $(exmodeobj) info.o menu.o options.o progress.o status.o OBJS = document.o download.o edit.o info.o menu.o options.o progress.o status.o
include $(path_to_top)/Makefile.lib include $(path_to_top)/Makefile.lib

3
src/document/html/Makefile
View File

@ -2,7 +2,6 @@ path_to_top=../../..
include $(path_to_top)/Makefile.config include $(path_to_top)/Makefile.config
SUBDIRS = parser SUBDIRS = parser
OBJS = frames.o parser.o renderer.o tables.o
OBJS = frames.o parser.o renderer.o tables.o parser/lib.o
include $(path_to_top)/Makefile.lib include $(path_to_top)/Makefile.lib

1
src/document/sgml/Makefile
View File

@ -2,7 +2,6 @@ path_to_top=../../..
include $(path_to_top)/Makefile.config include $(path_to_top)/Makefile.config
SUBDIRS = html SUBDIRS = html
OBJS = sgml.o parser.o scanner.o OBJS = sgml.o parser.o scanner.o
include $(path_to_top)/Makefile.lib include $(path_to_top)/Makefile.lib

1
src/ecmascript/Makefile
View File

@ -3,7 +3,6 @@ include $(path_to_top)/Makefile.config
INCLUDES += $(SPIDERMONKEY_CFLAGS) INCLUDES += $(SPIDERMONKEY_CFLAGS)
SUBDIRS = spidermonkey SUBDIRS = spidermonkey
OBJS = ecmascript.o spidermonkey.o OBJS = ecmascript.o spidermonkey.o
include $(path_to_top)/Makefile.lib include $(path_to_top)/Makefile.lib

11
src/encoding/Makefile
View File

@ -1,14 +1,9 @@
path_to_top=../.. path_to_top=../..
include $(path_to_top)/Makefile.config include $(path_to_top)/Makefile.config
ifeq ($(CONFIG_BZIP2),yes) OBJS-$(CONFIG_BZIP2) += bzip2.o
bzip2obj = bzip2.o OBJS-$(CONFIG_GZIP) += gzip.o
endif
ifeq ($(CONFIG_GZIP),yes) OBJS = encoding.o
gzipobj = gzip.o
endif
OBJS = encoding.o $(bzip2obj) $(gzipobj)
include $(path_to_top)/Makefile.lib include $(path_to_top)/Makefile.lib

6
src/main/Makefile
View File

@ -1,10 +1,8 @@
path_to_top=../.. path_to_top=../..
include $(path_to_top)/Makefile.config include $(path_to_top)/Makefile.config
ifeq ($(CONFIG_INTERLINK),yes) OBJS-$(CONFIG_INTERLINK) += interlink.o
interlinkobj = interlink.o
endif
OBJS = event.o $(interlinkobj) main.o module.o select.o timer.o version.o OBJS = event.o main.o module.o select.o timer.o version.o
include $(path_to_top)/Makefile.lib include $(path_to_top)/Makefile.lib

5
src/mime/Makefile
View File

@ -2,9 +2,6 @@ path_to_top=../..
include $(path_to_top)/Makefile.config include $(path_to_top)/Makefile.config
SUBDIRS = backend SUBDIRS = backend
OBJS = dialogs.o mime.o
OBJS = \
dialogs.o \
mime.o
include $(path_to_top)/Makefile.lib include $(path_to_top)/Makefile.lib

11
src/mime/backend/Makefile
View File

@ -1,14 +1,9 @@
path_to_top=../../.. path_to_top=../../..
include $(path_to_top)/Makefile.config include $(path_to_top)/Makefile.config
ifeq ($(CONFIG_MAILCAP),yes) OBJS-$(CONFIG_MAILCAP) += mailcap.o
mailcapobj = mailcap.o OBJS-$(CONFIG_MIMETYPES) += mimetypes.o
endif
ifeq ($(CONFIG_MIMETYPES),yes) OBJS = common.o default.o
mimetypesobj = mimetypes.o
endif
OBJS = common.o default.o $(mailcapobj) $(mimetypesobj)
include $(path_to_top)/Makefile.lib include $(path_to_top)/Makefile.lib

6
src/protocol/Makefile
View File

@ -9,10 +9,10 @@ SUBDIRS-$(CONFIG_NNTP) += nntp
SUBDIRS-$(CONFIG_SMB) += smb SUBDIRS-$(CONFIG_SMB) += smb
SUBDIRS-$(CONFIG_URI_REWRITE) += rewrite SUBDIRS-$(CONFIG_URI_REWRITE) += rewrite
OBJS-$(CONFIG_DATA) += data.o
SUBDIRS = auth file http SUBDIRS = auth file http
OBJS = about.o $(dataobj) date.o header.o protocol.o proxy.o uri.o user.o OBJS-$(CONFIG_DATA) += data.o
OBJS = about.o date.o header.o protocol.o proxy.o uri.o user.o
include $(path_to_top)/Makefile.lib include $(path_to_top)/Makefile.lib

11
src/protocol/bittorrent/Makefile
View File

@ -3,6 +3,15 @@ include $(path_to_top)/Makefile.config
INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS) INCLUDES += $(GNUTLS_CFLAGS) $(OPENSSL_CFLAGS)
OBJS = bencoding.o bittorrent.o common.o connection.o dialogs.o peerconnect.o peerwire.o piececache.o tracker.o OBJS = \
bencoding.o \
bittorrent.o \
common.o \
connection.o \
dialogs.o \
peerconnect.o \
peerwire.o \
piececache.o \
tracker.o
include $(path_to_top)/Makefile.lib include $(path_to_top)/Makefile.lib

6
src/protocol/file/Makefile
View File

@ -1,10 +1,8 @@
path_to_top=../../.. path_to_top=../../..
include $(path_to_top)/Makefile.config include $(path_to_top)/Makefile.config
ifeq ($(CONFIG_CGI),yes) OBJS-$(CONFIG_CGI) += cgi.o
cgiobj = cgi.o
endif
OBJS = file.o $(cgiobj) OBJS = file.o
include $(path_to_top)/Makefile.lib include $(path_to_top)/Makefile.lib

5
src/terminal/Makefile
View File

@ -1,9 +1,7 @@
path_to_top=../.. path_to_top=../..
include $(path_to_top)/Makefile.config include $(path_to_top)/Makefile.config
ifeq ($(CONFIG_MOUSE),yes) OBJS-$(CONFIG_MOUSE) += mouse.o
mouseobj = mouse.o
endif
OBJS = \ OBJS = \
color.o \ color.o \
@ -11,7 +9,6 @@ OBJS = \
event.o \ event.o \
hardio.o \ hardio.o \
kbd.o \ kbd.o \
$(mouseobj) \
screen.o \ screen.o \
tab.o \ tab.o \
terminal.o \ terminal.o \

38
src/util/Makefile
View File

@ -1,30 +1,15 @@
path_to_top=../.. path_to_top=../..
include $(path_to_top)/Makefile.config include $(path_to_top)/Makefile.config
ifeq ($(CONFIG_DEBUG),yes) # Reverse a CONFIG_* string
debugobj = memdebug.o # Usage $(call not,$(CONFIG_FOO))
endif not = $(if $(findstring yes,$(1)),no,yes)
ifeq ($(CONFIG_MD5),yes) OBJS-$(CONFIG_DEBUG) += memdebug.o
md5obj = md5.o OBJS-$(CONFIG_MD5) += md5.o
endif OBJS-$(CONFIG_SCANNER) += scanner.o
OBJS-$(CONFIG_SHA1) += sha1.o
ifeq ($(CONFIG_SCANNER),yes) OBJS-$(call not,$(CONFIG_SMALL)) += fastfind.o
scannerobj = scanner.o
endif
ifeq ($(CONFIG_SHA1),yes)
sha1obj = sha1.o
endif
ifeq ($(CONFIG_SMALL),yes)
else
fastfindobj = fastfind.o
endif
ifeq ($(CONFIG_MOUSE),yes)
mouseobj = mouse.o
endif
OBJS = \ OBJS = \
base64.o \ base64.o \
@ -39,11 +24,6 @@ OBJS = \
secsave.o \ secsave.o \
snprintf.o \ snprintf.o \
string.o \ string.o \
time.o \ time.o
$(debugobj) \
$(fastfindobj) \
$(md5obj) \
$(scannerobj) \
$(sha1obj)
include $(path_to_top)/Makefile.lib include $(path_to_top)/Makefile.lib

5
src/viewer/Makefile
View File

@ -2,9 +2,6 @@ path_to_top=../..
include $(path_to_top)/Makefile.config include $(path_to_top)/Makefile.config
SUBDIRS = dump text SUBDIRS = dump text
OBJS = action.o timer.o
OBJS = \
action.o \
timer.o
include $(path_to_top)/Makefile.lib include $(path_to_top)/Makefile.lib

6
src/viewer/text/Makefile
View File

@ -1,10 +1,8 @@
path_to_top=../../.. path_to_top=../../..
include $(path_to_top)/Makefile.config include $(path_to_top)/Makefile.config
ifeq ($(CONFIG_MARKS),yes) OBJS-$(CONFIG_MARKS) += marks.o
marksobj = marks.o
endif
OBJS = draw.o form.o link.o $(marksobj) search.o textarea.o view.o vs.o OBJS = draw.o form.o link.o search.o textarea.o view.o vs.o
include $(path_to_top)/Makefile.lib include $(path_to_top)/Makefile.lib