s/pkglib_/noinst_/

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20669 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/boost/Makefile.am b/boost/Makefile.am
index 58439ff7125aaae30068bccdf7c53cee32702ad2..68c8f78625058bd9e0916055ec8b66137b987647 100644 (file)
--- a/boost/Makefile.am
+++ b/boost/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/config/common.am
 
-pkglib_LTLIBRARIES = liblyxboost.la
+noinst_LTLIBRARIES = liblyxboost.la
 
 # Using precompiled headers makes compilation >10% slower
 #EXTRA_DIST = pch.h

diff --git a/development/misc/count_total_lines_of_compiled_code.sh b/development/misc/count_total_lines_of_compiled_code.sh
index 1dfff550ba5be29eb972ef1694458202fe3210cb..95d88bb76b40025b95e09a5a6cc1b734631c41a6 100755 (executable)
--- a/development/misc/count_total_lines_of_compiled_code.sh
+++ b/development/misc/count_total_lines_of_compiled_code.sh
@@ -16,6 +16,7 @@ s=0
 for i in `find ../.. -name *.cpp` ; do
        #echo $i
        #echo "g++ $inc -DQT_NO_STL -E $i"
+       g++ $inc -DQT_NO_STL -E $i > tmp/`basename $i`
        l=`g++ $inc -DQT_NO_STL -E $i | wc -l`
        s=$[s + l]
        printf "%10d  %-40s\n" $l $i

diff --git a/src/Makefile.am b/src/Makefile.am
index 068dbf99e576a5edd65230ecba03e0a6d25410df..273757014db2cb5cfce42894bed0039909191637 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,7 @@ EXTRA_DIST = config.h.in \
 
 OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS)
 
-pkglib_LTLIBRARIES = liblyxcore.la
+noinst_LTLIBRARIES = liblyxcore.la
 bin_PROGRAMS = lyx
 
 lyx_LDADD = \
@@ -277,7 +277,7 @@ liblyxcore_la_SOURCES = \
        VSpace.h
 ############################### Graphics ##############################
 
-pkglib_LTLIBRARIES += liblyxgraphics.la
+noinst_LTLIBRARIES += liblyxgraphics.la
 
 liblyxgraphics_la_SOURCES = \
        graphics/GraphicsCache.h \
@@ -308,7 +308,7 @@ liblyxgraphics_la_SOURCES = \
 
 EXTRA_DIST += mathed/InsetFormulaMacro.cpp
 
-pkglib_LTLIBRARIES += liblyxmathed.la
+noinst_LTLIBRARIES += liblyxmathed.la
 
 liblyxmathed_la_SOURCES = \
        mathed/InsetMathAMSArray.cpp \
@@ -458,7 +458,7 @@ liblyxmathed_la_SOURCES = \
 
 ############################### Insets  ##############################
 
-pkglib_LTLIBRARIES += liblyxinsets.la
+noinst_LTLIBRARIES += liblyxinsets.la
 
 EXTRA_DIST += \
        insets/InsetTheorem.cpp \

diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am
index 9149e83f04c8daf342986cf5bb1469f075bcebd3..e6b6412606c61326edcb6edaaf5563b1a0205cc9 100644 (file)
--- a/src/frontends/Makefile.am
+++ b/src/frontends/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST = pch.h
 
 BUILT_SOURCES = $(PCH_FILE)
 
-pkglib_LTLIBRARIES = liblyxfrontends.la
+noinst_LTLIBRARIES = liblyxfrontends.la
 
 AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/..  $(BOOST_INCLUDES)
 

diff --git a/src/frontends/controllers/Makefile.am b/src/frontends/controllers/Makefile.am
index ffb12bc5f84aee53645c12e97cef29ac1fc91a7f..284b3f1f0c0edc4029ca43aafc8431766bf89ee0 100644 (file)
--- a/src/frontends/controllers/Makefile.am
+++ b/src/frontends/controllers/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/src $(BOOST_INCLUDES)
 
 EXTRA_DIST = tests/regfiles/biblio
 
-pkglib_LTLIBRARIES = liblyxcontrollers.la
+noinst_LTLIBRARIES = liblyxcontrollers.la
 
 SOURCEFILES = \
        Dialog.cpp \

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 61ce93afa599a1b90e63ad566595ddb99b55e194..263aec25390535e8b8f986b60d27e18b981703b2 100644 (file)
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -20,7 +20,7 @@ MOCEDFILES = $(MOCHEADER:%.h=%_moc.cpp)
 
 #########################  LIBRARIES  #############################
 
-pkglib_LTLIBRARIES = liblyxqt4.la
+noinst_LTLIBRARIES = liblyxqt4.la
 
 liblyxqt4_la_DEPENDENCIES = $(MOCEDFILES)
 liblyxqt4_la_LDFLAGS = $(QT4_LDFLAGS)

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index fdf1f7c8eab2d81b5e35f9ff4932b830d1b90988..61dd32df98e217bf780a7e0dbe18bf56049e038b 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -5,7 +5,7 @@ CLEANFILES += $(BUILT_SOURCES)
 EXTRA_DIST = pch.h \
        os_cygwin.cpp os_unix.cpp os_win32.cpp os_win32.h
 
-pkglib_LTLIBRARIES = liblyxsupport.la
+noinst_LTLIBRARIES = liblyxsupport.la
 
 liblyxsupport_la_LIBADD = $(LIBSHLWAPI) $(QT4_CORE_LIB) $(BOOST_SIGNALS)
 liblyxsupport_la_LDFLAGS = $(QT4_CORE_LDFLAGS)