Closer approximation to compiling and building

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

diff --git a/src/frontends/qt2/xforms/Makefile.am b/src/frontends/qt2/xforms/Makefile.am
index a55dbb3bffb3e6bafae24ceabb7ced6b3e71173e..56ae1b3aee56b004da5f1936faf6c7f6c12d49c7 100644 (file)
--- a/src/frontends/qt2/xforms/Makefile.am
+++ b/src/frontends/qt2/xforms/Makefile.am
@@ -1,25 +1,18 @@
-AUTOMAKE_OPTIONS = foreign 1.4
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-DISTCLEANFILES = $(XFORMS_SOURCES) $(BUILTSOURCES) *.orig *.rej *~ *.bak core
+include $(top_srcdir)/config/common.am
 
 noinst_LTLIBRARIES = libqt2xforms.la
 
-BOOST_INCLUDES = -I$(top_srcdir)/boost
-INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ \
-       ${SIGC_CFLAGS} -I$(top_srcdir)/images ${FRONTEND_INCLUDES} $(BOOST_INCLUDES) \
+INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \
+       $(SIGC_CFLAGS) -I$(top_srcdir)/images \
+       $(FRONTEND_INCLUDES) $(BOOST_INCLUDES) \
        -I$(top_srcdir)/src/frontends/controllers
 
-LIBS=
-ETAGS_ARGS = --lang=c++
-
-EXTRA_DIST = xformsGImage.C xformsGImage.h
-
 if USE_BASIC_IMAGE_LOADER
 else
 XFORMSGIMAGE = xformsGImage.C xformsGImage.h
 endif
 
-libqt2xforms_la_SOURCES = \
+nodist_libqt2xforms_la_SOURCES = \
        bmtable.h \
        bmtable.c \
        combox.h \
@@ -28,6 +21,8 @@ libqt2xforms_la_SOURCES = \
        Color.C \
        DropDown.h \
        DropDown.C \
+       FeedbackController.h \
+       FeedbackController.C \
        FormBase.h \
        FormBase.C \
        FormBaseDeprecated.h \
@@ -93,9 +88,9 @@ libqt2xforms_la_SOURCES = \
        xforms_helpers.h \
        xforms_helpers.C
 
-libqt2xforms.la: link_files $(libqt2xforms_la_SOURCES)
+libqt2xforms.la: link_files $(libqt2xforms_la_OBJECTS)
 
 link_files:
-       for i in $(libqt2xforms_la_SOURCES); do \
-               ln -sf "${top_srcdir}/src/frontends/xforms/$$i" . ; \
-        done
+       for i in $(nodist_libqt2xforms_la_SOURCES); do \
+               ln -sf "$(top_srcdir)/src/frontends/xforms/$$i" . ; \
+       done