summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog13
-rw-r--r--ChangeLog.pre-1-1013
-rw-r--r--ChangeLog.pre-1-213
-rw-r--r--ChangeLog.pre-1-413
-rw-r--r--ChangeLog.pre-1-613
-rw-r--r--ChangeLog.pre-1-813
-rw-r--r--configure.in1
-rw-r--r--pango/mini-fribidi/Makefile.am1
-rw-r--r--pango/mini-fribidi/makefile.mingw22
-rw-r--r--pango/opentype/Makefile.am3
-rw-r--r--pango/opentype/makefile.mingw.in43
11 files changed, 49 insertions, 99 deletions
diff --git a/ChangeLog b/ChangeLog
index 45dc00f3..5f8685c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,13 +11,16 @@
2002-09-23 Tor Lillqvist <tml@iki.fi>
- * examples/makefile.mingw.in: Remove. Not maintained.
-
- * examples/Makefile.am (EXTRA_DIST): Remove here, too.
-
+ * pango/mini-fribidi/makefile.mingw
+ * pango/opentype/makefile.mingw.in
+ * examples/makefile.mingw.in
* modules/basic/makefile.mingw.in: Remove. Not maintained.
- * modules/basic/Makefile.am (EXTRA_DIST): Remove from here, too.
+ * 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 45dc00f3..5f8685c6 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -11,13 +11,16 @@
2002-09-23 Tor Lillqvist <tml@iki.fi>
- * examples/makefile.mingw.in: Remove. Not maintained.
-
- * examples/Makefile.am (EXTRA_DIST): Remove here, too.
-
+ * pango/mini-fribidi/makefile.mingw
+ * pango/opentype/makefile.mingw.in
+ * examples/makefile.mingw.in
* modules/basic/makefile.mingw.in: Remove. Not maintained.
- * modules/basic/Makefile.am (EXTRA_DIST): Remove from here, too.
+ * 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 45dc00f3..5f8685c6 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -11,13 +11,16 @@
2002-09-23 Tor Lillqvist <tml@iki.fi>
- * examples/makefile.mingw.in: Remove. Not maintained.
-
- * examples/Makefile.am (EXTRA_DIST): Remove here, too.
-
+ * pango/mini-fribidi/makefile.mingw
+ * pango/opentype/makefile.mingw.in
+ * examples/makefile.mingw.in
* modules/basic/makefile.mingw.in: Remove. Not maintained.
- * modules/basic/Makefile.am (EXTRA_DIST): Remove from here, too.
+ * 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 45dc00f3..5f8685c6 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -11,13 +11,16 @@
2002-09-23 Tor Lillqvist <tml@iki.fi>
- * examples/makefile.mingw.in: Remove. Not maintained.
-
- * examples/Makefile.am (EXTRA_DIST): Remove here, too.
-
+ * pango/mini-fribidi/makefile.mingw
+ * pango/opentype/makefile.mingw.in
+ * examples/makefile.mingw.in
* modules/basic/makefile.mingw.in: Remove. Not maintained.
- * modules/basic/Makefile.am (EXTRA_DIST): Remove from here, too.
+ * 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 45dc00f3..5f8685c6 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -11,13 +11,16 @@
2002-09-23 Tor Lillqvist <tml@iki.fi>
- * examples/makefile.mingw.in: Remove. Not maintained.
-
- * examples/Makefile.am (EXTRA_DIST): Remove here, too.
-
+ * pango/mini-fribidi/makefile.mingw
+ * pango/opentype/makefile.mingw.in
+ * examples/makefile.mingw.in
* modules/basic/makefile.mingw.in: Remove. Not maintained.
- * modules/basic/Makefile.am (EXTRA_DIST): Remove from here, too.
+ * 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 45dc00f3..5f8685c6 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -11,13 +11,16 @@
2002-09-23 Tor Lillqvist <tml@iki.fi>
- * examples/makefile.mingw.in: Remove. Not maintained.
-
- * examples/Makefile.am (EXTRA_DIST): Remove here, too.
-
+ * pango/mini-fribidi/makefile.mingw
+ * pango/opentype/makefile.mingw.in
+ * examples/makefile.mingw.in
* modules/basic/makefile.mingw.in: Remove. Not maintained.
- * modules/basic/Makefile.am (EXTRA_DIST): Remove from here, too.
+ * 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 65662cde..7ffa058e 100644
--- a/configure.in
+++ b/configure.in
@@ -757,7 +757,6 @@ 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/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@,' <$< >$@
View Lorry Controller Status