From 68b55a8fcb03885865fde4fb6333b640623561e7 Mon Sep 17 00:00:00 2001
From: Petr Baudis <pasky@machine.(none)>
Date: Fri, 16 Sep 2005 13:36:47 +0200
Subject: [PATCH] ELBuildized mime/.

---
 configure.in                 |  4 +---
 src/mime/Makefile            | 25 +++++++++++++++++++++++++
 src/mime/Makefile.am         | 28 ----------------------------
 src/mime/backend/Makefile    | 17 +++++++++++++++++
 src/mime/backend/Makefile.am | 35 -----------------------------------
 5 files changed, 43 insertions(+), 66 deletions(-)
 create mode 100644 src/mime/Makefile
 delete mode 100644 src/mime/Makefile.am
 create mode 100644 src/mime/backend/Makefile
 delete mode 100644 src/mime/backend/Makefile.am

diff --git a/configure.in b/configure.in
index 2bcf895a..de978028 100644
--- a/configure.in
+++ b/configure.in
@@ -1327,9 +1327,7 @@ AC_OUTPUT([ \
  contrib/conv/w3m2links.awk \
  src/intl/Makefile \
  src/intl/gettext/ref-add.sed \
- src/intl/gettext/ref-del.sed \
- src/mime/Makefile \
- src/mime/backend/Makefile
+ src/intl/gettext/ref-del.sed
 ])
 
 
diff --git a/src/mime/Makefile b/src/mime/Makefile
new file mode 100644
index 00000000..1745478c
--- /dev/null
+++ b/src/mime/Makefile
@@ -0,0 +1,25 @@
+path_to_top=../..
+include $(path_to_top)/Makefile.config
+
+SUBDIRS = backend
+
+ifeq ($(CONFIG_MAILCAP),yes)
+mailcapobj = backend/mailcap.o
+endif
+
+ifeq ($(CONFIG_MIMETYPES),yes)
+mimetypesobj = backend/mimetypes.o
+endif
+
+OBJS = \
+ dialogs.o \
+ mime.o \
+ backend/common.o \
+ backend/default.o \
+ $(mailcapobj) \
+ $(mimetypesobj)
+
+all-l: libmime.a
+libmime.a: $(OBJS)
+
+include $(path_to_top)/Makefile.lib
diff --git a/src/mime/Makefile.am b/src/mime/Makefile.am
deleted file mode 100644
index 57591b97..00000000
--- a/src/mime/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.4 2004/05/02 13:08:17 jonas Exp $
-
-include $(top_srcdir)/Makefile.base
-
-if CONFIG_MAILCAP
-mailcapobj = backend/mailcap.o
-endif
-
-if CONFIG_MIMETYPES
-mimetypesobj = backend/mimetypes.o
-endif
-
-SUBDIRS = backend
-
-noinst_LIBRARIES = libmime.a
-
-libmime_a_LIBADD = \
- backend/common.o \
- backend/default.o \
- $(mailcapobj) \
- $(mimetypesobj)
-
-libmime_a_SOURCES = \
- dialogs.c \
- dialogs.h \
- mime.c \
- mime.h
diff --git a/src/mime/backend/Makefile b/src/mime/backend/Makefile
new file mode 100644
index 00000000..20e246e3
--- /dev/null
+++ b/src/mime/backend/Makefile
@@ -0,0 +1,17 @@
+path_to_top=../../..
+include $(path_to_top)/Makefile.config
+
+ifeq ($(CONFIG_MAILCAP),yes)
+mailcapobj = mailcap.o
+endif
+
+ifeq ($(CONFIG_MIMETYPES),yes)
+mimetypesobj = mimetypes.o
+endif
+
+OBJS = common.o default.o $(mailcapobj) $(mimetypeobj)
+
+# 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/mime/backend/Makefile.am b/src/mime/backend/Makefile.am
deleted file mode 100644
index bedf57c0..00000000
--- a/src/mime/backend/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.5 2004/08/14 21:12:39 miciah Exp $
-
-include $(top_srcdir)/Makefile.base
-
-# We don't want to expose this outside of src/mime/ at all, and we can't merge
-# the whole library of these with libmime.a. So we only compile objects here
-# and link them directly to libmime.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 libmimebackend.a ANYWHERE.
-
-if CONFIG_MAILCAP
-mailcapobj = mailcap.o
-endif
-
-if CONFIG_MIMETYPES
-mimetypesobj = mimetypes.o
-endif
-
-noinst_LIBRARIES = libmimebackend.a
-
-EXTRA_libmimebackend_a_SOURCES = \
- mailcap.c \
- mailcap.h \
- mimetypes.c \
- mimetypes.h
-
-libmimebackend_a_LIBADD = $(mailcapobj) $(mimetypesobj)
-
-libmimebackend_a_SOURCES = \
- common.c \
- common.h \
- default.c \
- default.h