WebSVN – public – Path Comparison – / – /sportwatcher/trunk/src/Makefile.in Rev 151 and /sportwatcher/trunk/src/Makefile.in Rev 152

Ignore whitespace Rev 151 → Rev 152

 /sportwatcher/trunk/src/Makefile.in
 ,7 → 59,7
 am_sportwatcher_OBJECTS = disassemble.$(OBJEXT) main.$(OBJEXT) \
         managefile.$(OBJEXT) progresswidget.$(OBJEXT) \
         settingswidget.$(OBJEXT) sportwatcher.$(OBJEXT) \
-        sportwatcherwidget.$(OBJEXT)
+        sportwatcherwidget.$(OBJEXT) wmsbase.$(OBJEXT)
 #>- sportwatcher_OBJECTS = $(am_sportwatcher_OBJECTS)
 #>+ 7
 sportwatcher_final_OBJECTS = sportwatcher.all_cpp.o
 ,7 → 66,7
 sportwatcher_nofinal_OBJECTS = disassemble.$(OBJEXT) main.$(OBJEXT) \
         managefile.$(OBJEXT) progresswidget.$(OBJEXT) \
         settingswidget.$(OBJEXT) sportwatcher.$(OBJEXT) \
-        sportwatcherwidget.$(OBJEXT) progresswidgetbase.$(OBJEXT) settingswidgetbase.$(OBJEXT) sportwatcherwidgetbase.$(OBJEXT)
+        sportwatcherwidget.$(OBJEXT) wmsbase.$(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 =
 ,7 → 360,7
 # 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
+        settingswidget.h sportwatcher.h sportwatcherwidget.h wmsbase.h
 # let automoc handle all of the meta source files (moc)
 ,11 → 370,13
 # 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
-#>+ 3
+#>-     sportwatcher.cpp sportwatcherwidget.cpp sportwatcherwidgetbase.ui wmsbase.cpp \
+#>-     wmswidgetbase.ui
+#>+ 4
 sportwatcher_SOURCES=disassemble.cpp main.cpp managefile.cpp \
         progresswidget.cpp  settingswidget.cpp  \
-        sportwatcher.cpp sportwatcherwidget.cpp  progresswidgetbase.cpp settingswidgetbase.cpp sportwatcherwidgetbase.cpp
+        sportwatcher.cpp sportwatcherwidget.cpp  wmsbase.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 → 484,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)/wmsbase.Po@am__quote@
 .cpp.o:
 @am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 ,6 → 761,13
 mocs: sportwatcher.moc
 #>+ 3
+wmsbase.moc: $(srcdir)/wmsbase.h
+        $(MOC) $(srcdir)/wmsbase.h -o wmsbase.moc
+#>+ 2
+mocs: wmsbase.moc
+#>+ 3
 settingswidget.moc: $(srcdir)/settingswidget.h
         $(MOC) $(srcdir)/settingswidget.h -o settingswidget.moc
 ,17 → 776,18
 #>+ 3
 clean-metasources:
-        -rm -f  progresswidget.moc sportwatcherwidget.moc sportwatcher.moc settingswidget.moc
+        -rm -f  progresswidget.moc sportwatcherwidget.moc sportwatcher.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-activity.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
+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-activity.png wmswidgetbase.ui 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
-#>+ 6
+#>+ 7
 clean-ui:
         -rm -f \
         progresswidgetbase.cpp progresswidgetbase.h progresswidgetbase.moc \
         settingswidgetbase.cpp settingswidgetbase.h settingswidgetbase.moc \
-        sportwatcherwidgetbase.cpp sportwatcherwidgetbase.h sportwatcherwidgetbase.moc
+        sportwatcherwidgetbase.cpp sportwatcherwidgetbase.h sportwatcherwidgetbase.moc \
+        wmswidgetbase.cpp wmswidgetbase.h wmswidgetbase.moc
 #>+ 2
 docs-am:
 ,11 → 870,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 progresswidgetbase.cpp settingswidgetbase.cpp sportwatcherwidgetbase.cpp  sportwatcherwidget.moc progresswidget.moc progresswidgetbase.moc sportwatcher.moc settingswidgetbase.moc settingswidget.moc sportwatcherwidgetbase.moc
+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
         @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 progresswidgetbase.cpp settingswidgetbase.cpp sportwatcherwidgetbase.cpp ; do \
+        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 \
           echo "#include \"$$file\"" >> sportwatcher.all_cpp.files; \
           test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> sportwatcher.all_cpp.final; \
         done; \
 ,26 → 905,29
 kde-rpo-clean:
         -rm -f *.rpo
-#>+ 18
+#>+ 21
 sportwatcherwidget.o: sportwatcherwidget.moc
-$(srcdir)/managefile.cpp: progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h
-$(srcdir)/settingswidget.cpp: progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h
-$(srcdir)/main.cpp: progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h
-$(srcdir)/progresswidget.cpp: progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h
+$(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
 progresswidget.o: progresswidget.moc
 settingswidget.o: settingswidget.moc
 nmcheck:
 settingswidget.lo: settingswidget.moc
-$(srcdir)/sportwatcher.cpp: progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h
-$(srcdir)/disassemble.cpp: progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h
+$(srcdir)/sportwatcher.cpp: progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h wmswidgetbase.h
+$(srcdir)/disassemble.cpp: progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h wmswidgetbase.h
+wmsbase.lo: wmsbase.moc
 nmcheck-am: nmcheck
 sportwatcherwidget.lo: sportwatcherwidget.moc
-$(srcdir)/sportwatcherwidget.cpp: progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h
+$(srcdir)/sportwatcherwidget.cpp: progresswidgetbase.h settingswidgetbase.h sportwatcherwidgetbase.h wmswidgetbase.h
 sportwatcher.lo: sportwatcher.moc
+wmsbase.o: wmsbase.moc
 sportwatcher.o: sportwatcher.moc
 progresswidget.lo: progresswidget.moc
-#>+ 45
+#>+ 60
 sportwatcherwidgetbase.cpp: $(srcdir)/sportwatcherwidgetbase.ui sportwatcherwidgetbase.h sportwatcherwidgetbase.moc
         rm -f sportwatcherwidgetbase.cpp
         echo '#include <kdialog.h>' > sportwatcherwidgetbase.cpp
 ,6 → 958,21
 settingswidgetbase.moc: settingswidgetbase.h
         $(MOC) settingswidgetbase.h -o settingswidgetbase.moc
+wmswidgetbase.cpp: $(srcdir)/wmswidgetbase.ui wmswidgetbase.h wmswidgetbase.moc
+        rm -f wmswidgetbase.cpp
+        echo '#include <kdialog.h>' > wmswidgetbase.cpp
+        echo '#include <klocale.h>' >> wmswidgetbase.cpp
+        $(UIC) -tr ${UIC_TR} -i wmswidgetbase.h $(srcdir)/wmswidgetbase.ui > wmswidgetbase.cpp.temp ; ret=$$?; \
+        $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" wmswidgetbase.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_wmswidgetbase,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> wmswidgetbase.cpp ;\
+        rm -f wmswidgetbase.cpp.temp ;\
+        if test "$$ret" = 0; then echo '#include "wmswidgetbase.moc"' >> wmswidgetbase.cpp; else rm -f wmswidgetbase.cpp ; exit $$ret ; fi
+wmswidgetbase.h: $(srcdir)/wmswidgetbase.ui
+        rm -rf wmswidgetbase.h;
+        $(UIC) $(srcdir)/wmswidgetbase.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> wmswidgetbase.h ;
+wmswidgetbase.moc: wmswidgetbase.h
+        $(MOC) wmswidgetbase.h -o wmswidgetbase.moc
 progresswidgetbase.cpp: $(srcdir)/progresswidgetbase.ui progresswidgetbase.h progresswidgetbase.moc
         rm -f progresswidgetbase.cpp
         echo '#include <kdialog.h>' > progresswidgetbase.cpp

Subversion Repositories public

Compare Revisions

Ignore whitespace Rev 151 → Rev 152