[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeartwork/kscreensaver
From:       Chris Howells <howells () kde ! org>
Date:       2003-04-14 13:59:29
[Download RAW message or body]

CVS commit by howells: 

* Link against the right thing (nothing but standard KDE includes vs GL vs libart). I \
                don't know if there's a shorter way to do this
* Rename COMPILE_KCLOCK_KSAVER to COMPILE_LIBART_KSAVERS in case somebody wants to \
add another libart-based screensaver, and make it more consistent with the naming of \
the GL screen savers


  M +1 -1      configure.in.in   1.10
  M +21 -8     kdesavers/Makefile.am   1.30


--- kdeartwork/kscreensaver/configure.in.in  #1.9:1.10
@@ -68,5 +68,5 @@
 AC_SUBST(LIBART_CFLAGS)
 AC_SUBST(LIBART_RPATH)
-AM_CONDITIONAL(COMPILE_KCLOCK_KSAVER, test -n "$LIBART")
+AM_CONDITIONAL(COMPILE_LIBART_KSAVERS, test -n "$LIBART")
 
 

--- kdeartwork/kscreensaver/kdesavers/Makefile.am  #1.29:1.30
@@ -7,9 +7,10 @@
 INCLUDES = $(all_includes) $(GLINC) $(LIBART_CFLAGS)
 LDFLAGS = $(all_libraries) $(KDE_RPATH)
-LDADD = $(LIB_KDEUI) -lkscreensaver -lm $(GLLIB)
+LDADD = $(LIB_KDEUI) -lkscreensaver -lm
 
-if COMPILE_KCLOCK_KSAVER
-KCLOCK_KSAVER = kclock.kss
-KCLOCK_DESKTOP_FILE = KClock.desktop
+if COMPILE_LIBART_KSAVERS
+LIBART_KSAVERS = kclock.kss
+LIBART_DESKTOP_FILES = KClock.desktop
+LIBART_KSAVERS_LDADD = $(LDADD) $(LIBART_LIBS)
 endif
 
@@ -17,10 +18,12 @@
 GL_KSAVERS=kfountain.kss kwave.kss kgravity.kss kflux.kss keuphoria.kss \
ksolarwinds.kss  GL_DESKTOP_FILES=KGravity.desktop KWave.desktop KFountain.desktop \
KFlux.desktop KEuphoria.desktop KSolarWinds.desktop +GL_KSAVERS_LDADD = $(LDADD) \
$(GLLIB)  endif
 
 bin_PROGRAMS = kbanner.kss kpolygon.kss kslideshow.kss \
                 klines.kss klorenz.kss kblob.kss kvm.kss kmatrix.kss \
-                kscience.kss $(GL_KSAVERS) $(KCLOCK_KSAVER)
+                kscience.kss $(GL_KSAVERS) $(LIBART_KSAVERS)
 
+# The "normal" screensavers
 kbanner_kss_SOURCES = banner.cpp
 kpolygon_kss_SOURCES = polygon.cpp
@@ -33,12 +36,22 @@
 kmatrix_kss_SOURCES = matrix.cpp
 kscience_kss_SOURCES = science.cpp
+
+# The GL screensavers
 kfountain_kss_SOURCES = fountain.cpp fountaincfg.ui
+kfountain_kss_LDADD = $(GL_KSAVERS_LDADD)
 kwave_kss_SOURCES = wave.cpp wavecfg.ui
+kwave_kss_LDADD = $(GL_KSAVERS_LDADD)
 kgravity_kss_SOURCES = gravity.cpp gravitycfg.ui
+kgravity_kss_LDADD = $(GL_KSAVERS_LDADD)
 kflux_kss_SOURCES = Flux.cpp
+kflux_kss_LDADD = $(GL_KSAVERS_LDADD)
 keuphoria_kss_SOURCES = Euphoria.cpp
+keuphoria_kss_LDADD = $(GL_KSAVERS_LDADD)
 ksolarwinds_kss_SOURCES = SolarWinds.cpp
+ksolarwinds_kss_LDADD = $(GL_KSAVERS_LDADD)
+
+# The LIBART screensavers
 kclock_kss_SOURCES = kclock.cpp
-kclock_kss_LDADD = $(LDADD) $(LIBART_LIBS)
+kclock_kss_LDADD = $(LIBART_KSAVERS_LDADD)
 
 METASOURCES = AUTO
@@ -56,5 +69,5 @@
                KSlideshow.desktop KLines-saver.desktop KLorenz.desktop \
                KBlob.desktop KVm.desktop KMatrix.desktop KScience.desktop\
-               KClock.desktop $(GL_DESKTOP_FILES) $(KCLOCK_DESKTOP_FILE)
+               KClock.desktop $(GL_DESKTOP_FILES) $(LIBART_DESKTOP_FILES)
 
 desktopdir = $(kde_appsdir)/System/ScreenSavers


[prev in list] [next in list] [prev in thread] [next in thread]