Replace LString.h with support/std_string.h,

[features.git] / src / frontends / xforms / forms / Makefile.am

diff --git a/src/frontends/xforms/forms/Makefile.am b/src/frontends/xforms/forms/Makefile.am
index 4c228b87bc06849dcce5e73b1e7265c06f735f5e..8a835f6b8b32048b93fa1708405f2a0decc1ee81 100644 (file)
--- a/src/frontends/xforms/forms/Makefile.am
+++ b/src/frontends/xforms/forms/Makefile.am
@@ -2,10 +2,10 @@ include $(top_srcdir)/config/common.am
 
 MAINTAINERCLEANFILES += *.C *.h *.c
 
-EXTRA_DIST = fdfixc.sed fdfixh.sed fdfix.sh README $(SRCS)
+EXTRA_DIST = fdfixc.sed fdfixh.sed fdfix.sh tmp_str.sed README $(SRCS)
 
-# For (forms_fwd.h, forms_gettext.h) and LString.h, respectively.
-INCLUDES = -I$(srcdir)/..  -I$(top_srcdir)/src
+# For (forms_fwd.h, forms_gettext.h) and support/std_string.h, respectively.
+INCLUDES = -I$(srcdir)/..  -I$(top_srcdir)/src -I..
 
 noinst_LTLIBRARIES = libfdesign.la
 
@@ -13,11 +13,12 @@ SRCS =  form_aboutlyx.fd \
        form_bibitem.fd \
        form_bibtex.fd \
        form_browser.fd \
+       form_branch.fd \
        form_changes.fd \
        form_character.fd \
        form_citation.fd \
+       form_colorpicker.fd \
        form_document.fd \
-       form_error.fd \
        form_errorlist.fd \
        form_ert.fd \
        form_external.fd \
@@ -32,6 +33,7 @@ SRCS =  form_aboutlyx.fd \
        form_maths_space.fd \
        form_maths_style.fd \
        form_minipage.fd \
+       form_note.fd \
        form_paragraph.fd \
        form_preamble.fd \
        form_preferences.fd \
@@ -52,7 +54,7 @@ SRCS =  form_aboutlyx.fd \
 nodist_libfdesign_la_SOURCES = $(SRCS:.fd=.C) $(SRCS:.fd=.h)
 # This is a trick so that the actual .la file never gets build,
 # so we do not need to use diskspace and time for it.
-# It is only getting linked into libxforms.la any way.
+# It is only getting linked into libxforms.la anyway.
 libfdesign_la_LINK = touch libfdesign.la
 
 # These are used to generate the .[Ch] files from the .fd ones.
@@ -60,8 +62,5 @@ SHELL = /bin/sh
 SCRIPT = $(srcdir)/fdfix.sh
 SUFFIXES = .fd
 
-# Make the .Ch files dependent on the fdfix files.
-$(libfdesign_la_SOURCES): $(srcdir)/fdfix.sh $(srcdir)/fdfix[ch].sed
-
-%.C: %.fd
+%.C: %.fd $(srcdir)/fdfix.sh $(srcdir)/fdfix[ch].sed $(srcdir)/tmp_str.sed
        $(SHELL) $(SCRIPT) $<