From b148322e1ee57914919c4bb039c4f73ab502fa95 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Wed, 24 Aug 2011 20:30:18 -0400
Subject: [PATCH] Updated Makefile setup for newer automake
---
Docs/Makefile | 9 ---------
Docs/Makefile.in | 9 ---------
Images/Makefile | 9 ---------
Images/Makefile.in | 9 ---------
Makefile.am | 3 ++-
configure.in | 2 --
6 files changed, 2 insertions(+), 39 deletions(-)
delete mode 100644 Docs/Makefile
delete mode 100644 Docs/Makefile.in
delete mode 100644 Images/Makefile
delete mode 100644 Images/Makefile.in
diff --git a/Docs/Makefile b/Docs/Makefile
deleted file mode 100644
index d1458d5f..00000000
--- a/Docs/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# This is the minimum Makefile necessary to include this directory
-# in the package distribution build process
-
-# Succeed at the default target
-all:
-
-# Copy this directory to the distribution build directory
-distdir:
- cp -rp . $(distdir)
diff --git a/Docs/Makefile.in b/Docs/Makefile.in
deleted file mode 100644
index d1458d5f..00000000
--- a/Docs/Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
-# This is the minimum Makefile necessary to include this directory
-# in the package distribution build process
-
-# Succeed at the default target
-all:
-
-# Copy this directory to the distribution build directory
-distdir:
- cp -rp . $(distdir)
diff --git a/Images/Makefile b/Images/Makefile
deleted file mode 100644
index d1458d5f..00000000
--- a/Images/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# This is the minimum Makefile necessary to include this directory
-# in the package distribution build process
-
-# Succeed at the default target
-all:
-
-# Copy this directory to the distribution build directory
-distdir:
- cp -rp . $(distdir)
diff --git a/Images/Makefile.in b/Images/Makefile.in
deleted file mode 100644
index d1458d5f..00000000
--- a/Images/Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
-# This is the minimum Makefile necessary to include this directory
-# in the package distribution build process
-
-# Succeed at the default target
-all:
-
-# Copy this directory to the distribution build directory
-distdir:
- cp -rp . $(distdir)
diff --git a/Makefile.am b/Makefile.am
index 4a9e949c..6f8cae9f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,6 +47,7 @@ EXTRA_DIST = \
MPWmake.sea.bin \
CREDITS \
Changelog \
+ Docs \
README.joystick \
README.network \
README.options \
@@ -61,7 +62,7 @@ EXTRA_DIST = \
icon.bmp icon.xpm \
Maelstrom.spec
-DIST_SUBDIRS = $(SUBDIRS) Images Docs
+DIST_SUBDIRS = $(SUBDIRS)
# Special install rule for the game
install:
diff --git a/configure.in b/configure.in
index 0170f4b1..bae6e932 100644
--- a/configure.in
+++ b/configure.in
@@ -120,7 +120,5 @@ Makefile
netlogic/Makefile
screenlib/Makefile
maclib/Makefile
-Images/Makefile
-Docs/Makefile
Maelstrom.spec
])