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

[Jason Harris]

SVN commit 490744 by harris:

Added dependency to widgets/Makefile.am to resolve compile error (thanks 
for pointing this out, Pablo).

Also, separated all UI files into their own kstars_ui block in the main 
Makefile.am.

CCMAIL: kstars-devel at kde.org



 M  +12 -11    Makefile.am  
 M  +3 -0      widgets/Makefile.am  


--- trunk/KDE/kdeedu/kstars/kstars/Makefile.am #490743:490744
@@ -1,5 +1,15 @@
 bin_PROGRAMS = kstars
 
+kstars_ui = addcatdialogui.ui addlinkdialogui.ui ccdpreviewui.ui contrastbrightnessgui.ui \
+		details_data.ui details_position.ui details_links.ui details_database.ui details_log.ui \
+		devmanager.ui finddialogui.ui fitsheaderdialog.ui focusdialogui.ui \
+		fovdialogui.ui newfovui.ui locationdialogui.ui \
+		histdialog.ui imagereductionui.ui imgsequencedlgui.ui indiconf.ui indihostconf.ui \
+		kswizardui.ui wizwelcomeui.ui wizlocationui.ui wizdevicesui.ui wizdownloadui.ui \
+		opsadvancedui.ui opscatalogui.ui opscolorsui.ui opsguidesui.ui opssolarsystemui.ui \
+		statform.ui streamformui.ui telescopewizard.ui telescopepropui.ui \
+		thumbnailpickerui.ui thumbnaileditorui.ui \
+
 kstars_SOURCES = addcatdialog.cpp addlinkdialog.cpp colorscheme.cpp \
 			conbridlg.cpp csegment.cpp deepskyobject.cpp detaildialog.cpp devicemanager.cpp \
 			dms.cpp finddialog.cpp fitshistogram.cpp ccdpreviewwg.cpp \
@@ -17,16 +27,7 @@
 			starobject.cpp starpixmap.cpp streamwg.cpp telescopewizardprocess.cpp telescopeprop.cpp \
 			timebox.cpp timedialog.cpp timezonerule.cpp \
 			toggleaction.cpp thumbnailpicker.cpp thumbnaileditor.cpp \
-			addcatdialogui.ui addlinkdialogui.ui ccdpreviewui.ui contrastbrightnessgui.ui \
-			details_data.ui details_position.ui details_links.ui details_database.ui details_log.ui \
-			devmanager.ui finddialogui.ui fitsheaderdialog.ui focusdialogui.ui \
-			fovdialogui.ui newfovui.ui locationdialogui.ui \
-			histdialog.ui imagereductionui.ui imgsequencedlgui.ui indiconf.ui indihostconf.ui \
-			kswizardui.ui wizwelcomeui.ui wizlocationui.ui wizdevicesui.ui wizdownloadui.ui \
-			opsadvancedui.ui opscatalogui.ui opscolorsui.ui opsguidesui.ui opssolarsystemui.ui \
-			statform.ui streamformui.ui telescopewizard.ui telescopepropui.ui \
-			thumbnailpickerui.ui thumbnaileditorui.ui \
-			Options.kcfgc kstarsinterface.skel simclockinterface.skel 
+			Options.kcfgc kstarsinterface.skel simclockinterface.skel $(kstars_ui)
 
 kde_kcfg_DATA = kstars.kcfg
 kde_conf_DATA = kstarsrc
@@ -37,7 +38,7 @@
 
 KDE_ICON=AUTO
 
-kstars_COMPILE_FIRST = Options.kcfgc
+kstars_COMPILE_FIRST = Options.kcfgc $(kstars_ui)
 
 EXTRA_DIST = kstars.desktop kstarsui.rc fitsviewer.rc
 
--- trunk/KDE/kdeedu/kstars/kstars/widgets/Makefile.am #490743:490744
@@ -7,4 +7,7 @@
 
 INCLUDES = -I$(srcdir)/.. -I$(top_srcdir) $(all_includes)
 
+#Dependencies on uic-generated headers
+mapcanvas.o: ../locationdialogui.h
+
 METASOURCES = AUTO