summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Levitt <nlevitt@columbia.edu>2003-08-03 19:53:58 +0000
committerNoah Levitt <nlevitt@src.gnome.org>2003-08-03 19:53:58 +0000
commit95a8d1788e884b7d8d29d4171a1adc51c61e880e (patch)
tree53a45dc87b92868e0908d1e1be1440b8e03ce813
parentf17ec3b95a5ee742f3b5563d11278b4c1916b1fc (diff)
downloadpango-95a8d1788e884b7d8d29d4171a1adc51c61e880e.tar.gz
Really make pangoxft depend on pangoft2. (#119024)
2003-08-03 Noah Levitt <nlevitt@columbia.edu> * pango/Makefile.am (libpangoxft_1_0_la_DEPENDENCIES): Really make pangoxft depend on pangoft2. (#119024)
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--ChangeLog.pre-1-45
-rw-r--r--ChangeLog.pre-1-65
-rw-r--r--ChangeLog.pre-1-85
-rw-r--r--pango/Makefile.am2
6 files changed, 26 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e3ffa29..d9e4dd41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-03 Noah Levitt <nlevitt@columbia.edu>
+
+ * pango/Makefile.am (libpangoxft_1_0_la_DEPENDENCIES): Really make
+ pangoxft depend on pangoft2. (#119024)
+
Sat Aug 2 14:33:28 2003 Owen Taylor <otaylor@redhat.com>
* pango/Makefile.am (libpangoxft_1_0_la_LIBADD): Make
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 6e3ffa29..d9e4dd41 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+2003-08-03 Noah Levitt <nlevitt@columbia.edu>
+
+ * pango/Makefile.am (libpangoxft_1_0_la_DEPENDENCIES): Really make
+ pangoxft depend on pangoft2. (#119024)
+
Sat Aug 2 14:33:28 2003 Owen Taylor <otaylor@redhat.com>
* pango/Makefile.am (libpangoxft_1_0_la_LIBADD): Make
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 6e3ffa29..d9e4dd41 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+2003-08-03 Noah Levitt <nlevitt@columbia.edu>
+
+ * pango/Makefile.am (libpangoxft_1_0_la_DEPENDENCIES): Really make
+ pangoxft depend on pangoft2. (#119024)
+
Sat Aug 2 14:33:28 2003 Owen Taylor <otaylor@redhat.com>
* pango/Makefile.am (libpangoxft_1_0_la_LIBADD): Make
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 6e3ffa29..d9e4dd41 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+2003-08-03 Noah Levitt <nlevitt@columbia.edu>
+
+ * pango/Makefile.am (libpangoxft_1_0_la_DEPENDENCIES): Really make
+ pangoxft depend on pangoft2. (#119024)
+
Sat Aug 2 14:33:28 2003 Owen Taylor <otaylor@redhat.com>
* pango/Makefile.am (libpangoxft_1_0_la_LIBADD): Make
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 6e3ffa29..d9e4dd41 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+2003-08-03 Noah Levitt <nlevitt@columbia.edu>
+
+ * pango/Makefile.am (libpangoxft_1_0_la_DEPENDENCIES): Really make
+ pangoxft depend on pangoft2. (#119024)
+
Sat Aug 2 14:33:28 2003 Owen Taylor <otaylor@redhat.com>
* pango/Makefile.am (libpangoxft_1_0_la_LIBADD): Make
diff --git a/pango/Makefile.am b/pango/Makefile.am
index a7de4dba..8d6aa7de 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -153,7 +153,7 @@ endif
libpangoxft_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
libpangoxft_1_0_la_LIBADD = libpangoft2-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la $(INCLUDED_XFT_MODULES) $(XFT_LIBS)
-libpangoxft_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la $(INCLUDED_XFT_MODULES)
+libpangoxft_1_0_la_DEPENDENCIES = libpangoft2-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la $(INCLUDED_XFT_MODULES)
libpangoxft_1_0_la_SOURCES = \
pangoxft-font.c \