summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--examples/Makefile.am1
-rw-r--r--examples/pangowin32tobmp.c (renamed from pango/testfonts.c)0
-rw-r--r--pango/Makefile.am8
4 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 7f7c5e87..b2c662ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-23 Tor Lillqvist <tml@novell.com>
+
+ * pango/Makefile.am
+ * examples/Makefile.am
+ * pango/testfonts.c
+ * examples/pangowin32tobmp.c: Rename pango/testfonts.c to
+ examples/pangowin32tobmp.c. (#104151)
+
2006-08-22 Behdad Esfahbod <behdad@gnome.org>
* pango/pango-context.c (itemize_state_process_run): Replace (!isgraph
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 9a3a10b8..46f85304 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -14,6 +14,7 @@ TEST_TEXTS = \
EXTRA_DIST = \
viewer-win32.c \
+ pangowin32tobmp.c \
$(TEST_TEXTS)
CLEANFILES = pangorc
diff --git a/pango/testfonts.c b/examples/pangowin32tobmp.c
index 8586a01a..8586a01a 100644
--- a/pango/testfonts.c
+++ b/examples/pangowin32tobmp.c
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 728b2fe1..7728215c 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -269,10 +269,7 @@ libpangocairo_1_0_la_DEPENDENCIES += pangocairo.def
libpangocairo_1_0_la_LIBADD += libpangowin32-$(PANGO_API_VERSION).la $(WIN32_LIBS)
libpangocairo_1_0_la_DEPENDENCIES += libpangowin32-$(PANGO_API_VERSION).la
-libpangocairo_1_0_la_SOURCES += \
- pangocairo-win32font.c \
- pangocairo-win32fontmap.c \
- pangocairo-win32.h
+libpangocairo_1_0_la_SOURCES += pangocairo-win32font.c pangocairo-win32fontmap.c pangocairo-win32.h
endif
if HAVE_CAIRO_FREETYPE
@@ -433,8 +430,7 @@ EXTRA_DIST = \
pangoft2.rc \
pangoft2.rc.in \
pangowin32.rc \
- pangowin32.rc.in \
- testfonts.c
+ pangowin32.rc.in
if HAVE_INCLUDED_MODULES