Prevent crashes experienced by speakers of "long" languages like Norwegian

[lyx.git] / src / frontends / xforms / Makefile.am

diff --git a/src/frontends/xforms/Makefile.am b/src/frontends/xforms/Makefile.am
index 8762c0c603768612027c0a64302b5135dd250857..09ed9db497838abeaaced9d880eff3e2385ef279 100644 (file)
--- a/src/frontends/xforms/Makefile.am
+++ b/src/frontends/xforms/Makefile.am
@@ -1,15 +1,13 @@
-AUTOMAKE_OPTIONS = foreign 1.4
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+include $(top_srcdir)/config/common.am
+
 noinst_LTLIBRARIES = libxforms.la
-BOOST_INCLUDES = -I$(top_srcdir)/boost
-INCLUDES = -I${top_srcdir}/images -I${top_srcdir}/src/ \
-       -I${top_srcdir}/src/frontends/ \
-       -I${top_srcdir}/src/frontends/controllers \
-       ${SIGC_CFLAGS} $(BOOST_INCLUDES)
-LIBS=
-LYXDATADIRS = forms
-ETAGS_ARGS = --lang=c++
+
+INCLUDES = -I$(top_srcdir)/images -I$(top_srcdir)/src/ \
+       -I$(top_srcdir)/src/frontends/ \
+       -I$(top_srcdir)/src/frontends/controllers \
+       $(SIGC_CFLAGS) $(BOOST_INCLUDES)
+
+SUBDIRS = forms
 
 EXTRA_DIST = xformsGImage.C xformsGImage.h
 
@@ -18,7 +16,7 @@ else
 XFORMSGIMAGE = xformsGImage.C xformsGImage.h
 endif
 
-# Alphabetical order please.  It makes it easier to figure out what's missing. 
+# Alphabetical order please.  It makes it easier to figure out what's missing.
 libxforms_la_SOURCES = \
        Alert_pimpl.C \
        bmtable.c \
@@ -30,12 +28,13 @@ libxforms_la_SOURCES = \
        Dialogs.C \
        DropDown.h \
        DropDown.C \
+       FeedbackController.C \
+       FeedbackController.h \
        FileDialog.C \
        FormFiledialog.h \
        FormFiledialog.C \
        form_filedialog.C \
        form_filedialog.h \
-       GUIRunTime.C \
        FormAboutlyx.C \
        FormAboutlyx.h \
        form_aboutlyx.C \
@@ -158,6 +157,10 @@ libxforms_la_SOURCES = \
        FormSearch.h \
        form_search.C \
        form_search.h \
+       FormSendto.C \
+       FormSendto.h \
+       form_sendto.C \
+       form_sendto.h \
        FormShowFile.C \
        FormShowFile.h \
        FormSpellchecker.C \
@@ -190,6 +193,7 @@ libxforms_la_SOURCES = \
        form_url.h \
        FormVCLog.C \
        FormVCLog.h \
+       GUIRunTime.C \
        input_validators.C \
        input_validators.h \
        MathsSymbols.C \
@@ -206,6 +210,8 @@ libxforms_la_SOURCES = \
        Tooltips.h \
        xforms_helpers.C \
        xforms_helpers.h \
+       xforms_resize.C \
+       xforms_resize.h \
        $(XFORMSGIMAGE) xformsBC.C \
        xformsBC.h
 
@@ -221,17 +227,17 @@ libxforms.la: $(libxforms_la_OBJECTS) $(libxforms_la_DEPENDENCIES)
 # for convenience only
 updatesrc:
        $(MAKE) -C forms updatesrc
- 
+
 # just copied from old lyx repository
-dist-hook:
-       for subdir in $(LYXDATADIRS) ; do \
-       test -d $(distdir)/$$subdir \
-       || mkdir $(distdir)/$$subdir \
-       || exit 1; \
-       chmod 777 $(distdir)/$$subdir; \
-       list=`(cd $(srcdir)/$$subdir && ls -1 | grep -v CVS)`; \
-       echo $$list ; \
-       for fil in $$list ; do \
-       cp -p $(srcdir)/$$subdir/$$fil $(distdir)/$$subdir ; \
-       done ; \
-       done
+#dist-hook:
+#      for subdir in $(LYXDATADIRS) ; do \
+#      test -d $(distdir)/$$subdir \
+#      || mkdir $(distdir)/$$subdir \
+#      || exit 1; \
+#      chmod 777 $(distdir)/$$subdir; \
+#      list=`(cd $(srcdir)/$$subdir && ls -1 | grep -v CVS)`; \
+#      echo $$list ; \
+#      for fil in $$list ; do \
+#      cp -p $(srcdir)/$$subdir/$$fil $(distdir)/$$subdir ; \
+#      done ; \
+#      done