[Kstars-devel] KDE/kdeedu/kstars/kstars

[Jason Harris]

SVN commit 474489 by harris:

Removing comments which excluded the tools directory.  The code still 
has many hooks into tools, so this was never practical.  Changed order 
of SUBDIRS in Makefile.am so skymapcomposite will be compiled first.

CCMAIL: kstars-devel at kde.org



 M  +3 -7      Makefile.am  
 M  +3 -3      kstars.h  


--- trunk/KDE/kdeedu/kstars/kstars/Makefile.am #474488:474489
@@ -28,13 +28,9 @@
 kde_kcfg_DATA = kstars.kcfg
 kde_conf_DATA = kstarsrc
 
-#HIDE_TOOLS
-#kstars_LDADD = indi/liblilxml.a indi/libindicom.a skycomponents/libkstarscomponents.a tools/libkstarstools.a $(top_builddir)/libkdeedu/kdeeduplot/libkdeeduplot.la $(top_builddir)/libkdeedu/kdeeduui/libkdeeduui.la $(top_builddir)/libkdeedu/extdate/libextdate.la -lkdeprint -lknewstuff -lm -lz
-kstars_LDADD = indi/liblilxml.a indi/libindicom.a skycomponents/libkstarscomponents.a $(top_builddir)/libkdeedu/kdeeduplot/libkdeeduplot.la $(top_builddir)/libkdeedu/kdeeduui/libkdeeduui.la $(top_builddir)/libkdeedu/extdate/libextdate.la -lkdeprint -lknewstuff -lm -lz
+kstars_LDADD = indi/liblilxml.a indi/libindicom.a skycomponents/libkstarscomponents.a tools/libkstarstools.a $(top_builddir)/libkdeedu/kdeeduplot/libkdeeduplot.la $(top_builddir)/libkdeedu/kdeeduui/libkdeeduui.la $(top_builddir)/libkdeedu/extdate/libextdate.la -lkdeprint -lknewstuff -lm -lz
 
-#HIDE_TOOLS
-#SUBDIRS = indi tools skycomponents . data icons 
-SUBDIRS = indi skycomponents . data icons 
+SUBDIRS = skycomponents indi tools . data icons 
 
 KDE_ICON=AUTO
 
@@ -131,6 +127,6 @@
 	rm -f tips.cpp
 	rm -f kstars_i18n.cpp
 
-noinst_HEADERS = fovdialog.h
+noinst_HEADERS = fovdialog.h abstractplanetcomponent_interface.h
 
 kstarsactions.o: tools/planetviewerui.h
--- trunk/KDE/kdeedu/kstars/kstars/kstars.h #474488:474489
@@ -29,7 +29,7 @@
 #include <QVBoxLayout>
 
 #include "kstarsinterface.h"
-#include "observinglist.h"
+#include "tools/observinglist.h"
 
 // forward declaration is enough. We only need pointers
 class QPalette;
@@ -52,7 +52,7 @@
 class ToggleAction;
 class TimeStepBox;
 
-//class AstroCalc;
+class AstroCalc;
 class INDIMenu;
 class INDIDriver;
 class imagesequence;
@@ -98,7 +98,7 @@
 		*/
 		SkyMap* map();
 
-        ObservingList* observingList();
+		ObservingList* observingList();
 
 	/**@return pointer to GeoLocation object which is the current geographic location.
 		*/