From 4e2d48cc932e3d5796e1aa9115852a957170278a Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 16 Sep 2005 05:09:08 +0200 Subject: [PATCH] ELBuildize some more stuff. All for tonight, turn for the Americans. --- src/bfu/Makefile | 29 ++++++++++++++++ src/bfu/Makefile.am | 47 -------------------------- src/bookmarks/Makefile | 16 +++++++++ src/bookmarks/Makefile.am | 23 ------------- src/bookmarks/backend/Makefile | 13 +++++++ src/bookmarks/backend/Makefile.am | 26 -------------- src/dialogs/Makefile | 13 +++++++ src/dialogs/Makefile.am | 31 ----------------- src/document/{Makefile.am => Makefile} | 33 ++++++------------ 9 files changed, 81 insertions(+), 150 deletions(-) create mode 100644 src/bfu/Makefile delete mode 100644 src/bfu/Makefile.am create mode 100644 src/bookmarks/Makefile delete mode 100644 src/bookmarks/Makefile.am create mode 100644 src/bookmarks/backend/Makefile delete mode 100644 src/bookmarks/backend/Makefile.am create mode 100644 src/dialogs/Makefile delete mode 100644 src/dialogs/Makefile.am rename src/document/{Makefile.am => Makefile} (61%) diff --git a/src/bfu/Makefile b/src/bfu/Makefile new file mode 100644 index 00000000..f7569e4b --- /dev/null +++ b/src/bfu/Makefile @@ -0,0 +1,29 @@ +path_to_top=../.. +include $(path_to_top)/Makefile.config + +ifeq ($(CONFIG_LEDS),yes) +ledsobj = leds.o +endif + +OBJS = \ + button.o \ + checkbox.o \ + dialog.o \ + group.o \ + hierbox.o \ + hotkey.o \ + inpfield.o \ + inphist.o \ + $(ledsobj) \ + listbox.o \ + listmenu.o \ + menu.o \ + msgbox.o \ + style.o \ + text.o \ + widget.o + +all-l: libbfu.a +libbfu.a: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/bfu/Makefile.am b/src/bfu/Makefile.am deleted file mode 100644 index 13d801b6..00000000 --- a/src/bfu/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.27 2004/11/19 15:33:07 zas Exp $ - -include $(top_srcdir)/Makefile.base - -if CONFIG_LEDS -ledsobj = leds.o -endif - -noinst_LIBRARIES = libbfu.a - -EXTRA_libbfu_a_SOURCES = leds.c leds.h -libbfu_a_LIBADD = $(ledsobj) - -libbfu_a_SOURCES = \ - button.c \ - button.h \ - checkbox.c \ - checkbox.h \ - common.h \ - dialog.c \ - dialog.h \ - group.c \ - group.h \ - hierbox.c \ - hierbox.h \ - hotkey.c \ - hotkey.h \ - inpfield.c \ - inpfield.h \ - inphist.c \ - inphist.h \ - listbox.c \ - listbox.h \ - listmenu.c \ - listmenu.h \ - menu.c \ - menu.h \ - msgbox.c \ - msgbox.h \ - style.c \ - style.h \ - text.c \ - text.h \ - widget.c \ - widget.h - diff --git a/src/bookmarks/Makefile b/src/bookmarks/Makefile new file mode 100644 index 00000000..e82723ee --- /dev/null +++ b/src/bookmarks/Makefile @@ -0,0 +1,16 @@ +path_to_top=../.. +include $(path_to_top)/Makefile.config + +SUBDIRS = backend + +ifeq ($(CONFIG_XBEL_BOOKMARKS),yes) +xbelobj = xbel.o +endif + +BACK_OBJS = common.o default.o $(xbelobj) +OBJS = bookmarks.o dialogs.o $(foreach obj,$(BACK_OBJS),backend/$(obj)) + +all-l: libbookmarks.a +libbookmarks.a: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am deleted file mode 100644 index 19f91137..00000000 --- a/src/bookmarks/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.12 2004/05/02 12:59:42 jonas Exp $ - -include $(top_srcdir)/Makefile.base - -if CONFIG_XBEL_BOOKMARKS -xbelobj = backend/xbel.o -endif - -SUBDIRS = backend - -noinst_LIBRARIES = libbookmarks.a - -libbookmarks_a_LIBADD = \ - backend/common.o \ - backend/default.o \ - $(xbelobj) - -libbookmarks_a_SOURCES = \ - bookmarks.c \ - bookmarks.h \ - dialogs.c \ - dialogs.h diff --git a/src/bookmarks/backend/Makefile b/src/bookmarks/backend/Makefile new file mode 100644 index 00000000..9556734c --- /dev/null +++ b/src/bookmarks/backend/Makefile @@ -0,0 +1,13 @@ +path_to_top=../../.. +include $(path_to_top)/Makefile.config + +ifeq ($(CONFIG_XBEL_BOOKMARKS),yes) +xbelobj = xbel.o +endif + +OBJS = common.o default.o $(xbelobj) + +# Do not forget to also add the .o to ../Makefile. Yes, it sucks. +all-l: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/bookmarks/backend/Makefile.am b/src/bookmarks/backend/Makefile.am deleted file mode 100644 index 20e25ea9..00000000 --- a/src/bookmarks/backend/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.4 2004/08/14 21:12:36 miciah Exp $ - -include $(top_srcdir)/Makefile.base - -# We don't want to expose this outside of /src/bookmarks/ at all, and we can't -# merge the whole library of these with libbookmarks.a. So we only compile -# objects here and link them directly to libbookmarks.a in ../Makefile.am. - -# However, we apparently need to create the library in order to convince -# automake to compile the objects :/. We DON'T use libbackend.a ANYWHERE. - -if CONFIG_XBEL_BOOKMARKS -xbelobj = xbel.o -endif - -noinst_LIBRARIES = libbackend.a - -EXTRA_libbackend_a_SOURCES = xbel.c xbel.h -libbackend_a_LIBADD = $(xbelobj) - -libbackend_a_SOURCES = \ - common.c \ - common.h \ - default.c \ - default.h diff --git a/src/dialogs/Makefile b/src/dialogs/Makefile new file mode 100644 index 00000000..05110a32 --- /dev/null +++ b/src/dialogs/Makefile @@ -0,0 +1,13 @@ +path_to_top=../.. +include $(path_to_top)/Makefile.config + +ifeq ($(CONFIG_EXMODE),yes) +exmodeobj = exmode.o +endif + +OBJS = document.o download.o edit.o $(exmodeobj) info.o menu.o options.o progress.o status.o + +all-l: libdialogs.a +libdialogs.a: $(OBJS) + +include $(path_to_top)/Makefile.lib diff --git a/src/dialogs/Makefile.am b/src/dialogs/Makefile.am deleted file mode 100644 index eeb85704..00000000 --- a/src/dialogs/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.26 2005/04/18 17:00:25 zas Exp $ - -include $(top_srcdir)/Makefile.base - -if CONFIG_EXMODE -exmodeobj = exmode.o -endif - -noinst_LIBRARIES = libdialogs.a - -EXTRA_libdialogs_a_SOURCES = exmode.c exmode.h -libdialogs_a_LIBADD = $(exmodeobj) - -libdialogs_a_SOURCES = \ - document.c \ - document.h \ - download.c \ - download.h \ - edit.c \ - edit.h \ - info.c \ - info.h \ - menu.c \ - menu.h \ - options.c \ - options.h \ - progress.c \ - progress.h \ - status.c \ - status.h diff --git a/src/document/Makefile.am b/src/document/Makefile similarity index 61% rename from src/document/Makefile.am rename to src/document/Makefile index c2661d0f..0cd58f1d 100644 --- a/src/document/Makefile.am +++ b/src/document/Makefile @@ -1,9 +1,7 @@ -## Process this file with automake to produce Makefile.in -## $Id: Makefile.am,v 1.49 2005/07/15 04:37:55 miciah Exp $ +path_to_top=../.. +include $(path_to_top)/Makefile.config -include $(top_srcdir)/Makefile.base - -if CONFIG_CSS +ifeq ($(CONFIG_CSS),yes) cssdir = css cssobj = \ css/apply.o \ @@ -15,7 +13,7 @@ cssobj = \ css/value.o endif -if CONFIG_DOM +ifeq ($(CONFIG_DOM),yes) domdir = dom domobj = \ $(domdir)/navigator.o \ @@ -32,9 +30,7 @@ endif SUBDIRS = $(cssdir) $(domdir) html plain $(sgmldir) -noinst_LIBRARIES = libdocument.a - -libdocument_a_LIBADD = \ +SUB_OBJS = \ $(cssobj) \ $(domobj) \ html/parser/forms.o \ @@ -50,18 +46,9 @@ libdocument_a_LIBADD = \ plain/renderer.o \ $(sgmlobj) -libdocument_a_SOURCES = \ - docdata.c \ - docdata.h \ - document.c \ - document.h \ - forms.c \ - forms.h \ - options.c \ - options.h \ - refresh.c \ - refresh.h \ - renderer.c \ - renderer.h \ - view.h +OBJS = docdata.o document.o forms.o options.o refresh.o renderer.o $(SUB_OBJS) +all-l: libdocument.a +libdocument.a: $(OBJS) + +include $(path_to_top)/Makefile.lib