summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2000-11-13 03:06:43 +0000
committerHavoc Pennington <hp@src.gnome.org>2000-11-13 03:06:43 +0000
commitfaa6955d4a3eb26996a2386588ec467c0593c9dd (patch)
tree1a2590e64071f3161214c4e59064626ca190df27
parent0073ae6f9cff7ef9338b63574775ec1666a38af7 (diff)
downloadpango-faa6955d4a3eb26996a2386588ec467c0593c9dd.tar.gz
Remove UNICODE_LIBS UNICODE_CFLAGS
2000-11-12 Havoc Pennington <hp@pobox.com> * pango-config.in: Remove UNICODE_LIBS UNICODE_CFLAGS * modules/thai/Makefile.am (pango_thai_la_LIBADD): ditto * modules/basic/Makefile.am: ditto * pango/Makefile.am: ditto
Diffstat
-rw-r--r--ChangeLog10
-rw-r--r--ChangeLog.pre-1-010
-rw-r--r--ChangeLog.pre-1-1010
-rw-r--r--ChangeLog.pre-1-210
-rw-r--r--ChangeLog.pre-1-410
-rw-r--r--ChangeLog.pre-1-610
-rw-r--r--ChangeLog.pre-1-810
-rw-r--r--examples/Makefile.am4
-rw-r--r--modules/basic/Makefile.am2
-rw-r--r--modules/thai/Makefile.am2
-rw-r--r--pango-config.in4
-rw-r--r--pango/Makefile.am2
12 files changed, 77 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index a45d9588..2ebb604e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-11-12 Havoc Pennington <hp@pobox.com>
+
+ * pango-config.in: Remove UNICODE_LIBS UNICODE_CFLAGS
+
+ * modules/thai/Makefile.am (pango_thai_la_LIBADD): ditto
+
+ * modules/basic/Makefile.am: ditto
+
+ * pango/Makefile.am: ditto
+
Mon Nov 13 02:55:38 2000 Robert Brady <robert@suse.co.uk>
* examples/pangox.aliases: Added
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index a45d9588..2ebb604e 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,13 @@
+2000-11-12 Havoc Pennington <hp@pobox.com>
+
+ * pango-config.in: Remove UNICODE_LIBS UNICODE_CFLAGS
+
+ * modules/thai/Makefile.am (pango_thai_la_LIBADD): ditto
+
+ * modules/basic/Makefile.am: ditto
+
+ * pango/Makefile.am: ditto
+
Mon Nov 13 02:55:38 2000 Robert Brady <robert@suse.co.uk>
* examples/pangox.aliases: Added
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index a45d9588..2ebb604e 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,13 @@
+2000-11-12 Havoc Pennington <hp@pobox.com>
+
+ * pango-config.in: Remove UNICODE_LIBS UNICODE_CFLAGS
+
+ * modules/thai/Makefile.am (pango_thai_la_LIBADD): ditto
+
+ * modules/basic/Makefile.am: ditto
+
+ * pango/Makefile.am: ditto
+
Mon Nov 13 02:55:38 2000 Robert Brady <robert@suse.co.uk>
* examples/pangox.aliases: Added
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index a45d9588..2ebb604e 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,13 @@
+2000-11-12 Havoc Pennington <hp@pobox.com>
+
+ * pango-config.in: Remove UNICODE_LIBS UNICODE_CFLAGS
+
+ * modules/thai/Makefile.am (pango_thai_la_LIBADD): ditto
+
+ * modules/basic/Makefile.am: ditto
+
+ * pango/Makefile.am: ditto
+
Mon Nov 13 02:55:38 2000 Robert Brady <robert@suse.co.uk>
* examples/pangox.aliases: Added
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index a45d9588..2ebb604e 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,13 @@
+2000-11-12 Havoc Pennington <hp@pobox.com>
+
+ * pango-config.in: Remove UNICODE_LIBS UNICODE_CFLAGS
+
+ * modules/thai/Makefile.am (pango_thai_la_LIBADD): ditto
+
+ * modules/basic/Makefile.am: ditto
+
+ * pango/Makefile.am: ditto
+
Mon Nov 13 02:55:38 2000 Robert Brady <robert@suse.co.uk>
* examples/pangox.aliases: Added
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index a45d9588..2ebb604e 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,13 @@
+2000-11-12 Havoc Pennington <hp@pobox.com>
+
+ * pango-config.in: Remove UNICODE_LIBS UNICODE_CFLAGS
+
+ * modules/thai/Makefile.am (pango_thai_la_LIBADD): ditto
+
+ * modules/basic/Makefile.am: ditto
+
+ * pango/Makefile.am: ditto
+
Mon Nov 13 02:55:38 2000 Robert Brady <robert@suse.co.uk>
* examples/pangox.aliases: Added
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index a45d9588..2ebb604e 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,13 @@
+2000-11-12 Havoc Pennington <hp@pobox.com>
+
+ * pango-config.in: Remove UNICODE_LIBS UNICODE_CFLAGS
+
+ * modules/thai/Makefile.am (pango_thai_la_LIBADD): ditto
+
+ * modules/basic/Makefile.am: ditto
+
+ * pango/Makefile.am: ditto
+
Mon Nov 13 02:55:38 2000 Robert Brady <robert@suse.co.uk>
* examples/pangox.aliases: Added
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 2fbdfc1e..ce523e55 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -23,7 +23,7 @@ moc_viewer-qt.cc: viewer-qt.h
BUILT_SOURCES=moc_viewer-qt.cc
-pango_viewer_LDADD = ../pango/libpango.la ../pango/libpangox.la $(FRIBIDI_LIBS) $(UNICODE_LIBS) $(QT_LIBS)
+pango_viewer_LDADD = ../pango/libpango.la ../pango/libpangox.la $(FRIBIDI_LIBS) $(QT_LIBS)
endif
###################################################
@@ -33,7 +33,7 @@ all-local: pango.modules
pango.modules:
( cd ../modules && \
../pango/pango-querymodules `find . -name '*.so'` > ../examples/pango.modules )
-
+
EXTRA_DIST= \
viewer-win32.c \
viewer-ft2.c \
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index 4ccb4869..1f6be554 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -13,7 +13,7 @@ endif
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine)
pango_basic_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
-pango_basic_la_LIBADD = $(UNICODE_LIBS)
+pango_basic_la_LIBADD =
pango_basic_la_SOURCES = $(sources)
libpango_basic_la_SOURCES = $(sources)
diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am
index 38d4fc0e..85890b38 100644
--- a/modules/thai/Makefile.am
+++ b/modules/thai/Makefile.am
@@ -13,7 +13,7 @@ endif
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine)
pango_thai_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
-pango_thai_la_LIBADD = $(UNICODE_LIBS)
+pango_thai_la_LIBADD =
pango_thai_la_SOURCES = $(sources)
libpango_thai_la_SOURCES = $(sources)
diff --git a/pango-config.in b/pango-config.in
index 83a8cc1f..90298aed 100644
--- a/pango-config.in
+++ b/pango-config.in
@@ -82,13 +82,13 @@ if test "$echo_exec_prefix" = "yes"; then
echo $exec_prefix
fi
if test "$echo_cflags" = "yes"; then
- cflags="@UNICODE_CFLAGS@ @GLIB_CFLAGS@"
+ cflags="@GLIB_CFLAGS@"
# Put $cflags first, in case $includes contains a
# location with GLib 1.2 headers, but we build with GLib 2.0.
echo $cflags $includes
fi
if test "$echo_libs" = "yes"; then
- libs="-lpango @FRIBIDI_LIBS@ @UNICODE_LIBS@ @GLIB_LIBS@"
+ libs="-lpango @FRIBIDI_LIBS@ @GLIB_LIBS@"
if test "$lib_pangox" = "yes"; then
libs="@X_LIBS@ -lpangox $libs"
fi
diff --git a/pango/Makefile.am b/pango/Makefile.am
index d5560523..9b55f407 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -80,7 +80,7 @@ pangoinclude_HEADERS = \
#
pango_querymodules_SOURCES = \
querymodules.c
-pango_querymodules_LDADD = libpangox.la libpango.la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(UNICODE_LIBS) $(X_LIBS)
+pango_querymodules_LDADD = libpangox.la libpango.la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(X_LIBS)
EXTRA_DIST = \
module-defs.c.win32 \
View Lorry Controller Status