SCons: msvc does not need this /TP option any more after we rename .C => .cpp. Also...

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index c275a12eb9629e9a84d7ce1ca63eb004cec33cd4..d99921090bd80276fbc884f44f9aef1863d7d2a0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,10 +21,9 @@ EXTRA_DIST = config.h.in \
 OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
 
 pkglib_LTLIBRARIES = liblyxcore.la
-noinst_PROGRAMS = $(FRONTENDS_PROGS)
-EXTRA_PROGRAMS = lyx-qt4
+bin_PROGRAMS = lyx
 
-lyx_qt4_LDADD = \
+lyx_LDADD = \
        liblyxcore.la \
        liblyxmathed.la \
        liblyxinsets.la \
@@ -36,10 +35,6 @@ lyx_qt4_LDADD = \
        $(OTHERLIBS) \
        $(QT4_LIB) 
 
-lyx$(EXEEXT): $(FRONTENDS_PROGS)
-       rm -f $@
-       $(LN_S) $< $@
-
 if LYX_WIN_RESOURCE
 .rc.o:
        cp $(top_srcdir)/development/Win32/packaging/icons/lyx_*32x32.ico .
@@ -64,7 +59,7 @@ endif
 # referenced within the core and therefore are not picked up
 # by the linker without looping over libs. We do not want that,
 # and in fact libtools seems not able to do that.
-lyx_qt4_SOURCES = \
+lyx_SOURCES = \
        main.cpp \
        $(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
        Box.cpp \
@@ -77,12 +72,14 @@ lyx_qt4_SOURCES = \
        Thesaurus.h
 
 if LYX_WIN_RESOURCE
-lyx_qt4_SOURCES += lyxwinres.rc
+lyx_SOURCES += lyxwinres.rc
 endif
 
 liblyxcore_la_SOURCES = \
        Author.cpp \
        Author.h \
+       BiblioInfo.h \
+       BiblioInfo.cpp \
        Bidi.cpp \
        Bidi.h \
        boost.cpp \