SOURCES: qtemu-help.patch (NEW) - new

prism prism at pld-linux.org
Wed Jun 20 22:59:53 CEST 2007


Author: prism                        Date: Wed Jun 20 20:59:53 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- new

---- Files affected:
SOURCES:
   qtemu-help.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/qtemu-help.patch
diff -u /dev/null SOURCES/qtemu-help.patch:1.1
--- /dev/null	Wed Jun 20 22:59:53 2007
+++ SOURCES/qtemu-help.patch	Wed Jun 20 22:59:48 2007
@@ -0,0 +1,755 @@
+diff -uNr qtemu.orig/helpwindow.cpp qtemu/helpwindow.cpp
+--- qtemu.orig/helpwindow.cpp	2007-03-19 13:56:21.000000000 +0100
++++ qtemu/helpwindow.cpp	2007-06-20 22:47:25.000000000 +0200
+@@ -22,6 +22,7 @@
+ ****************************************************************************/
+ 
+ #include <QtGui>
++#include "config.h"
+ 
+ #include "helpwindow.h"
+ 
+@@ -59,10 +60,15 @@
+ {
+     QSettings settings("QtEmu", "QtEmu");
+     QString locale = settings.value("language", QString(QLocale::system().name())).toString();
++    QString version (VERSION);
+     if (locale != "en")
+     { //check first if there is a language specific help available
+         //check for case when qtemu executable is in same dir (windows)
+-        QUrl testUrl("help/" + locale + "/main.htm");
++        QUrl testUrl("/usr/share/qtemu-" + version + "/help/" + locale + "/main.htm");
++        if (QFile::exists(testUrl.toString()))
++            return testUrl;
++    
++        testUrl = QUrl("help/" + locale + "/main.htm");
+         if (QFile::exists(testUrl.toString()))
+             return testUrl;
+     
+@@ -77,8 +83,12 @@
+             return testUrl;
+     }
+ 
++    QUrl testUrl("/usr/share/qtemu-" + version + "/help/main.htm");
++    if (QFile::exists(testUrl.toString()))
++	    return testUrl;
++    
+     //check for case when qtemu executable is in same dir (windows)
+-    QUrl testUrl("help/main.htm");
++    testUrl = QUrl("help/main.htm");
+     if (QFile::exists(testUrl.toString()))
+         return testUrl;
+ 
+diff -uNr qtemu.orig/Makefile qtemu/Makefile
+--- qtemu.orig/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ qtemu/Makefile	2007-06-20 22:46:01.000000000 +0200
+@@ -0,0 +1,137 @@
++#############################################################################
++# Makefile for building: qtemu
++# Generated by qmake (2.01a) (Qt 4.3.0) on: Wed Jun 20 22:46:01 2007
++# Project:  qtemu.pro
++# Template: app
++# Command: /usr/bin/qt4-qmake -unix -o Makefile qtemu.pro
++#############################################################################
++
++first: release
++install: release-install
++uninstall: release-uninstall
++MAKEFILE      = Makefile
++QMAKE         = /usr/bin/qt4-qmake
++DEL_FILE      = rm -f
++CHK_DIR_EXISTS= test -d
++MKDIR         = mkdir -p
++COPY          = cp -f
++COPY_FILE     = $(COPY)
++COPY_DIR      = $(COPY) -r
++INSTALL_FILE  = install -m 644 -p
++INSTALL_PROGRAM = install -m 755 -p
++INSTALL_DIR   = $(COPY_DIR)
++DEL_FILE      = rm -f
++SYMLINK       = ln -sf
++DEL_DIR       = rmdir
++MOVE          = mv -f
++CHK_DIR_EXISTS= test -d
++MKDIR         = mkdir -p
++SUBTARGETS    =  \
++		release \
++		debug
++
++release: $(MAKEFILE).Release FORCE
++	$(MAKE) -f $(MAKEFILE).Release
++release-make_default: $(MAKEFILE).Release FORCE
++	$(MAKE) -f $(MAKEFILE).Release 
++release-make_first: $(MAKEFILE).Release FORCE
++	$(MAKE) -f $(MAKEFILE).Release first
++release-all: $(MAKEFILE).Release FORCE
++	$(MAKE) -f $(MAKEFILE).Release all
++release-clean: $(MAKEFILE).Release FORCE
++	$(MAKE) -f $(MAKEFILE).Release clean
++release-distclean: $(MAKEFILE).Release FORCE
++	$(MAKE) -f $(MAKEFILE).Release distclean
++release-install: $(MAKEFILE).Release FORCE
++	$(MAKE) -f $(MAKEFILE).Release install
++release-uninstall: $(MAKEFILE).Release FORCE
++	$(MAKE) -f $(MAKEFILE).Release uninstall
++debug: $(MAKEFILE).Debug FORCE
++	$(MAKE) -f $(MAKEFILE).Debug
++debug-make_default: $(MAKEFILE).Debug FORCE
++	$(MAKE) -f $(MAKEFILE).Debug 
++debug-make_first: $(MAKEFILE).Debug FORCE
++	$(MAKE) -f $(MAKEFILE).Debug first
++debug-all: $(MAKEFILE).Debug FORCE
++	$(MAKE) -f $(MAKEFILE).Debug all
++debug-clean: $(MAKEFILE).Debug FORCE
++	$(MAKE) -f $(MAKEFILE).Debug clean
++debug-distclean: $(MAKEFILE).Debug FORCE
++	$(MAKE) -f $(MAKEFILE).Debug distclean
++debug-install: $(MAKEFILE).Debug FORCE
++	$(MAKE) -f $(MAKEFILE).Debug install
++debug-uninstall: $(MAKEFILE).Debug FORCE
++	$(MAKE) -f $(MAKEFILE).Debug uninstall
++
++Makefile: qtemu.pro  /usr/share/qt4/mkspecs/linux-g++-64/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \
++		/usr/share/qt4/mkspecs/common/unix.conf \
++		/usr/share/qt4/mkspecs/common/linux.conf \
++		/usr/share/qt4/mkspecs/qconfig.pri \
++		/usr/share/qt4/mkspecs/features/qt_functions.prf \
++		/usr/share/qt4/mkspecs/features/qt_config.prf \
++		/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
++		/usr/share/qt4/mkspecs/features/default_pre.prf \
++		/usr/share/qt4/mkspecs/features/release.prf \
++		/usr/share/qt4/mkspecs/features/debug_and_release.prf \
++		/usr/share/qt4/mkspecs/features/default_post.prf \
++		/usr/share/qt4/mkspecs/features/warn_on.prf \
++		/usr/share/qt4/mkspecs/features/qt.prf \
++		/usr/share/qt4/mkspecs/features/unix/thread.prf \
++		/usr/share/qt4/mkspecs/features/moc.prf \
++		/usr/share/qt4/mkspecs/features/resources.prf \
++		/usr/share/qt4/mkspecs/features/uic.prf \
++		/usr/share/qt4/mkspecs/features/yacc.prf \
++		/usr/share/qt4/mkspecs/features/lex.prf \
++		/usr/lib64/libQtXml.prl \
++		/usr/lib64/libQtCore.prl \
++		/usr/lib64/libQtGui.prl
++	$(QMAKE) -unix -o Makefile qtemu.pro
++/usr/share/qt4/mkspecs/common/g++.conf:
++/usr/share/qt4/mkspecs/common/unix.conf:
++/usr/share/qt4/mkspecs/common/linux.conf:
++/usr/share/qt4/mkspecs/qconfig.pri:
++/usr/share/qt4/mkspecs/features/qt_functions.prf:
++/usr/share/qt4/mkspecs/features/qt_config.prf:
++/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
++/usr/share/qt4/mkspecs/features/default_pre.prf:
++/usr/share/qt4/mkspecs/features/release.prf:
++/usr/share/qt4/mkspecs/features/debug_and_release.prf:
++/usr/share/qt4/mkspecs/features/default_post.prf:
++/usr/share/qt4/mkspecs/features/warn_on.prf:
++/usr/share/qt4/mkspecs/features/qt.prf:
++/usr/share/qt4/mkspecs/features/unix/thread.prf:
++/usr/share/qt4/mkspecs/features/moc.prf:
++/usr/share/qt4/mkspecs/features/resources.prf:
++/usr/share/qt4/mkspecs/features/uic.prf:
++/usr/share/qt4/mkspecs/features/yacc.prf:
++/usr/share/qt4/mkspecs/features/lex.prf:
++/usr/lib64/libQtXml.prl:
++/usr/lib64/libQtCore.prl:
++/usr/lib64/libQtGui.prl:
++qmake: qmake_all FORCE
++	@$(QMAKE) -unix -o Makefile qtemu.pro
++
++qmake_all: FORCE
++
++make_default: release-make_default debug-make_default FORCE
++make_first: release-make_first debug-make_first FORCE
++all: release-all debug-all FORCE
++clean: release-clean debug-clean FORCE
++distclean: release-distclean debug-distclean FORCE
++	-$(DEL_FILE) Makefile
++
++release-mocclean: $(MAKEFILE).Release
++	$(MAKE) -f $(MAKEFILE).Release mocclean
++debug-mocclean: $(MAKEFILE).Debug
++	$(MAKE) -f $(MAKEFILE).Debug mocclean
++mocclean: release-mocclean debug-mocclean
++
++release-mocables: $(MAKEFILE).Release
++	$(MAKE) -f $(MAKEFILE).Release mocables
++debug-mocables: $(MAKEFILE).Debug
++	$(MAKE) -f $(MAKEFILE).Debug mocables
++mocables: release-mocables debug-mocables
++FORCE:
++
++$(MAKEFILE).Release: Makefile
++$(MAKEFILE).Debug: Makefile
+diff -uNr qtemu.orig/Makefile.Debug qtemu/Makefile.Debug
+--- qtemu.orig/Makefile.Debug	1970-01-01 01:00:00.000000000 +0100
++++ qtemu/Makefile.Debug	2007-06-20 22:46:01.000000000 +0200
+@@ -0,0 +1,281 @@
++#############################################################################
++# Makefile for building: qtemu
++# Generated by qmake (2.01a) (Qt 4.3.0) on: Wed Jun 20 22:46:01 2007
++# Project:  qtemu.pro
++# Template: app
++#############################################################################
++
++####### Compiler, tools and options
++
++CC            = x86_64-pld-linux-gcc
++CXX           = x86_64-pld-linux-g++
++DEFINES       = -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
++CFLAGS        = -m64 -pipe -O0 -g -Wall -Wall -W -D_REENTRANT $(DEFINES)
++CXXFLAGS      = -m64 -pipe -O0 -g -Wall -Wall -W -D_REENTRANT $(DEFINES)
++INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++-64 -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtXml -I/usr/include/qt4/QtXml -I/usr/include/qt4 -Idebug -I.
++LINK          = x86_64-pld-linux-g++
++LFLAGS        = -m64 -Wl,-rpath,/usr/lib64
++LIBS          = $(SUBLIBS)  -L/usr/lib64 -lQtXml -L/usr/lib64 -pthread -pthread -lQtGui -L/usr/glib64 -lpng -lSM -lICE -pthread -pthread -lXi -lXrender -lXrandr -lXfixes -lXcursor -lXinerama -lfreetype -lfontconfig -lXext -lX11 -lQtCore -lz -lm -pthread -lgthread-2.0 -lrt -lglib-2.0 -ldl -lpthread
++AR            = ar cqs
++RANLIB        = 
++QMAKE         = /usr/bin/qt4-qmake
++TAR           = tar -cf
++COMPRESS      = gzip -9f
++COPY          = cp -f
++SED           = sed
++COPY_FILE     = $(COPY)
++COPY_DIR      = $(COPY) -r
++INSTALL_FILE  = install -m 644 -p
++INSTALL_DIR   = $(COPY_DIR)
++INSTALL_PROGRAM = install -m 755 -p
++DEL_FILE      = rm -f
++SYMLINK       = ln -sf
++DEL_DIR       = rmdir
++MOVE          = mv -f
++CHK_DIR_EXISTS= test -d
++MKDIR         = mkdir -p
++
++####### Output directory
++
++OBJECTS_DIR   = debug/
++
++####### Files
++
++SOURCES       = main.cpp \
++		mainwindow.cpp \
++		helpwindow.cpp \
++		configwindow.cpp \
++		machineprocess.cpp \
++		wizard.cpp \
++		machinewizard.cpp \
++		machinetab.cpp debug/moc_machineprocess.cpp \
++		debug/moc_machinetab.cpp \
++		debug/moc_wizard.cpp \
++		debug/moc_machinewizard.cpp \
++		debug/moc_helpwindow.cpp \
++		debug/moc_configwindow.cpp \
++		debug/moc_mainwindow.cpp \
++		debug/qrc_qtemu.cpp
++OBJECTS       = debug/main.o \
++		debug/mainwindow.o \
++		debug/helpwindow.o \
++		debug/configwindow.o \
++		debug/machineprocess.o \
++		debug/wizard.o \
++		debug/machinewizard.o \
++		debug/machinetab.o \
++		debug/moc_machineprocess.o \
++		debug/moc_machinetab.o \
++		debug/moc_wizard.o \
++		debug/moc_machinewizard.o \
++		debug/moc_helpwindow.o \
++		debug/moc_configwindow.o \
++		debug/moc_mainwindow.o \
++		debug/qrc_qtemu.o
++DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
++		/usr/share/qt4/mkspecs/common/unix.conf \
++		/usr/share/qt4/mkspecs/common/linux.conf \
++		/usr/share/qt4/mkspecs/qconfig.pri \
++		/usr/share/qt4/mkspecs/features/qt_functions.prf \
++		/usr/share/qt4/mkspecs/features/qt_config.prf \
++		/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
++		/usr/share/qt4/mkspecs/features/default_pre.prf \
++		/usr/share/qt4/mkspecs/features/debug.prf \
++		/usr/share/qt4/mkspecs/features/debug_and_release.prf \
++		/usr/share/qt4/mkspecs/features/default_post.prf \
++		/usr/share/qt4/mkspecs/features/build_pass.prf \
++		/usr/share/qt4/mkspecs/features/warn_on.prf \
++		/usr/share/qt4/mkspecs/features/qt.prf \
++		/usr/share/qt4/mkspecs/features/unix/thread.prf \
++		/usr/share/qt4/mkspecs/features/moc.prf \
++		/usr/share/qt4/mkspecs/features/resources.prf \
++		/usr/share/qt4/mkspecs/features/uic.prf \
++		/usr/share/qt4/mkspecs/features/yacc.prf \
++		/usr/share/qt4/mkspecs/features/lex.prf \
++		qtemu.pro
++QMAKE_TARGET  = qtemu
++DESTDIR       = 
++TARGET        = qtemu
++
++first: all
++####### Implicit rules
++
++.SUFFIXES: .o .c .cpp .cc .cxx .C
++
++.cpp.o:
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
++
++.cc.o:
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
++
++.cxx.o:
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
++
++.C.o:
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
++
++.c.o:
++	$(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
++
++####### Build rules
++
++all: Makefile.Debug $(TARGET)
++
++$(TARGET):  $(OBJECTS)  
++	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
++
++qmake:  FORCE
++	@$(QMAKE) -unix -o Makefile.Debug qtemu.pro
++
++dist: 
++	@$(CHK_DIR_EXISTS) debug/qtemu1.0.0 || $(MKDIR) debug/qtemu1.0.0 
++	$(COPY_FILE) --parents $(SOURCES) $(DIST) debug/qtemu1.0.0/ && $(COPY_FILE) --parents config.h machineprocess.h machinetab.h wizard.h machinewizard.h helpwindow.h configwindow.h mainwindow.h debug/qtemu1.0.0/ && $(COPY_FILE) --parents qtemu.qrc debug/qtemu1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp helpwindow.cpp configwindow.cpp machineprocess.cpp wizard.cpp machinewizard.cpp machinetab.cpp debug/qtemu1.0.0/ && $(COPY_FILE) --parents translations/template_qtemu.ts translations/qtemu_de.ts translations/qtemu_tr.ts translations/qtemu_ru.ts translations/qtemu_cz.ts translations/qtemu_es.ts debug/qtemu1.0.0/ && (cd `dirname debug/qtemu1.0.0` && $(TAR) qtemu1.0.0.tar qtemu1.0.0 && $(COMPRESS) qtemu1.0.0.tar) && $(MOVE) `dirname debug/qtemu1.0.0`/qtemu1.0.0.tar.gz . && $(DEL_FILE) -r debug/qtemu1.0.0
++
++
++clean:compiler_clean 
++	-$(DEL_FILE) $(OBJECTS)
++	-$(DEL_FILE) *~ core *.core
++
++
++####### Sub-libraries
++
++distclean: clean
++	-$(DEL_FILE) $(TARGET) 
++	-$(DEL_FILE) Makefile.Debug
++
++
++mocclean: compiler_moc_header_clean compiler_moc_source_clean
++
++mocables: compiler_moc_header_make_all compiler_moc_source_make_all
++
++compiler_moc_header_make_all: debug/moc_machineprocess.cpp debug/moc_machinetab.cpp debug/moc_wizard.cpp debug/moc_machinewizard.cpp debug/moc_helpwindow.cpp debug/moc_configwindow.cpp debug/moc_mainwindow.cpp
++compiler_moc_header_clean:
++	-$(DEL_FILE) debug/moc_machineprocess.cpp debug/moc_machinetab.cpp debug/moc_wizard.cpp debug/moc_machinewizard.cpp debug/moc_helpwindow.cpp debug/moc_configwindow.cpp debug/moc_mainwindow.cpp
++debug/moc_machineprocess.cpp: machineprocess.h
++	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) machineprocess.h -o debug/moc_machineprocess.cpp
++
++debug/moc_machinetab.cpp: machinetab.h
++	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) machinetab.h -o debug/moc_machinetab.cpp
++
++debug/moc_wizard.cpp: wizard.h
++	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) wizard.h -o debug/moc_wizard.cpp
++
++debug/moc_machinewizard.cpp: wizard.h \
++		machinewizard.h
++	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) machinewizard.h -o debug/moc_machinewizard.cpp
++
++debug/moc_helpwindow.cpp: helpwindow.h
++	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) helpwindow.h -o debug/moc_helpwindow.cpp
++
++debug/moc_configwindow.cpp: configwindow.h
++	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) configwindow.h -o debug/moc_configwindow.cpp
++
++debug/moc_mainwindow.cpp: mainwindow.h
++	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) mainwindow.h -o debug/moc_mainwindow.cpp
++
++compiler_rcc_make_all: debug/qrc_qtemu.cpp
++compiler_rcc_clean:
++	-$(DEL_FILE) debug/qrc_qtemu.cpp
++debug/qrc_qtemu.cpp: qtemu.qrc \
++		images/new.png \
++		images/stop.png \
++		images/qtemu.png \
++		images/cdrom.png \
++		images/start.png \
++		images/restart.png \
++		images/close.png \
++		images/cdimage.png \
++		images/memory.png \
++		images/floppy.png \
++		images/network.png \
++		images/hdd.png \
++		images/pause.png \
++		images/other.png \
++		images/open.png
++	/usr/lib64/qt4/bin/rcc -name qtemu qtemu.qrc -o debug/qrc_qtemu.cpp
++
++compiler_image_collection_make_all: qmake_image_collection.cpp
++compiler_image_collection_clean:
++	-$(DEL_FILE) qmake_image_collection.cpp
++compiler_moc_source_make_all:
++compiler_moc_source_clean:
++compiler_uic_make_all:
++compiler_uic_clean:
++compiler_yacc_decl_make_all:
++compiler_yacc_decl_clean:
++compiler_yacc_impl_make_all:
++compiler_yacc_impl_clean:
++compiler_lex_make_all:
++compiler_lex_clean:
++compiler_clean: compiler_moc_header_clean compiler_rcc_clean 
++
++####### Compile
++
++debug/main.o: main.cpp mainwindow.h
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/main.o main.cpp
++
++debug/mainwindow.o: mainwindow.cpp machinetab.h \
++		machinewizard.h \
++		wizard.h \
++		helpwindow.h \
++		configwindow.h \
++		config.h \
++		mainwindow.h
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/mainwindow.o mainwindow.cpp
++
++debug/helpwindow.o: helpwindow.cpp config.h \
++		helpwindow.h
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/helpwindow.o helpwindow.cpp
++
++debug/configwindow.o: configwindow.cpp configwindow.h
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/configwindow.o configwindow.cpp
++
++debug/machineprocess.o: machineprocess.cpp config.h \
++		machineprocess.h
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/machineprocess.o machineprocess.cpp
++
++debug/wizard.o: wizard.cpp wizard.h
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/wizard.o wizard.cpp
++
++debug/machinewizard.o: machinewizard.cpp config.h \
++		machinewizard.h \
++		wizard.h
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/machinewizard.o machinewizard.cpp
++
++debug/machinetab.o: machinetab.cpp machineprocess.h \
++		config.h \
++		machinetab.h
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/machinetab.o machinetab.cpp
++
++debug/moc_machineprocess.o: debug/moc_machineprocess.cpp 
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_machineprocess.o debug/moc_machineprocess.cpp
++
++debug/moc_machinetab.o: debug/moc_machinetab.cpp 
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_machinetab.o debug/moc_machinetab.cpp
++
++debug/moc_wizard.o: debug/moc_wizard.cpp 
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_wizard.o debug/moc_wizard.cpp
++
++debug/moc_machinewizard.o: debug/moc_machinewizard.cpp 
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_machinewizard.o debug/moc_machinewizard.cpp
++
++debug/moc_helpwindow.o: debug/moc_helpwindow.cpp 
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_helpwindow.o debug/moc_helpwindow.cpp
++
++debug/moc_configwindow.o: debug/moc_configwindow.cpp 
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_configwindow.o debug/moc_configwindow.cpp
++
++debug/moc_mainwindow.o: debug/moc_mainwindow.cpp 
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_mainwindow.o debug/moc_mainwindow.cpp
++
++debug/qrc_qtemu.o: debug/qrc_qtemu.cpp 
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/qrc_qtemu.o debug/qrc_qtemu.cpp
++
++####### Install
++
++install:   FORCE
++
++uninstall:   FORCE
++
++FORCE:
++
+diff -uNr qtemu.orig/Makefile.Release qtemu/Makefile.Release
+--- qtemu.orig/Makefile.Release	1970-01-01 01:00:00.000000000 +0100
++++ qtemu/Makefile.Release	2007-06-20 22:46:01.000000000 +0200
+@@ -0,0 +1,281 @@
++#############################################################################
++# Makefile for building: qtemu
++# Generated by qmake (2.01a) (Qt 4.3.0) on: Wed Jun 20 22:46:00 2007
++# Project:  qtemu.pro
++# Template: app
++#############################################################################
++
++####### Compiler, tools and options
++
++CC            = x86_64-pld-linux-gcc
++CXX           = x86_64-pld-linux-g++
++DEFINES       = -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
++CFLAGS        = -m64 -pipe -O2 -fno-strict-aliasing -fwrapv -march=x86-64 -fno-strict-aliasing -gdwarf-2 -g2 -Wall -W -D_REENTRANT $(DEFINES)
++CXXFLAGS      = -m64 -pipe -O2 -fno-strict-aliasing -fwrapv -march=x86-64 -fno-strict-aliasing -gdwarf-2 -g2 -Wall -W -D_REENTRANT $(DEFINES)
++INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++-64 -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtXml -I/usr/include/qt4/QtXml -I/usr/include/qt4 -Irelease -I.
++LINK          = x86_64-pld-linux-g++
++LFLAGS        = -m64 -Wl,-rpath,/usr/lib64
++LIBS          = $(SUBLIBS)  -L/usr/lib64 -lQtXml -L/usr/lib64 -pthread -pthread -lQtGui -L/usr/glib64 -lpng -lSM -lICE -pthread -pthread -lXi -lXrender -lXrandr -lXfixes -lXcursor -lXinerama -lfreetype -lfontconfig -lXext -lX11 -lQtCore -lz -lm -pthread -lgthread-2.0 -lrt -lglib-2.0 -ldl -lpthread
++AR            = ar cqs
++RANLIB        = 
++QMAKE         = /usr/bin/qt4-qmake
++TAR           = tar -cf
++COMPRESS      = gzip -9f
++COPY          = cp -f
++SED           = sed
++COPY_FILE     = $(COPY)
++COPY_DIR      = $(COPY) -r
++INSTALL_FILE  = install -m 644 -p
++INSTALL_DIR   = $(COPY_DIR)
++INSTALL_PROGRAM = install -m 755 -p
++DEL_FILE      = rm -f
++SYMLINK       = ln -sf
++DEL_DIR       = rmdir
++MOVE          = mv -f
++CHK_DIR_EXISTS= test -d
++MKDIR         = mkdir -p
++
++####### Output directory
++
++OBJECTS_DIR   = release/
++
++####### Files
++
++SOURCES       = main.cpp \
++		mainwindow.cpp \
++		helpwindow.cpp \
++		configwindow.cpp \
++		machineprocess.cpp \
++		wizard.cpp \
++		machinewizard.cpp \
++		machinetab.cpp release/moc_machineprocess.cpp \
++		release/moc_machinetab.cpp \
++		release/moc_wizard.cpp \
++		release/moc_machinewizard.cpp \
++		release/moc_helpwindow.cpp \
++		release/moc_configwindow.cpp \
++		release/moc_mainwindow.cpp \
++		release/qrc_qtemu.cpp
++OBJECTS       = release/main.o \
++		release/mainwindow.o \
++		release/helpwindow.o \
++		release/configwindow.o \
++		release/machineprocess.o \
++		release/wizard.o \
++		release/machinewizard.o \
++		release/machinetab.o \
++		release/moc_machineprocess.o \
++		release/moc_machinetab.o \
++		release/moc_wizard.o \
++		release/moc_machinewizard.o \
++		release/moc_helpwindow.o \
++		release/moc_configwindow.o \
++		release/moc_mainwindow.o \
++		release/qrc_qtemu.o
++DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
++		/usr/share/qt4/mkspecs/common/unix.conf \
++		/usr/share/qt4/mkspecs/common/linux.conf \
++		/usr/share/qt4/mkspecs/qconfig.pri \
++		/usr/share/qt4/mkspecs/features/qt_functions.prf \
++		/usr/share/qt4/mkspecs/features/qt_config.prf \
++		/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
++		/usr/share/qt4/mkspecs/features/default_pre.prf \
++		/usr/share/qt4/mkspecs/features/release.prf \
++		/usr/share/qt4/mkspecs/features/debug_and_release.prf \
++		/usr/share/qt4/mkspecs/features/default_post.prf \
++		/usr/share/qt4/mkspecs/features/build_pass.prf \
++		/usr/share/qt4/mkspecs/features/warn_on.prf \
++		/usr/share/qt4/mkspecs/features/qt.prf \
++		/usr/share/qt4/mkspecs/features/unix/thread.prf \
++		/usr/share/qt4/mkspecs/features/moc.prf \
++		/usr/share/qt4/mkspecs/features/resources.prf \
++		/usr/share/qt4/mkspecs/features/uic.prf \
++		/usr/share/qt4/mkspecs/features/yacc.prf \
++		/usr/share/qt4/mkspecs/features/lex.prf \
++		qtemu.pro
++QMAKE_TARGET  = qtemu
++DESTDIR       = 
++TARGET        = qtemu
++
++first: all
++####### Implicit rules
++
++.SUFFIXES: .o .c .cpp .cc .cxx .C
++
++.cpp.o:
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
++
++.cc.o:
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
++
++.cxx.o:
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
++
++.C.o:
++	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
++
++.c.o:
++	$(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
++
<<Diff was trimmed, longer than 597 lines>>


More information about the pld-cvs-commit mailing list