[FriBidi-commit] fribidi/doc Makefile.am,1.13,1.14

[Behdad Esfahbod]

Update of /cvs/fribidi/fribidi/doc
In directory pdx:/tmp/cvs-serv29670/doc

Modified Files:
	Makefile.am 
Log Message:
fribidi-bidi-type.[ch] merged into fribidi-bidi-types.[ch].
fribidi-joining-type.[ch] merged into fribidi-joining-types.[ch].


Index: Makefile.am
===================================================================
RCS file: /cvs/fribidi/fribidi/doc/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile.am	13 Jun 2004 20:11:42 -0000	1.13
+++ Makefile.am	14 Jun 2004 18:43:53 -0000	1.14
@@ -12,12 +12,6 @@
 inst_symbols =
 noinst_symbols =
 
-include $(top_srcdir)/lib/Headers.mk
-headers += $(libfribidi_la_headers)
-includepath += -I$(top_builddir)/lib -I$(top_srcdir)/lib
-includevpath += :$(top_builddir)/lib:$(top_srcdir)/lib
-inst_symbols += $(libfribidi_la_symbols)
-
 include $(top_srcdir)/charset/Headers.mk
 headers += $(libfribidi_char_sets_la_headers)
 includepath += -I$(top_srcdir)/charset
@@ -28,8 +22,12 @@
 noinst_symbols += $(libfribidi_char_sets_la_symbols)
 endif # !FRIBIDI_CHARSETS
 
-# name of the header to include in the manual
-headers += fribidi.h
+# The lib/Headers.mk stuff should come after all optional stuff.
+include $(top_srcdir)/lib/Headers.mk
+headers += $(libfribidi_la_headers)
+includepath += -I$(top_builddir)/lib -I$(top_srcdir)/lib
+includevpath += :$(top_builddir)/lib:$(top_srcdir)/lib
+inst_symbols += $(libfribidi_la_symbols)
 
 dist_man_MANS += $(inst_symbols:=.3)
 dist_noinst_MANS += $(noinst_symbols:=.3)