3 files changed, 27 insertions, 35 deletions
diff --git a/make/ChangeLog b/make/ChangeLog
index 8562183c36..953148d4e1 100644
--- a/make/ChangeLog
+++ b/make/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* custom/Makefile.am: Remove.
+	* Makefile.am: Merge-in former custom/Makefile.am
+
 2003-11-24	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* custom/HPUX9-posix.cfg: Remove INLINE, INLINE_UPCASE.
diff --git a/make/Makefile.am b/make/Makefile.am
index f893a2f674..c6a31ec517 100644
--- a/make/Makefile.am
+++ b/make/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 rtems_makedir = $(prefix)/make
 
 rtems_make_DATA = main.cfg leaf.cfg
@@ -11,18 +10,29 @@ EXTRA_DIST = host.cfg.in leaf.cfg
 
 rtems_make_Templatesdir = $(rtems_makedir)/Templates
 
-rtems_make_Templates_DATA = \
-   Templates/Makefile.dir \
-   Templates/Makefile.leaf \
-   Templates/Makefile.lib
+rtems_make_Templates_DATA = Templates/Makefile.dir Templates/Makefile.leaf \
+    Templates/Makefile.lib
+
+EXTRA_DIST += compilers/gcc-no_bsp.cfg compilers/gcc-portsw.cfg \
+    compilers/gcc-target-default.cfg
+
+rtems_make_customdir = $(rtems_makedir)/custom
 
-EXTRA_DIST += \
-   compilers/gcc-no_bsp.cfg \
-   compilers/gcc-portsw.cfg \
-   compilers/gcc-target-default.cfg
+rtems_make_custom_DATA = custom/default.cfg
 
-SUBDIRS = custom
+EXTRA_DIST = custom/Cygwin-posix.cfg custom/FreeBSD-posix.cfg \
+    custom/HPUX9-posix.cfg custom/Linux-posix.cfg custom/Solaris-posix.cfg \
+    custom/bare.cfg custom/cvme961.cfg custom/dmv152.cfg custom/dmv177.cfg \
+    custom/efi332.cfg custom/efi68k.cfg custom/erc32.cfg custom/erc32nfp.cfg \
+    custom/eth_comm.cfg custom/gen68302.cfg custom/gen68340.cfg \
+    custom/gen68360.cfg custom/gen68360_040.cfg custom/gensh1.cfg \
+    custom/helas403.cfg custom/i386ex.cfg custom/idp.cfg custom/jmr3904.cfg \
+    custom/leon1.cfg custom/leon2.cfg custom/mcp750.cfg custom/mvme136.cfg \
+    custom/mvme147.cfg custom/mvme147s.cfg custom/mvme162.cfg \
+    custom/mvme162lx.cfg custom/mvme167.cfg custom/mvme2307.cfg \
+    custom/no_bsp.cfg custom/ods68302.cfg custom/p4000.cfg custom/p4600.cfg \
+    custom/p4650.cfg custom/pc386.cfg custom/portsw.cfg custom/posix.cfg \
+    custom/ppcn_60x.cfg custom/psim.cfg custom/score603e.cfg \
+    custom/shsim.cfg custom/simhppa.cfg custom/ts_386ex.cfg
 
-## -------------------------------------------------------
-include $(top_srcdir)/automake/subdirs.am
 include $(top_srcdir)/automake/host.am
diff --git a/make/custom/Makefile.am b/make/custom/Makefile.am
deleted file mode 100644
index b42a5041ad..0000000000
--- a/make/custom/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-##
-## $Id$
-##
-
-
-rtems_makedir = $(prefix)/make
-rtems_make_customdir = $(rtems_makedir)/custom
-
-rtems_make_custom_DATA = default.cfg
-
-EXTRA_DIST = Cygwin-posix.cfg FreeBSD-posix.cfg HPUX9-posix.cfg \
-    Linux-posix.cfg Solaris-posix.cfg bare.cfg cvme961.cfg dmv152.cfg \
-    dmv177.cfg efi332.cfg efi68k.cfg erc32.cfg erc32nfp.cfg eth_comm.cfg \
-    gen68302.cfg gen68340.cfg gen68360.cfg gen68360_040.cfg gensh1.cfg \
-    helas403.cfg i386ex.cfg idp.cfg jmr3904.cfg leon1.cfg leon2.cfg \
-    mcp750.cfg mvme136.cfg mvme147.cfg mvme147s.cfg \
-    mvme162.cfg mvme162lx.cfg mvme167.cfg mvme2307.cfg no_bsp.cfg \
-    ods68302.cfg p4000.cfg p4600.cfg p4650.cfg pc386.cfg \
-    portsw.cfg posix.cfg ppcn_60x.cfg psim.cfg score603e.cfg shsim.cfg \
-    simhppa.cfg ts_386ex.cfg
-
-## -------------------------------------------------------
-include $(top_srcdir)/automake/host.am