CVS commit by eros: Added kfiresaver to gl savers compilation. M +10 -4 Makefile.am 1.41 M +2 -1 data/Makefile.am 1.2 --- kdeartwork/kscreensaver/kdesavers/Makefile.am #1.40:1.41 @@ -3,4 +3,6 @@ # +SUBDIRS = . data + AM_CPPFLAGS = -UQT_NO_ASCII_CAST @@ -21,6 +23,6 @@ if COMPILE_GL_KSAVERS -GL_KSAVERS=kfountain.kss kwave.kss kgravity.kss kflux.kss keuphoria.kss ksolarwinds.kss krotation.kss kpendulum.kss -GL_DESKTOP_FILES=KGravity.desktop KWave.desktop KFountain.desktop KFlux.desktop KEuphoria.desktop KSolarWinds.desktop KRotation.desktop KPendulum.desktop +GL_KSAVERS=kfountain.kss kwave.kss kgravity.kss kflux.kss keuphoria.kss ksolarwinds.kss krotation.kss kpendulum.kss kfiresaver.kss +GL_DESKTOP_FILES=KGravity.desktop KWave.desktop KFountain.desktop KFlux.desktop KEuphoria.desktop KSolarWinds.desktop KRotation.desktop KPendulum.desktop KFiresaver.desktop endif GL_KSAVERS_LDADD = $(AM_LDADD) $(GLLIB) @@ -65,4 +67,6 @@ kpendulum_kss_SOURCES = pendulum.cpp pendulumcfg.ui sspreviewarea.cpp rkodesolver.cpp kpendulum_kss_LDADD = $(GL_KSAVERS_LDADD) -lm +kfiresaver_kss_SOURCES = firesaversetup.ui firesaverparticle.cpp firesaverwriter.cpp firesaver.cpp +kfiresaver_kss_LDADD = $(GL_KSAVERS_LDADD) -lartskde -lm # The LIBART screensavers @@ -75,5 +79,7 @@ lorenz.h blob.h kvm.h vm.h vm_random.h science.h \ fountain.h wave.h gravity.h kclock.h\ - rotation.h pendulum.h sspreviewarea.h rkodesolver.h vec3.h + rotation.h pendulum.h sspreviewarea.h rkodesolver.h vec3.h\ + firesaver.h firesaverparticle.h firesaversetup.ui.h\ + firesaverwriter.h ########## Meta objects ########## --- kdeartwork/kscreensaver/kdesavers/data/Makefile.am #1.1:1.2 @@ -3,7 +3,8 @@ METASOURCES = AUTO +if COMPILE_GL_KSAVERS kfiresaver_DATA = kfs_particle.png kfs_kde.png kfs_tux.png\ kfs_letters1.png kfs_letters2.png kfs_letters.desc\ kfs_explode.ogg kfs_debris.ogg kfiresaverdir = $(kde_datadir)/kfiresaver - +endif