pango/makefile.mingw.in pango/mini-fribidi/makefile.mingw Remove. Not

2002-09-23  Tor Lillqvist  <tml@iki.fi>

	* pango/makefile.mingw.in
	* pango/mini-fribidi/makefile.mingw
	* pango/opentype/makefile.mingw.in: Remove. Not maintained.

	* pango/Makefile.am (EXTRA_DIST)
	* pango/mini-fribidi/Makefile.am (EXTRA_DIST)
	* pango/opentype/Makefile.am (EXTRA_DIST): Remove
	makefile.mingw(.in) from here, too.

	* configure.in (AC_OUTPUT): Don't try to output above removed
	files.

13 files changed, 67 insertions, 237 deletions

diff --git a/ChangeLog b/ChangeLog
index 7aac120c..c53babf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,15 +11,20 @@
 
 2002-09-23  Tor Lillqvist  <tml@iki.fi>
 
-	* examples/makefile.mingw.in: Remove. Not maintained.
+	* pango/makefile.mingw.in
+	* pango/mini-fribidi/makefile.mingw
+	* pango/opentype/makefile.mingw.in
+	* examples/makefile.mingw.in
+	* modules/basic/makefile.mingw.in: Remove. Not maintained.
 
 	* examples/pangowin32.aliases: Remove. Not used.
 
-	* examples/Makefile.am (EXTRA_DIST): Remove here, too.
-
-	* modules/basic/makefile.mingw.in: Remove. Not maintained.
-
-	* modules/basic/Makefile.am: Remove from here, too.
+	* pango/Makefile.am (EXTRA_DIST)
+	* pango/mini-fribidi/Makefile.am (EXTRA_DIST)
+	* pango/opentype/Makefile.am (EXTRA_DIST)
+	* examples/Makefile.am (EXTRA_DIST)
+	* modules/basic/Makefile.am (EXTRA_DIST): Remove
+	makefile.mingw(.in) from here, too.
 
 	* configure.in (AC_OUTPUT): Don't try to output above removed
 	files.
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 7aac120c..c53babf6 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -11,15 +11,20 @@
 
 2002-09-23  Tor Lillqvist  <tml@iki.fi>
 
-	* examples/makefile.mingw.in: Remove. Not maintained.
+	* pango/makefile.mingw.in
+	* pango/mini-fribidi/makefile.mingw
+	* pango/opentype/makefile.mingw.in
+	* examples/makefile.mingw.in
+	* modules/basic/makefile.mingw.in: Remove. Not maintained.
 
 	* examples/pangowin32.aliases: Remove. Not used.
 
-	* examples/Makefile.am (EXTRA_DIST): Remove here, too.
-
-	* modules/basic/makefile.mingw.in: Remove. Not maintained.
-
-	* modules/basic/Makefile.am: Remove from here, too.
+	* pango/Makefile.am (EXTRA_DIST)
+	* pango/mini-fribidi/Makefile.am (EXTRA_DIST)
+	* pango/opentype/Makefile.am (EXTRA_DIST)
+	* examples/Makefile.am (EXTRA_DIST)
+	* modules/basic/Makefile.am (EXTRA_DIST): Remove
+	makefile.mingw(.in) from here, too.
 
 	* configure.in (AC_OUTPUT): Don't try to output above removed
 	files.
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 7aac120c..c53babf6 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -11,15 +11,20 @@
 
 2002-09-23  Tor Lillqvist  <tml@iki.fi>
 
-	* examples/makefile.mingw.in: Remove. Not maintained.
+	* pango/makefile.mingw.in
+	* pango/mini-fribidi/makefile.mingw
+	* pango/opentype/makefile.mingw.in
+	* examples/makefile.mingw.in
+	* modules/basic/makefile.mingw.in: Remove. Not maintained.
 
 	* examples/pangowin32.aliases: Remove. Not used.
 
-	* examples/Makefile.am (EXTRA_DIST): Remove here, too.
-
-	* modules/basic/makefile.mingw.in: Remove. Not maintained.
-
-	* modules/basic/Makefile.am: Remove from here, too.
+	* pango/Makefile.am (EXTRA_DIST)
+	* pango/mini-fribidi/Makefile.am (EXTRA_DIST)
+	* pango/opentype/Makefile.am (EXTRA_DIST)
+	* examples/Makefile.am (EXTRA_DIST)
+	* modules/basic/Makefile.am (EXTRA_DIST): Remove
+	makefile.mingw(.in) from here, too.
 
 	* configure.in (AC_OUTPUT): Don't try to output above removed
 	files.
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 7aac120c..c53babf6 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -11,15 +11,20 @@
 
 2002-09-23  Tor Lillqvist  <tml@iki.fi>
 
-	* examples/makefile.mingw.in: Remove. Not maintained.
+	* pango/makefile.mingw.in
+	* pango/mini-fribidi/makefile.mingw
+	* pango/opentype/makefile.mingw.in
+	* examples/makefile.mingw.in
+	* modules/basic/makefile.mingw.in: Remove. Not maintained.
 
 	* examples/pangowin32.aliases: Remove. Not used.
 
-	* examples/Makefile.am (EXTRA_DIST): Remove here, too.
-
-	* modules/basic/makefile.mingw.in: Remove. Not maintained.
-
-	* modules/basic/Makefile.am: Remove from here, too.
+	* pango/Makefile.am (EXTRA_DIST)
+	* pango/mini-fribidi/Makefile.am (EXTRA_DIST)
+	* pango/opentype/Makefile.am (EXTRA_DIST)
+	* examples/Makefile.am (EXTRA_DIST)
+	* modules/basic/Makefile.am (EXTRA_DIST): Remove
+	makefile.mingw(.in) from here, too.
 
 	* configure.in (AC_OUTPUT): Don't try to output above removed
 	files.
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 7aac120c..c53babf6 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -11,15 +11,20 @@
 
 2002-09-23  Tor Lillqvist  <tml@iki.fi>
 
-	* examples/makefile.mingw.in: Remove. Not maintained.
+	* pango/makefile.mingw.in
+	* pango/mini-fribidi/makefile.mingw
+	* pango/opentype/makefile.mingw.in
+	* examples/makefile.mingw.in
+	* modules/basic/makefile.mingw.in: Remove. Not maintained.
 
 	* examples/pangowin32.aliases: Remove. Not used.
 
-	* examples/Makefile.am (EXTRA_DIST): Remove here, too.
-
-	* modules/basic/makefile.mingw.in: Remove. Not maintained.
-
-	* modules/basic/Makefile.am: Remove from here, too.
+	* pango/Makefile.am (EXTRA_DIST)
+	* pango/mini-fribidi/Makefile.am (EXTRA_DIST)
+	* pango/opentype/Makefile.am (EXTRA_DIST)
+	* examples/Makefile.am (EXTRA_DIST)
+	* modules/basic/Makefile.am (EXTRA_DIST): Remove
+	makefile.mingw(.in) from here, too.
 
 	* configure.in (AC_OUTPUT): Don't try to output above removed
 	files.
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 7aac120c..c53babf6 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -11,15 +11,20 @@
 
 2002-09-23  Tor Lillqvist  <tml@iki.fi>
 
-	* examples/makefile.mingw.in: Remove. Not maintained.
+	* pango/makefile.mingw.in
+	* pango/mini-fribidi/makefile.mingw
+	* pango/opentype/makefile.mingw.in
+	* examples/makefile.mingw.in
+	* modules/basic/makefile.mingw.in: Remove. Not maintained.
 
 	* examples/pangowin32.aliases: Remove. Not used.
 
-	* examples/Makefile.am (EXTRA_DIST): Remove here, too.
-
-	* modules/basic/makefile.mingw.in: Remove. Not maintained.
-
-	* modules/basic/Makefile.am: Remove from here, too.
+	* pango/Makefile.am (EXTRA_DIST)
+	* pango/mini-fribidi/Makefile.am (EXTRA_DIST)
+	* pango/opentype/Makefile.am (EXTRA_DIST)
+	* examples/Makefile.am (EXTRA_DIST)
+	* modules/basic/Makefile.am (EXTRA_DIST): Remove
+	makefile.mingw(.in) from here, too.
 
 	* configure.in (AC_OUTPUT): Don't try to output above removed
 	files.
diff --git a/configure.in b/configure.in
index 7bb08329..1ea9c779 100644
--- a/configure.in
+++ b/configure.in
@@ -743,11 +743,9 @@ Makefile
 pango/Makefile
 pango/mini-fribidi/Makefile
 pango/opentype/Makefile
-pango/makefile.mingw
 pango/pango.rc
 pango/pangoft2.rc
 pango/pangowin32.rc
-pango/opentype/makefile.mingw
 modules/Makefile
 modules/arabic/Makefile
 modules/basic/Makefile
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 6924cba4..6c94c7ee 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -294,8 +294,6 @@ EXTRA_DIST =					\
 	pango.def				\
 	pangowin32.def				\
 	pangoft2.def				\
-	makefile.mingw				\
-	makefile.mingw.in			\
 	makefile.msc				\
 	pango.rc				\
 	pango.rc.in				\
diff --git a/pango/makefile.mingw.in b/pango/makefile.mingw.in
deleted file mode 100644
index 7534519c..00000000
--- a/pango/makefile.mingw.in
+++ /dev/null
@@ -1,129 +0,0 @@
-# Out-of-date. Use autoconf,automake etc to build! 
-
-TOP = ../..
-
-include $(TOP)/build/win32/make.mingw
-
-# Possibly override Pango version from build/win32/module.defs
-PANGO_VER = @VERSION@
-
-OPTIMIZE = -g -Wall
-
-INCLUDES = -I .. -I .
-DEFINES = -DPANGO_VERSION=\"$(PANGO_VER)\"
-DEPCFLAGS = $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(FREETYPE2_CFLAGS)
-
-pango_built_headers= pango-enum-types.h
-pango_built_cfiles= pango-enum-types.c
-
-BUILT_SOURCES=$(pango_built_headers) $(pango_built_cfiles)
-
-all :						\
-	../config.h				\
-	$(BUILT_SOURCES)			\
-	pango-$(PANGO_VER).dll			\
-	pangowin32-$(PANGO_VER).dll		\
-	pangoft2-$(PANGO_VER).dll		\
-	pango-querymodules.exe
-
-PANGO_OBJS =					\
-	break.o					\
-	fonts.o					\
-	glyphstring.o				\
-	mapping.o				\
-	modules.o				\
-	pango-attributes.o			\
-	pango-context.o				\
-	pango-coverage.o			\
-	pango-enum-types.o			\
-	pango-fontmap.o				\
-	pango-intset.o				\
-	pango-item.o				\
-	pango-layout.o				\
-	pango-markup.o				\
-	pango-tabs.o				\
-	pango-utils.o				\
-	reorder-items.o				\
-	shape.o
-
-PANGOWIN32_OBJS =				\
-	module-defs-win32.o			\
-	pangowin32.o				\
-	pangowin32-fontcache.o			\
-	pangowin32-fontmap.o
-
-PANGOFT2_OBJS =					\
-	module-defs-ft2.o			\
-	pangoft2.o				\
-	pangoft2-fontcache.o			\
-	pangoft2-fontmap.o
-
-PANGO_QUERYMODULES_OBJS =			\
-	querymodules.o
-
-pango_headers=		   \
-	pango.h		   \
-	pango-attributes.h \
-	pango-break.h	   \
-	pango-context.h	   \
-	pango-coverage.h   \
-	pango-engine.h	   \
-	pango-font.h       \
-	pango-fontmap.h	   \
-	pango-glyph.h	   \
-	pango-indic.h	   \
-	pango-item.h	   \
-	pango-layout.h	   \
-	pango-modules.h	   \
-	pango-tabs.h	   \
-	pango-types.h	   \
-	pango-utils.h
-
-../config.h : ../config.h.win32
-	cp $< $@
-
-module-defs-win32.c : module-defs-win32.c.win32
-	cp $< $@
-
-module-defs-ft2.c : module-defs-ft2.c.win32
-	cp $< $@
-
-pango-$(PANGO_VER).dll : $(PANGO_OBJS) pango.def
-	$(GLIB)/build-dll pango $(PANGO_VER) pango.def $(OPTIMIZE) $(PANGO_OBJS) -L mini-fribidi -lmini-fribidi $(GLIB_LIBS) $(LIBICONV_LIBS)
-
-pangowin32-$(PANGO_VER).dll : $(PANGOWIN32_OBJS) pangowin32.def
-	$(GLIB)/build-dll pangowin32 $(PANGO_VER) pangowin32.def $(OPTIMIZE) $(PANGOWIN32_OBJS) -L . -lpango-$(PANGO_VER) $(GLIB_LIBS) -lgdi32
-
-pangoft2-$(PANGO_VER).dll : $(PANGOFT2_OBJS) pangoft2.def
-	$(GLIB)/build-dll pangoft2 $(PANGO_VER) pangoft2.def $(OPTIMIZE) $(PANGOFT2_OBJS) -L . -lpango-$(PANGO_VER) $(GLIB_LIBS) $(FREETYPE2_LIBS) -lgdi32
-
-pango-querymodules.exe : $(PANGO_QUERYMODULES_OBJS) pango-$(PANGO_VER).dll
-	$(CC) -o $@ $(PANGO_QUERYMODULES_OBJS) -L . -lpango-$(PANGO_VER) $(GLIB_LIBS)
-
-pango-enum-types.h: $(pango_headers) makeenums.pl
-	perl makeenums.pl include $(pango_headers) > pango-enum-types.h
-
-pango-enum-types.c: $(pango_headers) makeenums.pl
-	perl makeenums.pl cfile $(pango_headers) > pango-enum-types.c
-
-test1.exe : test1.o pango-$(PANGO_VER).dll pangowin32-$(PANGO_VER).dll
-	$(CC) -o $@ $(CFLAGS) test1.o -L . -lpango-$(PANGO_VER) -lpangowin32-$(PANGO_VER) $(GLIB_LIBS) -lgdi32
-
-test2.exe : test2.o
-	$(CC) -o $@ $(CFLAGS) test2.o -lgdi32
-
-test3.exe : test3.o
-	$(CC) -o $@ $(CFLAGS) test3.o -lgdi32
-
-test4.exe : test4.o pango-$(PANGO_VER).dll pangowin32-$(PANGO_VER).dll
-	$(CC) -o $@ $(CFLAGS) test4.o -L . -lpango-$(PANGO_VER) -lpangowin32-$(PANGO_VER) $(GLIB_LIBS)
-
-test5.exe : test5.o
-	$(CC) -o $@ $(CFLAGS) test5.o -lgdi32
-
-ifeq ($(wildcard makefile.mingw.in),makefile.mingw.in)
-# Hack to get an updated makefile.mingw automatically after updating
-# makefile.mingw.in. Only for developer use.
-makefile.mingw: makefile.mingw.in
-	sed -e 's,@VER[S]ION@,@VERSION@,' <$< >$@
-endif
diff --git a/pango/mini-fribidi/Makefile.am b/pango/mini-fribidi/Makefile.am
index 74c78800..a27eccde 100644
--- a/pango/mini-fribidi/Makefile.am
+++ b/pango/mini-fribidi/Makefile.am
@@ -22,6 +22,5 @@ libmini_fribidi_la_SOURCES =    \
 
 EXTRA_DIST = 			\
 	README			\
-	makefile.mingw		\
 	fribidi_tables.i	\
 	fribidi.patch
diff --git a/pango/mini-fribidi/makefile.mingw b/pango/mini-fribidi/makefile.mingw
deleted file mode 100644
index dd864e62..00000000
--- a/pango/mini-fribidi/makefile.mingw
+++ /dev/null
@@ -1,22 +0,0 @@
-TOP = ../../..
-
-include $(TOP)/build/win32/make.mingw
-
-OPTIMIZE = -g -Wall
-
-INCLUDES = -I ../.. -I ..
-DEPCFLAGS = $(GLIB_CFLAGS)
-
-all :						\
-	../../config.h				\
-	libmini-fribidi.a
-
-MINI_FRIBIDI_OBJS =				\
-	fribidi.o				\
-	fribidi_get_type.o
-../../config.h : ../../config.h.win32
-	cp $< $@
-
-libmini-fribidi.a : $(MINI_FRIBIDI_OBJS)
-	-rm -f $@
-	$(AR) rv $@ $(MINI_FRIBIDI_OBJS)
diff --git a/pango/opentype/Makefile.am b/pango/opentype/Makefile.am
index e8c016f4..af5e954b 100644
--- a/pango/opentype/Makefile.am
+++ b/pango/opentype/Makefile.am
@@ -48,5 +48,4 @@ ottest_LDADD = 		\
 
 EXTRA_DIST = 		\
 	README		\
-	pango-ot.def	\
-	makefile.mingw.in
+	pango-ot.def
diff --git a/pango/opentype/makefile.mingw.in b/pango/opentype/makefile.mingw.in
deleted file mode 100644
index a3daf0eb..00000000
--- a/pango/opentype/makefile.mingw.in
+++ /dev/null
@@ -1,43 +0,0 @@
-TOP = ../../..
-
-include $(TOP)/build/win32/make.mingw
-
-# Possibly override Pango version from build/win32/module.defs
-PANGO_VER = @VERSION@
-
-OPTIMIZE = -g -Wall
-
-INCLUDES = -I ../.. -I .
-DEFINES = -DPANGO_VERSION=\"$(PANGO_VER)\"
-DEPCFLAGS = $(GLIB_CFLAGS) $(FREETYPE2_CFLAGS)
-
-all :						\
-	../../config.h				\
-	pango-ot-$(PANGO_VER).dll		\
-	ottest.exe
-
-PANGO_OT_OBJS =			\
-	ftxopen.o	 	\
-	ftxgdef.o		\
-	ftxgpos.o 		\
-	pango-ot-info.o		\
-	pango-ot-ruleset.o	\
-	ftxgsub.o
-
-OTTEST_OBJS =		\
-	ottest.o	\
-	disasm.o
-	
-../../config.h : ../../config.h.win32
-	cp $< $@
-
-pango-ot-$(PANGO_VER).dll : $(PANGO_OT_OBJS) pango-ot.def
-	$(GLIB)/build-dll pango-ot $(PANGO_VER) pango-ot.def $(OPTIMIZE) $(PANGO_OT_OBJS) -L .. -lpango-$(PANGO_VER) $(GLIB_LIBS) $(FREETYPE2_LIBS)
-
-ottest.exe : $(OTTEST_OBJS) pango-ot-$(PANGO_VER).dll
-	$(CC) -o $@ $(OTTEST_OBJS) -L . -lpango-ot-$(PANGO_VER) $(GLIB_LIBS) $(FREETYPE2_LIBS)
-
-# Hack to get an updated makefile.mingw automatically after updating
-# makefile.mingw.in. Only for developer use.
-makefile.mingw: makefile.mingw.in
-	sed -e 's,@VER[S]ION@,@VERSION@,' <$< >$@