The unified diff between revisions [bcafac38..] and [0e41c850..] is displayed below. It can also be downloaded as a raw diff.
#
#
# patch "src/Makefile"
# from [7ad45c09e822f11895044c8cf3c4ecbd2f677b5b]
# to [9d64440f973c20ff9d4c66949e5fdb968a08f4bf]
#
# patch "src/Makefile.qmake"
# from [afa6231512dd7b3b4293ca1f7f43868fc283f9a1]
# to [c32bd6a5b6ba0da37921a1dc1cfcbf74005d1909]
#
# patch "src/xxdiff.pro"
# from [af49a7c1780a5c17b172bb8d2f54413bbfdc74e9]
# to [889dfba7427270ac9bea3ea4406ff356f32d8153]
#
============================================================
--- src/Makefile 7ad45c09e822f11895044c8cf3c4ecbd2f677b5b
+++ src/Makefile 9d64440f973c20ff9d4c66949e5fdb968a08f4bf
@@ -1,9 +1,9 @@
#############################################################################
# Makefile for building: ../bin/xxdiff.app/Contents/MacOS/xxdiff
-# Generated by qmake (2.00a) (Qt 4.1.3) on: Sat Jul 15 16:05:39 2006
+# Generated by qmake (2.00a) (Qt 4.1.3) on: Sat Jul 15 23:15:36 2006
# Project: xxdiff.pro
# Template: app
-# Command: /usr/local/Trolltech/Qt-4.1.3/bin/qmake -macx -o Makefile.qmake xxdiff.pro
+# Command: /usr/local/Trolltech/Qt-4.1.3-static/bin/qmake -macx "CONFIG+=mystaticconfig" -o Makefile.qmake xxdiff.pro
#############################################################################
####### Compiler, tools and options
@@ -12,18 +12,18 @@ YACC = /opt/local/bin/bison
CXX = c++
LEX = /opt/local/bin/flex
YACC = /opt/local/bin/bison
-DEFINES = -DQT_QT3SUPPORT_LIB -DQT3_SUPPORT -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS = -pipe -DXX_DEBUG -g -Wall -W -F/usr/local/Trolltech/Qt-4.1.3/lib $(DEFINES)
-CXXFLAGS = -pipe -DXX_DEBUG -g -Wall -W -F/usr/local/Trolltech/Qt-4.1.3/lib $(DEFINES)
+DEFINES = -DQT_QT3SUPPORT_LIB -DQT3_SUPPORT -DQT_GUI_LIB -DQT_CORE_LIB
+CFLAGS = -pipe -DXX_DEBUG -g -Wall -W $(DEFINES) -arch i386 -arch ppc
+CXXFLAGS = -pipe -DXX_DEBUG -g -Wall -W $(DEFINES) -arch i386 -arch ppc
LEXFLAGS =
YACCFLAGS = -d -o y.tab.c
-INCPATH = -I/usr/local/Trolltech/Qt-4.1.3/mkspecs/macx-g++ -I. -I/usr/local/Trolltech/Qt-4.1.3/lib/QtCore.framework/Versions/4.0/Headers -I/usr/local/Trolltech/Qt-4.1.3/lib/QtGui.framework/Versions/4.0/Headers -I/usr/local/Trolltech/Qt-4.1.3/lib/Qt3Support.framework/Versions/4.0/Headers -I/usr/local/Trolltech/Qt-4.1.3/include -I. -I.
+INCPATH = -I/usr/local/Trolltech/Qt-4.1.3/mkspecs/macx-g++ -I. -I/usr/local/Trolltech/Qt-4.1.3-static/include/QtCore -I/usr/local/Trolltech/Qt-4.1.3-static/include/QtGui -I/usr/local/Trolltech/Qt-4.1.3-static/include/Qt3Support -I/usr/local/Trolltech/Qt-4.1.3-static/include -I. -I.
LINK = c++
-LFLAGS = -headerpad_max_install_names
-LIBS = $(SUBLIBS) -F/usr/local/Trolltech/Qt-4.1.3/lib -L/usr/local/Trolltech/Qt-4.1.3/lib -framework Qt3Support -F/Users/matt/Desktop/qt-mac-opensource-src-4.1.3/lib -L/Users/matt/Desktop/qt-mac-opensource-src-4.1.3/lib -framework QtSql -framework QtXml -framework QtNetwork -framework QtGui -framework Carbon -framework QuickTime -framework QtCore -lz -lm -framework ApplicationServices
+LFLAGS = -headerpad_max_install_names -arch i386 -arch ppc
+LIBS = $(SUBLIBS) -L/usr/local/Trolltech/Qt-4.1.3-static/lib -lz -framework Carbon -lQt3Support -lQtGui -lQtCore -lQtNetwork
AR = ar cq
RANLIB = ranlib -s
-QMAKE = /usr/local/Trolltech/Qt-4.1.3/bin/qmake
+QMAKE = /usr/local/Trolltech/Qt-4.1.3-static/bin/qmake
TAR = tar -cf
COMPRESS = gzip -9f
COPY = cp -f
@@ -147,7 +147,7 @@ OBJECTS = optionsDialog.o \
moc_searchDialogBase.o \
resParser_lex.o \
resParser_yacc.o
-DIST = /usr/local/Trolltech/Qt-4.1.3/mkspecs/qconfig.pri \
+DIST = /usr/local/Trolltech/Qt-4.1.3-static/mkspecs/qconfig.pri \
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/qt_config.prf \
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/exclusive_builds.prf \
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/default_pre.prf \
@@ -194,7 +194,7 @@ $(TARGET): $(OBJECTS)
@$(CHK_DIR_EXISTS) "../bin/xxdiff.app/Contents/MacOS/" || $(MKDIR) "../bin/xxdiff.app/Contents/MacOS/"
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
-Makefile.qmake: xxdiff.pro /usr/local/Trolltech/Qt-4.1.3/mkspecs/macx-g++/qmake.conf /usr/local/Trolltech/Qt-4.1.3/mkspecs/qconfig.pri \
+Makefile.qmake: xxdiff.pro /usr/local/Trolltech/Qt-4.1.3/mkspecs/macx-g++/qmake.conf /usr/local/Trolltech/Qt-4.1.3-static/mkspecs/qconfig.pri \
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/qt_config.prf \
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/exclusive_builds.prf \
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/default_pre.prf \
@@ -207,15 +207,9 @@ Makefile.qmake: xxdiff.pro /usr/local/T
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/moc.prf \
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/mac/sdk.prf \
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/resources.prf \
- /usr/local/Trolltech/Qt-4.1.3/mkspecs/features/uic.prf \
- /usr/local/Trolltech/Qt-4.1.3/lib/Qt3Support.framework/Qt3Support.prl \
- /usr/local/Trolltech/Qt-4.1.3/lib/QtSql.framework/QtSql.prl \
- /usr/local/Trolltech/Qt-4.1.3/lib/QtCore.framework/QtCore.prl \
- /usr/local/Trolltech/Qt-4.1.3/lib/QtXml.framework/QtXml.prl \
- /usr/local/Trolltech/Qt-4.1.3/lib/QtGui.framework/QtGui.prl \
- /usr/local/Trolltech/Qt-4.1.3/lib/QtNetwork.framework/QtNetwork.prl
- $(QMAKE) -macx -o Makefile.qmake xxdiff.pro
-/usr/local/Trolltech/Qt-4.1.3/mkspecs/qconfig.pri:
+ /usr/local/Trolltech/Qt-4.1.3/mkspecs/features/uic.prf
+ $(QMAKE) -macx "CONFIG+=mystaticconfig" -o Makefile.qmake xxdiff.pro
+/usr/local/Trolltech/Qt-4.1.3-static/mkspecs/qconfig.pri:
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/qt_config.prf:
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/exclusive_builds.prf:
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/default_pre.prf:
@@ -229,14 +223,8 @@ Makefile.qmake: xxdiff.pro /usr/local/T
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/mac/sdk.prf:
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/resources.prf:
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/uic.prf:
-/usr/local/Trolltech/Qt-4.1.3/lib/Qt3Support.framework/Qt3Support.prl:
-/usr/local/Trolltech/Qt-4.1.3/lib/QtSql.framework/QtSql.prl:
-/usr/local/Trolltech/Qt-4.1.3/lib/QtCore.framework/QtCore.prl:
-/usr/local/Trolltech/Qt-4.1.3/lib/QtXml.framework/QtXml.prl:
-/usr/local/Trolltech/Qt-4.1.3/lib/QtGui.framework/QtGui.prl:
-/usr/local/Trolltech/Qt-4.1.3/lib/QtNetwork.framework/QtNetwork.prl:
qmake: FORCE
- @$(QMAKE) -macx -o Makefile.qmake xxdiff.pro
+ @$(QMAKE) -macx "CONFIG+=mystaticconfig" -o Makefile.qmake xxdiff.pro
../bin/xxdiff.app/Contents/PkgInfo:
@$(CHK_DIR_EXISTS) "../bin/xxdiff.app/Contents" || $(MKDIR) "../bin/xxdiff.app/Contents"
@@ -267,7 +255,7 @@ distclean: clean
-$(DEL_FILE) Makefile.qmake
-/usr/local/Trolltech/Qt-4.1.3/bin/moc:
+/usr/local/Trolltech/Qt-4.1.3-static/bin/moc:
(cd "$(QTDIR)/src/tools/moc" && $(MAKE))
mocclean: compiler_moc_header_clean compiler_moc_source_clean
@@ -285,8 +273,8 @@ moc_optionsDialog.cpp: defs.h \
resources.inline.h \
optionsDialogBase.h \
optionsDialog.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ optionsDialog.h -o moc_optionsDialog.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ optionsDialog.h -o moc_optionsDialog.cpp
moc_searchDialog.cpp: defs.h \
compiler.h \
@@ -296,8 +284,8 @@ moc_searchDialog.cpp: defs.h \
resources.inline.h \
searchDialogBase.h \
searchDialog.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ searchDialog.h -o moc_searchDialog.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ searchDialog.h -o moc_searchDialog.cpp
moc_app.cpp: defs.h \
compiler.h \
@@ -318,8 +306,8 @@ moc_app.cpp: defs.h \
central.h \
scrollView.h \
app.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ app.h -o moc_app.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ app.h -o moc_app.cpp
moc_diffs.cpp: line.h \
defs.h \
@@ -332,8 +320,8 @@ moc_diffs.cpp: line.h \
line.inline.h \
diffs.inline.h \
diffs.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ diffs.h -o moc_diffs.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ diffs.h -o moc_diffs.cpp
moc_resources.cpp: defs.h \
compiler.h \
@@ -341,16 +329,16 @@ moc_resources.cpp: defs.h \
winfixes/winfixes.h \
resources.inline.h \
resources.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ resources.h -o moc_resources.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ resources.h -o moc_resources.cpp
moc_copyLabel.cpp: defs.h \
compiler.h \
exceptions.h \
winfixes/winfixes.h \
copyLabel.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ copyLabel.h -o moc_copyLabel.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ copyLabel.h -o moc_copyLabel.cpp
moc_text.cpp: defs.h \
compiler.h \
@@ -358,8 +346,8 @@ moc_text.cpp: defs.h \
winfixes/winfixes.h \
types.h \
text.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ text.h -o moc_text.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ text.h -o moc_text.cpp
moc_scrollView.cpp: defs.h \
compiler.h \
@@ -367,8 +355,8 @@ moc_scrollView.cpp: defs.h \
winfixes/winfixes.h \
types.h \
scrollView.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ scrollView.h -o moc_scrollView.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ scrollView.h -o moc_scrollView.cpp
moc_central.cpp: defs.h \
compiler.h \
@@ -377,8 +365,8 @@ moc_central.cpp: defs.h \
types.h \
scrollView.h \
central.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ central.h -o moc_central.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ central.h -o moc_central.cpp
moc_merged.cpp: defs.h \
compiler.h \
@@ -388,8 +376,8 @@ moc_merged.cpp: defs.h \
scrollView.h \
kdeSupport.h \
merged.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ merged.h -o moc_merged.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ merged.h -o moc_merged.cpp
moc_markers.cpp: defs.h \
compiler.h \
@@ -397,8 +385,8 @@ moc_markers.cpp: defs.h \
winfixes/winfixes.h \
markersWidgetBase.h \
markers.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ markers.h -o moc_markers.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ markers.h -o moc_markers.cpp
compiler_rcc_make_all:
compiler_rcc_clean:
@@ -413,43 +401,43 @@ markersWidgetBase.h: markersWidgetBase.u
compiler_uic3_decl_clean:
-$(DEL_FILE) markersWidgetBase.h optionsDialogBase.h searchDialogBase.h
markersWidgetBase.h: markersWidgetBase.ui
- /usr/local/Trolltech/Qt-4.1.3/bin/uic3 markersWidgetBase.ui -o markersWidgetBase.h
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/uic3 markersWidgetBase.ui -o markersWidgetBase.h
optionsDialogBase.h: optionsDialogBase.ui
- /usr/local/Trolltech/Qt-4.1.3/bin/uic3 optionsDialogBase.ui -o optionsDialogBase.h
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/uic3 optionsDialogBase.ui -o optionsDialogBase.h
searchDialogBase.h: searchDialogBase.ui
- /usr/local/Trolltech/Qt-4.1.3/bin/uic3 searchDialogBase.ui -o searchDialogBase.h
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/uic3 searchDialogBase.ui -o searchDialogBase.h
compiler_uic3_impl_make_all: markersWidgetBase.cpp optionsDialogBase.cpp searchDialogBase.cpp
compiler_uic3_impl_clean:
-$(DEL_FILE) markersWidgetBase.cpp optionsDialogBase.cpp searchDialogBase.cpp
markersWidgetBase.cpp: markersWidgetBase.ui \
markersWidgetBase.h
- /usr/local/Trolltech/Qt-4.1.3/bin/uic3 -impl markersWidgetBase.h markersWidgetBase.ui -o markersWidgetBase.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/uic3 -impl markersWidgetBase.h markersWidgetBase.ui -o markersWidgetBase.cpp
optionsDialogBase.cpp: optionsDialogBase.ui \
optionsDialogBase.h
- /usr/local/Trolltech/Qt-4.1.3/bin/uic3 -impl optionsDialogBase.h optionsDialogBase.ui -o optionsDialogBase.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/uic3 -impl optionsDialogBase.h optionsDialogBase.ui -o optionsDialogBase.cpp
searchDialogBase.cpp: searchDialogBase.ui \
searchDialogBase.h
- /usr/local/Trolltech/Qt-4.1.3/bin/uic3 -impl searchDialogBase.h searchDialogBase.ui -o searchDialogBase.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/uic3 -impl searchDialogBase.h searchDialogBase.ui -o searchDialogBase.cpp
compiler_uic3_moc_make_all: moc_markersWidgetBase.cpp moc_optionsDialogBase.cpp moc_searchDialogBase.cpp
compiler_uic3_moc_clean:
-$(DEL_FILE) moc_markersWidgetBase.cpp moc_optionsDialogBase.cpp moc_searchDialogBase.cpp
moc_markersWidgetBase.cpp: markersWidgetBase.h \
markersWidgetBase.h
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ markersWidgetBase.h -o moc_markersWidgetBase.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ markersWidgetBase.h -o moc_markersWidgetBase.cpp
moc_optionsDialogBase.cpp: optionsDialogBase.h \
optionsDialogBase.h
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ optionsDialogBase.h -o moc_optionsDialogBase.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ optionsDialogBase.h -o moc_optionsDialogBase.cpp
moc_searchDialogBase.cpp: searchDialogBase.h \
searchDialogBase.h
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ searchDialogBase.h -o moc_searchDialogBase.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ searchDialogBase.h -o moc_searchDialogBase.cpp
compiler_clean: compiler_moc_header_clean compiler_rcc_clean compiler_image_collection_clean compiler_moc_source_clean compiler_uic_clean compiler_uic3_decl_clean compiler_uic3_impl_clean compiler_uic3_moc_clean
@@ -957,6 +945,7 @@ resParser.o: resParser.cpp defs.h \
util.h \
help.h \
resParser_yacc.h \
+ resParser_lex.h \
kdeSupport.h
markers.o: markers.cpp markers.h \
============================================================
--- src/Makefile.qmake afa6231512dd7b3b4293ca1f7f43868fc283f9a1
+++ src/Makefile.qmake c32bd6a5b6ba0da37921a1dc1cfcbf74005d1909
@@ -1,9 +1,9 @@
#############################################################################
# Makefile for building: ../bin/xxdiff.app/Contents/MacOS/xxdiff
-# Generated by qmake (2.00a) (Qt 4.1.3) on: Sat Jul 15 16:05:39 2006
+# Generated by qmake (2.00a) (Qt 4.1.3) on: Sat Jul 15 23:15:36 2006
# Project: xxdiff.pro
# Template: app
-# Command: /usr/local/Trolltech/Qt-4.1.3/bin/qmake -macx -o Makefile.qmake xxdiff.pro
+# Command: /usr/local/Trolltech/Qt-4.1.3-static/bin/qmake -macx "CONFIG+=mystaticconfig" -o Makefile.qmake xxdiff.pro
#############################################################################
####### Compiler, tools and options
@@ -12,18 +12,18 @@ YACC = bison
CXX = c++
LEX = flex
YACC = bison
-DEFINES = -DQT_QT3SUPPORT_LIB -DQT3_SUPPORT -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS = -pipe -DXX_DEBUG -g -Wall -W -F/usr/local/Trolltech/Qt-4.1.3/lib $(DEFINES)
-CXXFLAGS = -pipe -DXX_DEBUG -g -Wall -W -F/usr/local/Trolltech/Qt-4.1.3/lib $(DEFINES)
+DEFINES = -DQT_QT3SUPPORT_LIB -DQT3_SUPPORT -DQT_GUI_LIB -DQT_CORE_LIB
+CFLAGS = -pipe -DXX_DEBUG -g -Wall -W $(DEFINES)
+CXXFLAGS = -pipe -DXX_DEBUG -g -Wall -W $(DEFINES)
LEXFLAGS =
YACCFLAGS = -d -o y.tab.c
-INCPATH = -I/usr/local/Trolltech/Qt-4.1.3/mkspecs/macx-g++ -I. -I/usr/local/Trolltech/Qt-4.1.3/lib/QtCore.framework/Versions/4.0/Headers -I/usr/local/Trolltech/Qt-4.1.3/lib/QtGui.framework/Versions/4.0/Headers -I/usr/local/Trolltech/Qt-4.1.3/lib/Qt3Support.framework/Versions/4.0/Headers -I/usr/local/Trolltech/Qt-4.1.3/include -I. -I.
+INCPATH = -I/usr/local/Trolltech/Qt-4.1.3/mkspecs/macx-g++ -I. -I/usr/local/Trolltech/Qt-4.1.3-static/include/QtCore -I/usr/local/Trolltech/Qt-4.1.3-static/include/QtGui -I/usr/local/Trolltech/Qt-4.1.3-static/include/Qt3Support -I/usr/local/Trolltech/Qt-4.1.3-static/include -I. -I.
LINK = c++
LFLAGS = -headerpad_max_install_names
-LIBS = $(SUBLIBS) -F/usr/local/Trolltech/Qt-4.1.3/lib -L/usr/local/Trolltech/Qt-4.1.3/lib -framework Qt3Support -F/Users/matt/Desktop/qt-mac-opensource-src-4.1.3/lib -L/Users/matt/Desktop/qt-mac-opensource-src-4.1.3/lib -framework QtSql -framework QtXml -framework QtNetwork -framework QtGui -framework Carbon -framework QuickTime -framework QtCore -lz -lm -framework ApplicationServices
+LIBS = $(SUBLIBS) -L/usr/local/Trolltech/Qt-4.1.3-static/lib $(QTDIR)/lib/libqt.a -lz -framework Carbon -lQt3Support_debug -lQtGui_debug -lQtCore_debug
AR = ar cq
RANLIB = ranlib -s
-QMAKE = /usr/local/Trolltech/Qt-4.1.3/bin/qmake
+QMAKE = /usr/local/Trolltech/Qt-4.1.3-static/bin/qmake
TAR = tar -cf
COMPRESS = gzip -9f
COPY = cp -f
@@ -147,7 +147,7 @@ OBJECTS = optionsDialog.o \
moc_searchDialogBase.o \
resParser_lex.o \
resParser_yacc.o
-DIST = /usr/local/Trolltech/Qt-4.1.3/mkspecs/qconfig.pri \
+DIST = /usr/local/Trolltech/Qt-4.1.3-static/mkspecs/qconfig.pri \
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/qt_config.prf \
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/exclusive_builds.prf \
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/default_pre.prf \
@@ -194,7 +194,7 @@ $(TARGET): $(OBJECTS)
@$(CHK_DIR_EXISTS) "../bin/xxdiff.app/Contents/MacOS/" || $(MKDIR) "../bin/xxdiff.app/Contents/MacOS/"
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
-Makefile.qmake: xxdiff.pro /usr/local/Trolltech/Qt-4.1.3/mkspecs/macx-g++/qmake.conf /usr/local/Trolltech/Qt-4.1.3/mkspecs/qconfig.pri \
+Makefile.qmake: xxdiff.pro /usr/local/Trolltech/Qt-4.1.3/mkspecs/macx-g++/qmake.conf /usr/local/Trolltech/Qt-4.1.3-static/mkspecs/qconfig.pri \
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/qt_config.prf \
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/exclusive_builds.prf \
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/default_pre.prf \
@@ -207,15 +207,9 @@ Makefile.qmake: xxdiff.pro /usr/local/T
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/moc.prf \
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/mac/sdk.prf \
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/resources.prf \
- /usr/local/Trolltech/Qt-4.1.3/mkspecs/features/uic.prf \
- /usr/local/Trolltech/Qt-4.1.3/lib/Qt3Support.framework/Qt3Support.prl \
- /usr/local/Trolltech/Qt-4.1.3/lib/QtSql.framework/QtSql.prl \
- /usr/local/Trolltech/Qt-4.1.3/lib/QtCore.framework/QtCore.prl \
- /usr/local/Trolltech/Qt-4.1.3/lib/QtXml.framework/QtXml.prl \
- /usr/local/Trolltech/Qt-4.1.3/lib/QtGui.framework/QtGui.prl \
- /usr/local/Trolltech/Qt-4.1.3/lib/QtNetwork.framework/QtNetwork.prl
- $(QMAKE) -macx -o Makefile.qmake xxdiff.pro
-/usr/local/Trolltech/Qt-4.1.3/mkspecs/qconfig.pri:
+ /usr/local/Trolltech/Qt-4.1.3/mkspecs/features/uic.prf
+ $(QMAKE) -macx "CONFIG+=mystaticconfig" -o Makefile.qmake xxdiff.pro
+/usr/local/Trolltech/Qt-4.1.3-static/mkspecs/qconfig.pri:
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/qt_config.prf:
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/exclusive_builds.prf:
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/default_pre.prf:
@@ -229,14 +223,8 @@ Makefile.qmake: xxdiff.pro /usr/local/T
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/mac/sdk.prf:
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/resources.prf:
/usr/local/Trolltech/Qt-4.1.3/mkspecs/features/uic.prf:
-/usr/local/Trolltech/Qt-4.1.3/lib/Qt3Support.framework/Qt3Support.prl:
-/usr/local/Trolltech/Qt-4.1.3/lib/QtSql.framework/QtSql.prl:
-/usr/local/Trolltech/Qt-4.1.3/lib/QtCore.framework/QtCore.prl:
-/usr/local/Trolltech/Qt-4.1.3/lib/QtXml.framework/QtXml.prl:
-/usr/local/Trolltech/Qt-4.1.3/lib/QtGui.framework/QtGui.prl:
-/usr/local/Trolltech/Qt-4.1.3/lib/QtNetwork.framework/QtNetwork.prl:
qmake: FORCE
- @$(QMAKE) -macx -o Makefile.qmake xxdiff.pro
+ @$(QMAKE) -macx "CONFIG+=mystaticconfig" -o Makefile.qmake xxdiff.pro
../bin/xxdiff.app/Contents/PkgInfo:
@$(CHK_DIR_EXISTS) "../bin/xxdiff.app/Contents" || $(MKDIR) "../bin/xxdiff.app/Contents"
@@ -267,7 +255,7 @@ distclean: clean
-$(DEL_FILE) Makefile.qmake
-/usr/local/Trolltech/Qt-4.1.3/bin/moc:
+/usr/local/Trolltech/Qt-4.1.3-static/bin/moc:
(cd "$(QTDIR)/src/tools/moc" && $(MAKE))
mocclean: compiler_moc_header_clean compiler_moc_source_clean
@@ -285,8 +273,8 @@ moc_optionsDialog.cpp: defs.h \
resources.inline.h \
optionsDialogBase.h \
optionsDialog.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ optionsDialog.h -o moc_optionsDialog.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ optionsDialog.h -o moc_optionsDialog.cpp
moc_searchDialog.cpp: defs.h \
compiler.h \
@@ -296,8 +284,8 @@ moc_searchDialog.cpp: defs.h \
resources.inline.h \
searchDialogBase.h \
searchDialog.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ searchDialog.h -o moc_searchDialog.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ searchDialog.h -o moc_searchDialog.cpp
moc_app.cpp: defs.h \
compiler.h \
@@ -318,8 +306,8 @@ moc_app.cpp: defs.h \
central.h \
scrollView.h \
app.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ app.h -o moc_app.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ app.h -o moc_app.cpp
moc_diffs.cpp: line.h \
defs.h \
@@ -332,8 +320,8 @@ moc_diffs.cpp: line.h \
line.inline.h \
diffs.inline.h \
diffs.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ diffs.h -o moc_diffs.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ diffs.h -o moc_diffs.cpp
moc_resources.cpp: defs.h \
compiler.h \
@@ -341,16 +329,16 @@ moc_resources.cpp: defs.h \
winfixes/winfixes.h \
resources.inline.h \
resources.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ resources.h -o moc_resources.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ resources.h -o moc_resources.cpp
moc_copyLabel.cpp: defs.h \
compiler.h \
exceptions.h \
winfixes/winfixes.h \
copyLabel.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ copyLabel.h -o moc_copyLabel.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ copyLabel.h -o moc_copyLabel.cpp
moc_text.cpp: defs.h \
compiler.h \
@@ -358,8 +346,8 @@ moc_text.cpp: defs.h \
winfixes/winfixes.h \
types.h \
text.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ text.h -o moc_text.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ text.h -o moc_text.cpp
moc_scrollView.cpp: defs.h \
compiler.h \
@@ -367,8 +355,8 @@ moc_scrollView.cpp: defs.h \
winfixes/winfixes.h \
types.h \
scrollView.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ scrollView.h -o moc_scrollView.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ scrollView.h -o moc_scrollView.cpp
moc_central.cpp: defs.h \
compiler.h \
@@ -377,8 +365,8 @@ moc_central.cpp: defs.h \
types.h \
scrollView.h \
central.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ central.h -o moc_central.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ central.h -o moc_central.cpp
moc_merged.cpp: defs.h \
compiler.h \
@@ -388,8 +376,8 @@ moc_merged.cpp: defs.h \
scrollView.h \
kdeSupport.h \
merged.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ merged.h -o moc_merged.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ merged.h -o moc_merged.cpp
moc_markers.cpp: defs.h \
compiler.h \
@@ -397,8 +385,8 @@ moc_markers.cpp: defs.h \
winfixes/winfixes.h \
markersWidgetBase.h \
markers.h \
- /usr/local/Trolltech/Qt-4.1.3/bin/moc
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ markers.h -o moc_markers.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ markers.h -o moc_markers.cpp
compiler_rcc_make_all:
compiler_rcc_clean:
@@ -413,43 +401,43 @@ markersWidgetBase.h: markersWidgetBase.u
compiler_uic3_decl_clean:
-$(DEL_FILE) markersWidgetBase.h optionsDialogBase.h searchDialogBase.h
markersWidgetBase.h: markersWidgetBase.ui
- /usr/local/Trolltech/Qt-4.1.3/bin/uic3 markersWidgetBase.ui -o markersWidgetBase.h
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/uic3 markersWidgetBase.ui -o markersWidgetBase.h
optionsDialogBase.h: optionsDialogBase.ui
- /usr/local/Trolltech/Qt-4.1.3/bin/uic3 optionsDialogBase.ui -o optionsDialogBase.h
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/uic3 optionsDialogBase.ui -o optionsDialogBase.h
searchDialogBase.h: searchDialogBase.ui
- /usr/local/Trolltech/Qt-4.1.3/bin/uic3 searchDialogBase.ui -o searchDialogBase.h
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/uic3 searchDialogBase.ui -o searchDialogBase.h
compiler_uic3_impl_make_all: markersWidgetBase.cpp optionsDialogBase.cpp searchDialogBase.cpp
compiler_uic3_impl_clean:
-$(DEL_FILE) markersWidgetBase.cpp optionsDialogBase.cpp searchDialogBase.cpp
markersWidgetBase.cpp: markersWidgetBase.ui \
markersWidgetBase.h
- /usr/local/Trolltech/Qt-4.1.3/bin/uic3 -impl markersWidgetBase.h markersWidgetBase.ui -o markersWidgetBase.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/uic3 -impl markersWidgetBase.h markersWidgetBase.ui -o markersWidgetBase.cpp
optionsDialogBase.cpp: optionsDialogBase.ui \
optionsDialogBase.h
- /usr/local/Trolltech/Qt-4.1.3/bin/uic3 -impl optionsDialogBase.h optionsDialogBase.ui -o optionsDialogBase.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/uic3 -impl optionsDialogBase.h optionsDialogBase.ui -o optionsDialogBase.cpp
searchDialogBase.cpp: searchDialogBase.ui \
searchDialogBase.h
- /usr/local/Trolltech/Qt-4.1.3/bin/uic3 -impl searchDialogBase.h searchDialogBase.ui -o searchDialogBase.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/uic3 -impl searchDialogBase.h searchDialogBase.ui -o searchDialogBase.cpp
compiler_uic3_moc_make_all: moc_markersWidgetBase.cpp moc_optionsDialogBase.cpp moc_searchDialogBase.cpp
compiler_uic3_moc_clean:
-$(DEL_FILE) moc_markersWidgetBase.cpp moc_optionsDialogBase.cpp moc_searchDialogBase.cpp
moc_markersWidgetBase.cpp: markersWidgetBase.h \
markersWidgetBase.h
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ markersWidgetBase.h -o moc_markersWidgetBase.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ markersWidgetBase.h -o moc_markersWidgetBase.cpp
moc_optionsDialogBase.cpp: optionsDialogBase.h \
optionsDialogBase.h
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ optionsDialogBase.h -o moc_optionsDialogBase.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ optionsDialogBase.h -o moc_optionsDialogBase.cpp
moc_searchDialogBase.cpp: searchDialogBase.h \
searchDialogBase.h
- /usr/local/Trolltech/Qt-4.1.3/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ searchDialogBase.h -o moc_searchDialogBase.cpp
+ /usr/local/Trolltech/Qt-4.1.3-static/bin/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ searchDialogBase.h -o moc_searchDialogBase.cpp
compiler_clean: compiler_moc_header_clean compiler_rcc_clean compiler_image_collection_clean compiler_moc_source_clean compiler_uic_clean compiler_uic3_decl_clean compiler_uic3_impl_clean compiler_uic3_moc_clean
@@ -957,6 +945,7 @@ resParser.o: resParser.cpp defs.h \
util.h \
help.h \
resParser_yacc.h \
+ resParser_lex.h \
kdeSupport.h
markers.o: markers.cpp markers.h \
============================================================
--- src/xxdiff.pro af49a7c1780a5c17b172bb8d2f54413bbfdc74e9
+++ src/xxdiff.pro 889dfba7427270ac9bea3ea4406ff356f32d8153
@@ -21,6 +21,12 @@
#****************************************************************************/
#
# Generate with xxdiff.t template, as `qmake -t xxdiff.t xxdiff.pro > Makefile'
+
+ mystaticconfig {
+ QMAKE_LIBS_QT =
+ QMAKE_LIBS_QT_THREAD =
+ LIBS += $(QTDIR)/lib/libqt.a -lz -framework Carbon
+ }
#
# Note: the version number is now in the VERSION file at the root and there is a