TDE
/
kdiff3
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kdiff3
0
0
Fork 0
Code Issues Releases Wiki Activity

Finished up previous commit.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/3/head
gregory guy 4 years ago committed by Michele Calgaro
parent e14732aa76
commit bddb43436c
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
3 changed files with 0 additions and 483 deletions
Show Stats Download Patch File Download Diff File

425
src/Makefile.qt
Unescape View File

@ -1,425 +0,0 @@
#############################################################################
# Makefile for building: kdiff3
# Generated by qmake (1.07a) (Qt 3.3.5) on: Sat Apr 8 20:11:51 2006
# Project: kdiff3.pro
# Template: app
# Command: $(QMAKE) -o Makefile kdiff3.pro
#############################################################################
####### Compiler, tools and options
CC = gcc
CXX = g++
LEX = flex
YACC = yacc
CFLAGS = -pipe -O2 -Wall -W -fPIC -D_REENTRANT -DTQT_NO_DEBUG -DTQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT -D__USE_STD_IOSTREAM
CXXFLAGS = -pipe -O2 -Wall -W -fPIC -D_REENTRANT -DTQT_NO_DEBUG -DTQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT -D__USE_STD_IOSTREAM
LEXFLAGS =
YACCFLAGS= -d
INCPATH = -I$(TQTDIR)/mkspecs/default -I. -Ikreplacements -I/usr/include -I$(TQTDIR)/include
LINK = g++
LFLAGS =
LIBS = $(SUBLIBS) -L/usr/lib/ -L$(TQTDIR)/lib/ -L/usr/X11R6/lib/ -lXext -lX11 -lm -lpthread
AR = ar cqs
RANLIB =
MOC = $(TQTDIR)/bin/moc
UIC = $(TQTDIR)/bin/uic
QMAKE = qmake
TAR = tar -cf
GZIP = gzip -9f
COPY = cp -f
COPY_FILE= $(COPY)
COPY_DIR = $(COPY) -r
INSTALL_FILE= $(COPY_FILE)
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
####### Output directory
OBJECTS_DIR = ./
####### Files
HEADERS = version.h \
diff.h \
difftextwindow.h \
mergeresultwindow.h \
kdiff3.h \
merger.h \
optiondialog.h \
kreplacements/kreplacements.h \
directorymergewindow.h \
fileaccess.h \
kdiff3_shell.h \
kdiff3_part.h \
smalldialogs.h
SOURCES = main.cpp \
diff.cpp \
difftextwindow.cpp \
kdiff3.cpp \
merger.cpp \
mergeresultwindow.cpp \
optiondialog.cpp \
pdiff.cpp \
directorymergewindow.cpp \
fileaccess.cpp \
smalldialogs.cpp \
kdiff3_shell.cpp \
kdiff3_part.cpp \
gnudiff_analyze.cpp \
gnudiff_io.cpp \
gnudiff_xmalloc.cpp \
common.cpp \
kreplacements/kreplacements.cpp \
kreplacements/ShellContextMenu.cpp
OBJECTS = main.o \
diff.o \
difftextwindow.o \
kdiff3.o \
merger.o \
mergeresultwindow.o \
optiondialog.o \
pdiff.o \
directorymergewindow.o \
fileaccess.o \
smalldialogs.o \
kdiff3_shell.o \
kdiff3_part.o \
gnudiff_analyze.o \
gnudiff_io.o \
gnudiff_xmalloc.o \
common.o \
kreplacements.o \
ShellContextMenu.o
FORMS =
UICDECLS =
UICIMPLS =
SRCMOC = moc_difftextwindow.cpp \
moc_mergeresultwindow.cpp \
moc_kdiff3.cpp \
moc_optiondialog.cpp \
kreplacements/moc_kreplacements.cpp \
moc_directorymergewindow.cpp \
moc_fileaccess.cpp \
moc_kdiff3_shell.cpp \
moc_kdiff3_part.cpp \
moc_smalldialogs.cpp
OBJMOC = moc_difftextwindow.o \
moc_mergeresultwindow.o \
moc_kdiff3.o \
moc_optiondialog.o \
moc_kreplacements.o \
moc_directorymergewindow.o \
moc_fileaccess.o \
moc_kdiff3_shell.o \
moc_kdiff3_part.o \
moc_smalldialogs.o
DIST = kdiff3.pro
QMAKE_TARGET = kdiff3
DESTDIR =
TARGET = kdiff3
first: all
####### Implicit rules
.SUFFIXES: .c .o .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: $(TARGET)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(OBJCOMP) $(LIBS)
mocables: $(SRCMOC)
uicables: $(UICDECLS) $(UICIMPLS)
$(MOC):
( cd $(TQTDIR)/src/moc && $(MAKE) )
dist:
@mkdir -p .tmp/kdiff3 && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) .tmp/kdiff3/ && ( cd `dirname .tmp/kdiff3` && $(TAR) kdiff3.tar kdiff3 && $(GZIP) kdiff3.tar ) && $(MOVE) `dirname .tmp/kdiff3`/kdiff3.tar.gz . && $(DEL_FILE) -r .tmp/kdiff3
mocclean:
-$(DEL_FILE) $(OBJMOC)
-$(DEL_FILE) $(SRCMOC)
uiclean:
yaccclean:
lexclean:
clean: mocclean
-$(DEL_FILE) $(OBJECTS)
-$(DEL_FILE) *~ core *.core
####### Sub-libraries
distclean: clean
-$(DEL_FILE) $(TARGET) $(TARGET)
FORCE:
####### Compile
main.o: main.cpp kdiff3_shell.h \
version.h \
optiondialog.h \
common.h
diff.o: diff.cpp diff.h \
fileaccess.h \
optiondialog.h \
common.h
difftextwindow.o: difftextwindow.cpp difftextwindow.h \
merger.h \
optiondialog.h \
diff.h \
common.h \
fileaccess.h
kdiff3.o: kdiff3.cpp difftextwindow.h \
mergeresultwindow.h \
kdiff3.h \
optiondialog.h \
fileaccess.h \
kdiff3_part.h \
directorymergewindow.h \
smalldialogs.h \
xpm/downend.xpm \
xpm/currentpos.xpm \
xpm/down1arrow.xpm \
xpm/down2arrow.xpm \
xpm/upend.xpm \
xpm/up1arrow.xpm \
xpm/up2arrow.xpm \
xpm/prevunsolved.xpm \
xpm/nextunsolved.xpm \
xpm/iconA.xpm \
xpm/iconB.xpm \
xpm/iconC.xpm \
xpm/autoadvance.xpm \
xpm/showwhitespace.xpm \
xpm/showwhitespacechars.xpm \
xpm/showlinenumbers.xpm \
diff.h \
common.h
merger.o: merger.cpp merger.h \
diff.h \
common.h \
fileaccess.h \
optiondialog.h
mergeresultwindow.o: mergeresultwindow.cpp mergeresultwindow.h \
optiondialog.h \
diff.h \
common.h \
fileaccess.h
optiondialog.o: optiondialog.cpp optiondialog.h \
diff.h \
smalldialogs.h \
common.h \
fileaccess.h
pdiff.o: pdiff.cpp difftextwindow.h \
mergeresultwindow.h \
directorymergewindow.h \
smalldialogs.h \
kdiff3.h \
optiondialog.h \
fileaccess.h \
gnudiff_diff.h \
diff.h \
common.h \
gnudiff_system.h
directorymergewindow.o: directorymergewindow.cpp directorymergewindow.h \
optiondialog.h \
xpm/link_arrow.xpm \
xpm/file.xpm \
xpm/folder.xpm \
xpm/startmerge.xpm \
xpm/showequalfiles.xpm \
xpm/showfilesonlyina.xpm \
xpm/showfilesonlyinb.xpm \
xpm/showfilesonlyinc.xpm \
common.h \
fileaccess.h \
diff.h
fileaccess.o: fileaccess.cpp fileaccess.h \
optiondialog.h \
common.h
smalldialogs.o: smalldialogs.cpp smalldialogs.h \
optiondialog.h \
diff.h \
common.h \
fileaccess.h
kdiff3_shell.o: kdiff3_shell.cpp kdiff3_shell.h \
kdiff3.h \
diff.h \
common.h \
fileaccess.h \
optiondialog.h
kdiff3_part.o: kdiff3_part.cpp kdiff3_part.h \
kdiff3.h \
fileaccess.h \
version.h \
diff.h \
common.h \
optiondialog.h
gnudiff_analyze.o: gnudiff_analyze.cpp gnudiff_diff.h \
gnudiff_system.h
gnudiff_io.o: gnudiff_io.cpp gnudiff_diff.h \
gnudiff_system.h
gnudiff_xmalloc.o: gnudiff_xmalloc.cpp gnudiff_diff.h \
gnudiff_system.h
common.o: common.cpp common.h
kreplacements.o: kreplacements/kreplacements.cpp kreplacements/kreplacements.h \
common.h \
xpm/fileopen.xpm \
xpm/filesave.xpm \
xpm/fileprint.xpm \
kreplacements/kreplacements.moc
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o kreplacements.o kreplacements/kreplacements.cpp
ShellContextMenu.o: kreplacements/ShellContextMenu.cpp kreplacements/ShellContextMenu.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ShellContextMenu.o kreplacements/ShellContextMenu.cpp
moc_difftextwindow.o: moc_difftextwindow.cpp difftextwindow.h diff.h \
common.h \
fileaccess.h \
optiondialog.h
moc_mergeresultwindow.o: moc_mergeresultwindow.cpp mergeresultwindow.h diff.h \
common.h \
fileaccess.h \
optiondialog.h
moc_kdiff3.o: moc_kdiff3.cpp kdiff3.h diff.h \
common.h \
fileaccess.h \
optiondialog.h
moc_optiondialog.o: moc_optiondialog.cpp optiondialog.h
moc_kreplacements.o: kreplacements/moc_kreplacements.cpp kreplacements/kreplacements.h common.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_kreplacements.o kreplacements/moc_kreplacements.cpp
moc_directorymergewindow.o: moc_directorymergewindow.cpp directorymergewindow.h common.h \
fileaccess.h \
diff.h \
optiondialog.h
moc_fileaccess.o: moc_fileaccess.cpp fileaccess.h
moc_kdiff3_shell.o: moc_kdiff3_shell.cpp kdiff3_shell.h
moc_kdiff3_part.o: moc_kdiff3_part.cpp kdiff3_part.h
moc_smalldialogs.o: moc_smalldialogs.cpp smalldialogs.h diff.h \
common.h \
fileaccess.h \
optiondialog.h
moc_difftextwindow.cpp: $(MOC) difftextwindow.h
$(MOC) difftextwindow.h -o moc_difftextwindow.cpp
moc_mergeresultwindow.cpp: $(MOC) mergeresultwindow.h
$(MOC) mergeresultwindow.h -o moc_mergeresultwindow.cpp
moc_kdiff3.cpp: $(MOC) kdiff3.h
$(MOC) kdiff3.h -o moc_kdiff3.cpp
moc_optiondialog.cpp: $(MOC) optiondialog.h
$(MOC) optiondialog.h -o moc_optiondialog.cpp
kreplacements/moc_kreplacements.cpp: $(MOC) kreplacements/kreplacements.h
$(MOC) kreplacements/kreplacements.h -o kreplacements/moc_kreplacements.cpp
moc_directorymergewindow.cpp: $(MOC) directorymergewindow.h
$(MOC) directorymergewindow.h -o moc_directorymergewindow.cpp
moc_fileaccess.cpp: $(MOC) fileaccess.h
$(MOC) fileaccess.h -o moc_fileaccess.cpp
moc_kdiff3_shell.cpp: $(MOC) kdiff3_shell.h
$(MOC) kdiff3_shell.h -o moc_kdiff3_shell.cpp
moc_kdiff3_part.cpp: $(MOC) kdiff3_part.h
$(MOC) kdiff3_part.h -o moc_kdiff3_part.cpp
moc_smalldialogs.cpp: $(MOC) smalldialogs.h
$(MOC) smalldialogs.h -o moc_smalldialogs.cpp
####### Install
install_documentation: all
@$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/" || $(MKDIR) "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
-$(INSTALL_DIR) "../doc/da" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
-$(INSTALL_DIR) "../doc/de" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
-$(INSTALL_DIR) "../doc/en" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
-$(INSTALL_DIR) "../doc/et" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
-$(INSTALL_DIR) "../doc/fr" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
-$(INSTALL_DIR) "../doc/it" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
-$(INSTALL_DIR) "../doc/pt" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
-$(INSTALL_DIR) "../doc/sv" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
uninstall_documentation:
-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/da"
-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/de"
-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/en"
-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/et"
-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/fr"
-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/it"
-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/pt"
-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/sv"
-$(DEL_DIR) "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
install_target: all
@$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/local/bin/" || $(MKDIR) "$(INSTALL_ROOT)/usr/local/bin/"
-$(INSTALL_FILE) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
uninstall_target:
-$(DEL_FILE) "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
-$(DEL_DIR) "$(INSTALL_ROOT)/usr/local/bin/"
install: install_documentation install_target
uninstall: uninstall_documentation uninstall_target

57
src/kdiff3.pro
Unescape View File

@ -1,57 +0,0 @@
TEMPLATE = app
# When unresolved items remain during linking: Try adding "shared" in the CONFIG.
CONFIG += qt warn_on thread release
HEADERS = version.h \
diff.h \
difftextwindow.h \
mergeresultwindow.h \
kdiff3.h \
merger.h \
optiondialog.h \
kreplacements/kreplacements.h \
directorymergewindow.h \
fileaccess.h \
kdiff3_shell.h \
kdiff3_part.h \
smalldialogs.h
SOURCES = main.cpp \
diff.cpp \
difftextwindow.cpp \
kdiff3.cpp \
merger.cpp \
mergeresultwindow.cpp \
optiondialog.cpp \
pdiff.cpp \
directorymergewindow.cpp \
fileaccess.cpp \
smalldialogs.cpp \
kdiff3_shell.cpp \
kdiff3_part.cpp \
gnudiff_analyze.cpp \
gnudiff_io.cpp \
gnudiff_xmalloc.cpp \
common.cpp \
kreplacements/kreplacements.cpp \
kreplacements/ShellContextMenu.cpp
TARGET = kdiff3
INCLUDEPATH += . ./kreplacements
win32 {
# QMAKE_CXXFLAGS_DEBUG -= -Zi
# QMAKE_CXXFLAGS_DEBUG += -GX -GR -Z7 /FR -DTQT_NO_ASCII_CAST
# QMAKE_LFLAGS_DEBUG += /PDB:NONE
# QMAKE_CXXFLAGS_RELEASE += -GX -GR -DNDEBUG -DTQT_NO_ASCII_CAST
QMAKE_CXXFLAGS_DEBUG += -DTQT_NO_ASCII_CAST
QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -DTQT_NO_ASCII_CAST
RC_FILE = kdiff3.rc
}
unix {
documentation.path = /usr/local/share/doc/kdiff3
documentation.files = ../doc/*
INSTALLS += documentation
target.path = /usr/local/bin
INSTALLS += target
}

1
src/kdiff3_meta_unload.cpp
Unescape View File

@ -1 +0,0 @@
Write Preview
Loading…
Cancel
Save