WebSVN – public – Path Comparison – / – /sportwatcher/trunk/src/Makefile.in Rev 157 and /sportwatcher/trunk/src/Makefile.in Rev 158

Ignore whitespace Rev 157 → Rev 158

 /sportwatcher/trunk/src/Makefile.in
 ,17 → 56,19
         "$(DESTDIR)$(shellrcdir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am_sportwatcher_OBJECTS = disassemble.$(OBJEXT) main.$(OBJEXT) \
-        managefile.$(OBJEXT) progresswidget.$(OBJEXT) \
-        settingswidget.$(OBJEXT) sportwatcher.$(OBJEXT) \
-        sportwatcherwidget.$(OBJEXT) wmsbase.$(OBJEXT)
+am_sportwatcher_OBJECTS = coordinateswidget.$(OBJEXT) \
+        disassemble.$(OBJEXT) main.$(OBJEXT) managefile.$(OBJEXT) \
+        progresswidget.$(OBJEXT) settingswidget.$(OBJEXT) \
+        sportwatcher.$(OBJEXT) sportwatcherwidget.$(OBJEXT) \
+        transform.$(OBJEXT) wmsbase.$(OBJEXT)
 #>- sportwatcher_OBJECTS = $(am_sportwatcher_OBJECTS)
-#>+ 7
+#>+ 8
 sportwatcher_final_OBJECTS = sportwatcher.all_cpp.o
-sportwatcher_nofinal_OBJECTS = disassemble.$(OBJEXT) main.$(OBJEXT) \
-        managefile.$(OBJEXT) progresswidget.$(OBJEXT) \
-        settingswidget.$(OBJEXT) sportwatcher.$(OBJEXT) \
-        sportwatcherwidget.$(OBJEXT) wmsbase.$(OBJEXT) progresswidgetbase.$(OBJEXT) settingswidgetbase.$(OBJEXT) sportwatcherwidgetbase.$(OBJEXT) wmswidgetbase.$(OBJEXT)
+sportwatcher_nofinal_OBJECTS = coordinateswidget.$(OBJEXT) \
+        disassemble.$(OBJEXT) main.$(OBJEXT) managefile.$(OBJEXT) \
+        progresswidget.$(OBJEXT) settingswidget.$(OBJEXT) \
+        sportwatcher.$(OBJEXT) sportwatcherwidget.$(OBJEXT) \
+        transform.$(OBJEXT) wmsbase.$(OBJEXT) coordinateswidgetbase.$(OBJEXT) progresswidgetbase.$(OBJEXT) settingswidgetbase.$(OBJEXT) sportwatcherwidgetbase.$(OBJEXT) wmswidgetbase.$(OBJEXT)
 @KDE_USE_FINAL_FALSE@sportwatcher_OBJECTS = $(sportwatcher_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@sportwatcher_OBJECTS = $(sportwatcher_final_OBJECTS)
 am__DEPENDENCIES_1 =
 ,8 → 361,9
 INCLUDES = $(all_includes)
 # these are the headers for your project
-noinst_HEADERS = copy.h disassemble.h garmin.h managefile.h progresswidget.h \
-        settingswidget.h sportwatcher.h sportwatcherwidget.h wmsbase.h
+noinst_HEADERS = coordinateswidget.h copy.h disassemble.h garmin.h managefile.h \
+        progresswidget.h settingswidget.h sportwatcher.h sportwatcherwidget.h transform.h \
+        wmsbase.h
 # let automoc handle all of the meta source files (moc)
 ,15 → 371,15
 KDE_ICON = AUTO
 # the application source, library search path, and link libraries
-#>- sportwatcher_SOURCES = disassemble.cpp main.cpp managefile.cpp \
-#>-     progresswidget.cpp progresswidgetbase.ui settingswidget.cpp settingswidgetbase.ui \
-#>-     sportwatcher.cpp sportwatcherwidget.cpp sportwatcherwidgetbase.ui wmsbase.cpp \
-#>-     wmswidgetbase.ui
+#>- sportwatcher_SOURCES = coordinateswidget.cpp coordinateswidgetbase.ui \
+#>-     disassemble.cpp main.cpp managefile.cpp progresswidget.cpp progresswidgetbase.ui \
+#>-     settingswidget.cpp settingswidgetbase.ui sportwatcher.cpp sportwatcherwidget.cpp \
+#>-     sportwatcherwidgetbase.ui transform.cpp wmsbase.cpp wmswidgetbase.ui
 #>+ 4
-sportwatcher_SOURCES=disassemble.cpp main.cpp managefile.cpp \
-        progresswidget.cpp  settingswidget.cpp  \
-        sportwatcher.cpp sportwatcherwidget.cpp  wmsbase.cpp \
-         progresswidgetbase.cpp settingswidgetbase.cpp sportwatcherwidgetbase.cpp wmswidgetbase.cpp
+sportwatcher_SOURCES=coordinateswidget.cpp  \
+        disassemble.cpp main.cpp managefile.cpp progresswidget.cpp  \
+        settingswidget.cpp  sportwatcher.cpp sportwatcherwidget.cpp \
+         transform.cpp wmsbase.cpp  coordinateswidgetbase.cpp progresswidgetbase.cpp settingswidgetbase.cpp sportwatcherwidgetbase.cpp wmswidgetbase.cpp
 sportwatcher_LDFLAGS = $(KDE_RPATH) $(all_libraries)
 sportwatcher_LDADD = $(top_builddir)/libgarmin/libgarmin.a $(LIB_KDEUI) -lkio \
 ,6 → 479,7
 distclean-compile:
         -rm -f *.tab.c
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coordinateswidget.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/disassemble.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/managefile.Po@am__quote@
 ,6 → 487,7
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/settingswidget.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sportwatcher.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sportwatcherwidget.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transform.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wmsbase.Po@am__quote@
 .cpp.o:
 ,6 → 765,13
 mocs: sportwatcher.moc
 #>+ 3
+coordinateswidget.moc: $(srcdir)/coordinateswidget.h
+        $(MOC) $(srcdir)/coordinateswidget.h -o coordinateswidget.moc
+#>+ 2
+mocs: coordinateswidget.moc
+#>+ 3
 wmsbase.moc: $(srcdir)/wmsbase.h
         $(MOC) $(srcdir)/wmsbase.h -o wmsbase.moc
 ,14 → 787,15
 #>+ 3
 clean-metasources:
-        -rm -f  progresswidget.moc sportwatcherwidget.moc sportwatcher.moc wmsbase.moc settingswidget.moc
+        -rm -f  progresswidget.moc sportwatcherwidget.moc sportwatcher.moc coordinateswidget.moc wmsbase.moc settingswidget.moc
 #>+ 2
-KDE_DIST=cur_glas.png hi32-app-sportwatcher.png hi16-action-glas_minus.png sportwatcherwidgetbase.ui progresswidgetbase.ui hi16-action-bike.png sportwatcher.desktop hi16-action-wstart.png hi16-action-activity.png wmswidgetbase.ui hi16-action-wtarget.png settingswidgetbase.ui runner.png hi64-app-sportwatcher.png hi16-action-lap.png hi16-action-glas_plus.png Makefile.in hi16-action-hand.png hi16-action-glas.png sportwatcher.lsm sportwatcherui.rc hi16-action-other.png hi16-action-history.png hi16-app-sportwatcher.png pngdataset.cpp Makefile.am hi16-action-run.png hi16-action-flag.png hi16-action-fullscreen.png
+KDE_DIST=cur_glas.png hi32-app-sportwatcher.png hi16-action-glas_minus.png sportwatcherwidgetbase.ui progresswidgetbase.ui hi16-action-bike.png coordinateswidgetbase.ui sportwatcher.desktop hi16-action-wstart.png hi16-action-activity.png wmswidgetbase.ui hi16-action-wtarget.png settingswidgetbase.ui runner.png hi64-app-sportwatcher.png hi16-action-lap.png hi16-action-glas_plus.png Makefile.in hi16-action-hand.png hi16-action-glas.png sportwatcher.lsm sportwatcherui.rc hi16-action-other.png hi16-app-sportwatcher.png hi16-action-history.png pngdataset.cpp Makefile.am hi16-action-run.png hi16-action-flag.png hi16-action-fullscreen.png
-#>+ 7
+#>+ 8
 clean-ui:
         -rm -f \
+        coordinateswidgetbase.cpp coordinateswidgetbase.h coordinateswidgetbase.moc \
         progresswidgetbase.cpp progresswidgetbase.h progresswidgetbase.moc \
         settingswidgetbase.cpp settingswidgetbase.h settingswidgetbase.moc \
         sportwatcherwidgetbase.cpp sportwatcherwidgetbase.h sportwatcherwidgetbase.moc \
 ,11 → 886,11
 #>+ 11
-sportwatcher.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/disassemble.cpp $(srcdir)/main.cpp $(srcdir)/managefile.cpp $(srcdir)/progresswidget.cpp $(srcdir)/settingswidget.cpp $(srcdir)/sportwatcher.cpp $(srcdir)/sportwatcherwidget.cpp $(srcdir)/wmsbase.cpp progresswidgetbase.cpp settingswidgetbase.cpp sportwatcherwidgetbase.cpp wmswidgetbase.cpp  sportwatcherwidget.moc progresswidget.moc progresswidgetbase.moc sportwatcher.moc settingswidgetbase.moc wmsbase.moc settingswidget.moc sportwatcherwidgetbase.moc wmswidgetbase.moc
+sportwatcher.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/coordinateswidget.cpp $(srcdir)/disassemble.cpp $(srcdir)/main.cpp $(srcdir)/managefile.cpp $(srcdir)/progresswidget.cpp $(srcdir)/settingswidget.cpp $(srcdir)/sportwatcher.cpp $(srcdir)/sportwatcherwidget.cpp $(srcdir)/transform.cpp $(srcdir)/wmsbase.cpp coordinateswidgetbase.cpp progresswidgetbase.cpp settingswidgetbase.cpp sportwatcherwidgetbase.cpp wmswidgetbase.cpp  sportwatcherwidget.moc progresswidget.moc progresswidgetbase.moc sportwatcher.moc settingswidgetbase.moc wmsbase.moc settingswidget.moc sportwatcherwidgetbase.moc coordinateswidget.moc wmswidgetbase.moc coordinateswidgetbase.moc
         @echo 'creating sportwatcher.all_cpp.cpp ...'; \
         rm -f sportwatcher.all_cpp.files sportwatcher.all_cpp.final; \
         echo "#define KDE_USE_FINAL 1" >> sportwatcher.all_cpp.final; \
-        for file in disassemble.cpp main.cpp managefile.cpp progresswidget.cpp settingswidget.cpp sportwatcher.cpp sportwatcherwidget.cpp wmsbase.cpp progresswidgetbase.cpp settingswidgetbase.cpp sportwatcherwidgetbase.cpp wmswidgetbase.cpp ; do \
+        for file in coordinateswidget.cpp disassemble.cpp main.cpp managefile.cpp progresswidget.cpp settingswidget.cpp sportwatcher.cpp sportwatcherwidget.cpp transform.cpp wmsbase.cpp coordinateswidgetbase.cpp progresswidgetbase.cpp settingswidgetbase.cpp sportwatcherwidgetbase.cpp wmswidgetbase.cpp ; do \
           echo "#include \"$$file\"" >> sportwatcher.all_cpp.files; \
           test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> sportwatcher.all_cpp.final; \
         done; \
 ,29 → 921,48
 kde-rpo-clean:
         -rm -f *.rpo
-#>+ 21
+#>+ 25
+coordinateswidget.lo: coordinateswidget.moc
 sportwatcherwidget.o: sportwatcherwidget.moc
-$(srcdir)/managefile.cpp: progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h wmswidgetbase.h
-$(srcdir)/settingswidget.cpp: progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h wmswidgetbase.h
-$(srcdir)/main.cpp: progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h wmswidgetbase.h
-$(srcdir)/wmsbase.cpp: progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h wmswidgetbase.h
-$(srcdir)/progresswidget.cpp: progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h wmswidgetbase.h
+$(srcdir)/managefile.cpp: coordinateswidgetbase.h progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h wmswidgetbase.h
+$(srcdir)/settingswidget.cpp: coordinateswidgetbase.h progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h wmswidgetbase.h
+$(srcdir)/main.cpp: coordinateswidgetbase.h progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h wmswidgetbase.h
+$(srcdir)/wmsbase.cpp: coordinateswidgetbase.h progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h wmswidgetbase.h
+$(srcdir)/progresswidget.cpp: coordinateswidgetbase.h progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h wmswidgetbase.h
 progresswidget.o: progresswidget.moc
 settingswidget.o: settingswidget.moc
 nmcheck:
 settingswidget.lo: settingswidget.moc
-$(srcdir)/sportwatcher.cpp: progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h wmswidgetbase.h
-$(srcdir)/disassemble.cpp: progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h wmswidgetbase.h
+$(srcdir)/sportwatcher.cpp: coordinateswidgetbase.h progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h wmswidgetbase.h
+$(srcdir)/disassemble.cpp: coordinateswidgetbase.h progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h wmswidgetbase.h
 wmsbase.lo: wmsbase.moc
 nmcheck-am: nmcheck
+coordinateswidget.o: coordinateswidget.moc
 sportwatcherwidget.lo: sportwatcherwidget.moc
-$(srcdir)/sportwatcherwidget.cpp: progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h wmswidgetbase.h
+$(srcdir)/sportwatcherwidget.cpp: coordinateswidgetbase.h progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h wmswidgetbase.h
 sportwatcher.lo: sportwatcher.moc
 wmsbase.o: wmsbase.moc
 sportwatcher.o: sportwatcher.moc
 progresswidget.lo: progresswidget.moc
+$(srcdir)/coordinateswidget.cpp: coordinateswidgetbase.h progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h wmswidgetbase.h
+$(srcdir)/transform.cpp: coordinateswidgetbase.h progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h wmswidgetbase.h
-#>+ 60
+#>+ 75
+coordinateswidgetbase.cpp: $(srcdir)/coordinateswidgetbase.ui coordinateswidgetbase.h coordinateswidgetbase.moc
+        rm -f coordinateswidgetbase.cpp
+        echo '#include <kdialog.h>' > coordinateswidgetbase.cpp
+        echo '#include <klocale.h>' >> coordinateswidgetbase.cpp
+        $(UIC) -tr ${UIC_TR} -i coordinateswidgetbase.h $(srcdir)/coordinateswidgetbase.ui > coordinateswidgetbase.cpp.temp ; ret=$$?; \
+        $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" coordinateswidgetbase.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_coordinateswidgetbase,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> coordinateswidgetbase.cpp ;\
+        rm -f coordinateswidgetbase.cpp.temp ;\
+        if test "$$ret" = 0; then echo '#include "coordinateswidgetbase.moc"' >> coordinateswidgetbase.cpp; else rm -f coordinateswidgetbase.cpp ; exit $$ret ; fi
+coordinateswidgetbase.h: $(srcdir)/coordinateswidgetbase.ui
+        rm -rf coordinateswidgetbase.h;
+        $(UIC) $(srcdir)/coordinateswidgetbase.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> coordinateswidgetbase.h ;
+coordinateswidgetbase.moc: coordinateswidgetbase.h
+        $(MOC) coordinateswidgetbase.h -o coordinateswidgetbase.moc
 sportwatcherwidgetbase.cpp: $(srcdir)/sportwatcherwidgetbase.ui sportwatcherwidgetbase.h sportwatcherwidgetbase.moc
         rm -f sportwatcherwidgetbase.cpp
         echo '#include <kdialog.h>' > sportwatcherwidgetbase.cpp

Subversion Repositories public

Compare Revisions

Ignore whitespace Rev 157 → Rev 158