set SCons and Makefile for the previous CV-class changes

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

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 4c422c5b3f920a2ad623dee49c1df0b3904a1e9d..da4069ebfbb538882143f74da0ca7f0941bc04e9 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -1469,8 +1469,6 @@ lib_kbd_files = Split('''
 
 
 lib_templates_files = Split('''
-    CV-image.eps
-    CV-image.png
     IEEEtran.lyx
     README.new_templates
     aa.lyx
@@ -1482,7 +1480,6 @@ lib_templates_files = Split('''
     dinbrief.lyx
     docbook_article.lyx
     elsart.lyx
-    europeCV.lyx
     fr_beamer-conference-ornate-20min.lyx
     g-brief-de.lyx
     g-brief-en.lyx
@@ -1494,7 +1491,6 @@ lib_templates_files = Split('''
     koma-letter2.lyx
     latex8.lyx
     letter.lyx
-    modernCV.lyx
     revtex.lyx
     revtex4.lyx
     slides.lyx
@@ -2374,6 +2370,8 @@ lib_doc_de_files = Split('''
 
 
 lib_examples_files = Split('''
+    CV-image.eps
+    CV-image.png
     Foils.lyx
     ItemizeBullets.lyx
     Literate.lyx
@@ -2400,15 +2398,16 @@ lib_examples_files = Split('''
     currency.lyx
     cv.lyx
     docbook_article.lyx
+    europeCV.lyx
     example_lyxified.lyx
     example_raw.lyx
-    g-brief2.lyx
     iecc05.fen
     iecc07.fen
     iecc12.fen
     landslide.lyx
     listerrors.lyx
     mathed.lyx
+    modernCV.lyx
     multicol.lyx
     noweb2lyx.lyx
     script_form.lyx

diff --git a/lib/Makefile.am b/lib/Makefile.am
index a13a4737f074cc5d48b739cf799e60db0da6a859..da1c650874cc8b02481cf530e61cf39ac50c6ba1 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -169,6 +169,8 @@ dist_slexamples_DATA = \
 
 examplesdir = $(pkgdatadir)/examples
 dist_examples_DATA = \
+       examples/CV-image.eps \
+       examples/CV-image.png \
        examples/Foils.lyx \
        examples/ItemizeBullets.lyx \
        examples/Literate.lyx \
@@ -195,6 +197,7 @@ dist_examples_DATA = \
        examples/currency.lyx \
        examples/cv.lyx \
        examples/docbook_article.lyx \
+       examples/europeCV.lyx \
        examples/example_lyxified.lyx \
        examples/example_raw.lyx \
        examples/iecc05.fen \
@@ -203,12 +206,12 @@ dist_examples_DATA = \
        examples/landslide.lyx \
        examples/listerrors.lyx \
        examples/mathed.lyx \
+       examples/modernCV.lyx \
        examples/multicol.lyx \
        examples/noweb2lyx.lyx \
        examples/script_form.lyx \
        examples/simplecv.lyx \
-       examples/splash.lyx \
-       examples/g-brief2.lyx
+       examples/splash.lyx
 
 fontsdir = $(pkgdatadir)/fonts
 dist_fonts_DATA = \
@@ -1015,13 +1018,10 @@ dist_templates_DATA = \
        templates/agu_article.lyx \
        templates/beamer-conference-ornate-20min.lyx \
        templates/biblioExample.bib \
-       templates/CV-image.eps \
-       templates/CV-image.png \
        templates/de_beamer-conference-ornate-20min.lyx \
        templates/dinbrief.lyx \
        templates/docbook_article.lyx \
        templates/elsart.lyx \
-       templates/europeCV.lyx \
        templates/fr_beamer-conference-ornate-20min.lyx \
        templates/g-brief2.lyx \
        templates/g-brief-de.lyx \
@@ -1033,7 +1033,6 @@ dist_templates_DATA = \
        templates/koma-letter2.lyx \
        templates/latex8.lyx \
        templates/letter.lyx \
-       templates/modernCV.lyx \
        templates/revtex.lyx \
        templates/revtex4.lyx \
        templates/slides.lyx