changeset 21330:a97f24eda509

Kill off another redundant Makefile
author Stu Tomlinson <stu@nosnilmot.com>
date Sun, 11 Nov 2007 18:09:33 +0000
parents a04a0d3f9b4f
children 6e23ec8b1634
files Makefile.am configure.ac share/Makefile.am share/Makefile.mingw
diffstat 4 files changed, 1 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Sun Nov 11 18:08:19 2007 +0000
+++ b/Makefile.am	Sun Nov 11 18:09:33 2007 +0000
@@ -42,7 +42,7 @@
 GNT_DIR=finch
 endif
 
-SUBDIRS = libpurple doc $(GNT_DIR) $(GTK_DIR) m4macros po share
+SUBDIRS = libpurple doc $(GNT_DIR) $(GTK_DIR) m4macros po share/ca-certs share/sounds
 
 docs: Doxyfile
 if HAVE_DOXYGEN
--- a/configure.ac	Sun Nov 11 18:08:19 2007 +0000
+++ b/configure.ac	Sun Nov 11 18:09:33 2007 +0000
@@ -2263,7 +2263,6 @@
 		   libpurple/tests/Makefile
 		   libpurple/purple.h
 		   libpurple/version.h
-		   share/Makefile
 		   share/sounds/Makefile
 		   share/ca-certs/Makefile
 		   finch/finch.pc
--- a/share/Makefile.am	Sun Nov 11 18:08:19 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-
-SUBDIRS = sounds ca-certs
-
-EXTRA_DIST = Makefile.mingw
--- a/share/Makefile.mingw	Sun Nov 11 18:08:19 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version
-#
-
-PIDGIN_TREE_TOP := ..
-include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
-
-include ./Makefile.am
-
-.PHONY: install clean
-
-install:
-	if test '$(SUBDIRS)'; then \
-	  list='$(SUBDIRS)'; for subdir in $$list; do \
-	    $(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) install || exit 1 ;\
-	  done; \
-	fi;