Commit e1baebac authored by Joachim Eibl's avatar Joachim Eibl

KDiff3 version 0.9.70


git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@11 c8aa9fed-2811-0410-8543-893ada326672
parent 687b9cc3
# set the include path for X, qt and KDE
INCLUDES = $(all_includes)
# these are the headers for your project
noinst_HEADERS = kdiff3_part.h kdiff3_shell.h \
kdiff3.h common.h diff.h directorymergewindow.h \
merger.h optiondialog.h fileaccess.h
# let automoc handle all of the meta source files (moc)
METASOURCES = AUTO
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kdiff3.pot
KDE_ICON = kdiff3
# this Makefile creates both a KPart application and a KPart
#########################################################################
# APPLICATION SECTION
#########################################################################
# this is the program that gets installed. it's name is used for all
# of the other Makefile.am variables
bin_PROGRAMS = kdiff3
# the application source, library search path, and link libraries
kdiff3_SOURCES = main.cpp kdiff3_shell.cpp
kdiff3_LDFLAGS = $(KDE_RPATH) $(all_libraries)
kdiff3_LDADD = $(LIB_KPARTS)
# this is where the desktop file will go
shelldesktopdir = $(kde_appsdir)/Development
shelldesktop_DATA = kdiff3.desktop
# this is where the shell's XML-GUI resource file goes
shellrcdir = $(kde_datadir)/kdiff3
shellrc_DATA = kdiff3_shell.rc
#########################################################################
# KPART SECTION
#########################################################################
kde_module_LTLIBRARIES = libkdiff3part.la
# the Part's source, library search path, and link libraries
libkdiff3part_la_SOURCES = kdiff3_part.cpp kdiff3.cpp directorymergewindow.cpp \
merger.cpp pdiff.cpp difftextwindow.cpp diff.cpp \
optiondialog.cpp mergeresultwindow.cpp fileaccess.cpp
libkdiff3part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
libkdiff3part_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE)
# this is where the desktop file will go
partdesktopdir = $(kde_servicesdir)
partdesktop_DATA = kdiff3part.desktop
# this is where the part's XML-GUI resource file goes
partrcdir = $(kde_datadir)/kdiff3part
partrc_DATA = kdiff3_part.rc
#############################################################################
# Makefile for building: kdiff3
# Generated by qmake (1.05a) (Qt 3.1.2-snapshot-20030618) on: Thu Oct 2 22:13:20 2003
# 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 -march=i586 -mcpu=i686 -fmessage-length=0 -fPIC -DNO_DEBUG -Wall -W -O2 -march=i586 -mcpu=i686 -fmessage-length=0 -fPIC -DNO_DEBUG -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
CXXFLAGS = -pipe -O2 -march=i586 -mcpu=i686 -fmessage-length=0 -fPIC -DNO_DEBUG -Wall -W -O2 -march=i586 -mcpu=i686 -fmessage-length=0 -fPIC -DNO_DEBUG -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
LEXFLAGS =
YACCFLAGS= -d
INCPATH = -I$(QTDIR)/mkspecs/default -I. -Ikreplacements -I/usr/include -I$(QTDIR)/include
LINK = g++
LFLAGS =
LIBS = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ -lqt-mt -lXext -lX11 -lm -lpthread
AR = ar cqs
RANLIB =
MOC = $(QTDIR)/bin/moc
UIC = $(QTDIR)/bin/uic
QMAKE = qmake
TAR = tar -cf
GZIP = gzip -9f
COPY = cp -f
COPY_FILE= $(COPY) -p
COPY_DIR = $(COPY) -pR
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 = diff.h \
kdiff3.h \
merger.h \
optiondialog.h \
kreplacements/kreplacements.h \
directorymergewindow.h \
fileaccess.h \
kdiff3_shell.h \
kdiff3_part.h
SOURCES = diff.cpp \
difftextwindow.cpp \
kdiff3.cpp \
main.cpp \
merger.cpp \
mergeresultwindow.cpp \
optiondialog.cpp \
pdiff.cpp \
directorymergewindow.cpp \
fileaccess.cpp \
kdiff3_shell.cpp \
kdiff3_part.cpp \
kreplacements/kreplacements.cpp
OBJECTS = diff.o \
difftextwindow.o \
kdiff3.o \
main.o \
merger.o \
mergeresultwindow.o \
optiondialog.o \
pdiff.o \
directorymergewindow.o \
fileaccess.o \
kdiff3_shell.o \
kdiff3_part.o \
kreplacements.o
FORMS =
UICDECLS =
UICIMPLS =
SRCMOC = moc_diff.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
OBJMOC = moc_diff.o \
moc_kdiff3.o \
moc_optiondialog.o \
moc_kreplacements.o \
moc_directorymergewindow.o \
moc_fileaccess.o \
moc_kdiff3_shell.o \
moc_kdiff3_part.o
DIST = kdiff3.pro
QMAKE_TARGET = kdiff3
DESTDIR =
TARGET = kdiff3
first: all
####### Implicit rules
.SUFFIXES: .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: $(TARGET)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
mocables: $(SRCMOC)
$(MOC):
( cd $(QTDIR)/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
diff.o: diff.cpp diff.h \
fileaccess.h \
common.h
difftextwindow.o: difftextwindow.cpp diff.h \
merger.h \
optiondialog.h \
common.h \
fileaccess.h
kdiff3.o: kdiff3.cpp diff.h \
kdiff3.h \
optiondialog.h \
fileaccess.h \
kdiff3_part.h \
directorymergewindow.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/showlinenumbers.xpm \
xpm/startmerge.xpm \
common.h
main.o: main.cpp kdiff3_shell.h
merger.o: merger.cpp merger.h \
diff.h \
common.h \
fileaccess.h
mergeresultwindow.o: mergeresultwindow.cpp diff.h \
optiondialog.h \
common.h \
fileaccess.h
optiondialog.o: optiondialog.cpp optiondialog.h \
diff.h \
common.h \
fileaccess.h
pdiff.o: pdiff.cpp diff.h \
directorymergewindow.h \
kdiff3.h \
optiondialog.h \
fileaccess.h \
common.h
directorymergewindow.o: directorymergewindow.cpp directorymergewindow.h \
optiondialog.h \
common.h \
fileaccess.h
fileaccess.o: fileaccess.cpp fileaccess.h \
optiondialog.h \
common.h
kdiff3_shell.o: kdiff3_shell.cpp kdiff3_shell.h \
kdiff3.h \
diff.h \
common.h \
fileaccess.h
kdiff3_part.o: kdiff3_part.cpp kdiff3_part.h \
kdiff3.h \
fileaccess.h \
diff.h \
common.h
kreplacements.o: kreplacements/kreplacements.cpp kreplacements/kreplacements.h \
kreplacements/kreplacements.moc
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o kreplacements.o kreplacements/kreplacements.cpp
moc_diff.o: moc_diff.cpp diff.h common.h \
fileaccess.h
moc_kdiff3.o: moc_kdiff3.cpp kdiff3.h diff.h \
common.h \
fileaccess.h
moc_optiondialog.o: moc_optiondialog.cpp optiondialog.h
moc_kreplacements.o: kreplacements/moc_kreplacements.cpp kreplacements/kreplacements.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
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_diff.cpp: $(MOC) diff.h
$(MOC) diff.h -o moc_diff.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
####### Install
install_documentation:
@$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/" || $(MKDIR) "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
-$(COPY_DIR) "../doc/en" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3"
uninstall_documentation:
-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/en"
-$(DEL_DIR) "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
install_target:
@$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/local/bin/" || $(MKDIR) "$(INSTALL_ROOT)/usr/local/bin/"
-$(COPY) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
-strip "$(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: all install_documentation install_target
uninstall: uninstall_documentation uninstall_target
#############################################################################
# Makefile for building kdiff3
# Generated by tmake at 22:40, 2003/10/01
# Project: kdiff3_tmake
# Template: app
#############################################################################
####### Compiler, tools and options
CC = cl
CXX = cl
CFLAGS = -nologo -W3 -MD -O1 -DQT_DLL -DQT_THREAD_SUPPORT -DNO_DEBUG -GX -GR
CXXFLAGS= -nologo -W3 -MD -O1 -DQT_DLL -DQT_THREAD_SUPPORT -DNO_DEBUG -GX -GR
INCPATH = -I"." -I".\kreplacements" -I"$(QTDIR)\include"
LINK = link
LFLAGS = /NOLOGO /SUBSYSTEM:windows
LIBS = $(QTDIR)\lib\qt-mt230nc.lib $(QTDIR)\lib\qtmain.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib kdiff3.res
MOC = $(QTDIR)\bin\moc
UIC = uic
ZIP = zip -r -9
####### Files
HEADERS = diff.h \
kdiff3.h \
merger.h \
optiondialog.h \
kreplacements\kreplacements.h \
directorymergewindow.h \
fileaccess.h \
kdiff3_shell.h \
kdiff3_part.h
SOURCES = diff.cpp \
difftextwindow.cpp \
kdiff3.cpp \
main.cpp \
merger.cpp \
mergeresultwindow.cpp \
optiondialog.cpp \
pdiff.cpp \
directorymergewindow.cpp \
fileaccess.cpp \
kdiff3_shell.cpp \
kdiff3_part.cpp \
kreplacements\kreplacements.cpp
OBJECTS = diff.obj \
difftextwindow.obj \
kdiff3.obj \
main.obj \
merger.obj \
mergeresultwindow.obj \
optiondialog.obj \
pdiff.obj \
directorymergewindow.obj \
fileaccess.obj \
kdiff3_shell.obj \
kdiff3_part.obj \
kreplacements\kreplacements.obj
INTERFACES =
UICDECLS =
UICIMPLS =
SRCMOC = moc_diff.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
OBJMOC = moc_diff.obj \
moc_kdiff3.obj \
moc_optiondialog.obj \
kreplacements\moc_kreplacements.obj \
moc_directorymergewindow.obj \
moc_fileaccess.obj \
moc_kdiff3_shell.obj \
moc_kdiff3_part.obj
DIST =
TARGET = kdiff3.exe
INTERFACE_DECL_PATH = .
####### Implicit rules
.SUFFIXES: .cpp .cxx .cc .c
.cpp.obj:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $<
.cxx.obj:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $<
.cc.obj:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $<
.c.obj:
$(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
####### Build rules
all: $(TARGET)
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) kdiff3.res
$(LINK) $(LFLAGS) /OUT:$(TARGET) @<<
$(OBJECTS) $(OBJMOC) $(LIBS)
<<
kdiff3.res: kdiff3.rc
rc kdiff3.rc
moc: $(SRCMOC)
dist:
$(ZIP) kdiff3_tmake.zip kdiff3_tmake.pro $(SOURCES) $(HEADERS) $(DIST) $(INTERFACES)
clean:
-del diff.obj
-del difftextwindow.obj
-del kdiff3.obj
-del main.obj
-del merger.obj
-del mergeresultwindow.obj
-del optiondialog.obj
-del pdiff.obj
-del directorymergewindow.obj
-del fileaccess.obj
-del kdiff3_shell.obj
-del kdiff3_part.obj
-del kreplacements\kreplacements.obj
-del moc_diff.cpp
-del moc_kdiff3.cpp
-del moc_optiondialog.cpp
-del kreplacements\moc_kreplacements.cpp
-del moc_directorymergewindow.cpp
-del moc_fileaccess.cpp
-del moc_kdiff3_shell.cpp
-del moc_kdiff3_part.cpp
-del moc_diff.obj
-del moc_kdiff3.obj
-del moc_optiondialog.obj
-del kreplacements\moc_kreplacements.obj
-del moc_directorymergewindow.obj
-del moc_fileaccess.obj
-del moc_kdiff3_shell.obj
-del moc_kdiff3_part.obj
-del $(TARGET)
####### Compile
diff.obj: diff.cpp \
diff.h \
common.h \
fileaccess.h
difftextwindow.obj: difftextwindow.cpp \
diff.h \
common.h \
fileaccess.h \
merger.h \
optiondialog.h
kdiff3.obj: kdiff3.cpp \
diff.h \
common.h \
fileaccess.h \
kdiff3.h \
optiondialog.h \
kdiff3_part.h \
directorymergewindow.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\showlinenumbers.xpm \
xpm\startmerge.xpm
main.obj: main.cpp \
kdiff3_shell.h
merger.obj: merger.cpp \
merger.h \
diff.h \
common.h \
fileaccess.h
mergeresultwindow.obj: mergeresultwindow.cpp \
diff.h \
common.h \
fileaccess.h \
optiondialog.h
optiondialog.obj: optiondialog.cpp \
optiondialog.h \
diff.h \
common.h \
fileaccess.h
pdiff.obj: pdiff.cpp \
diff.h \
common.h \
fileaccess.h \
directorymergewindow.h \
kdiff3.h \
optiondialog.h
directorymergewindow.obj: directorymergewindow.cpp \
directorymergewindow.h \
common.h \
fileaccess.h \
optiondialog.h \
xpm\equal.xpm \
xpm\not_equal.xpm \
xpm\not_everywhere.xpm \
xpm\not_there.xpm \
xpm\link_arrow.xpm \
xpm\file.xpm \
xpm\folder.xpm
fileaccess.obj: fileaccess.cpp \
fileaccess.h \
optiondialog.h \
common.h
kdiff3_shell.obj: kdiff3_shell.cpp \
kdiff3_shell.h \
kdiff3.h \
diff.h \
common.h \
fileaccess.h
kdiff3_part.obj: kdiff3_part.cpp \
kdiff3_part.h \
kdiff3.h \
diff.h \
common.h \
fileaccess.h
kreplacements\kreplacements.obj: kreplacements\kreplacements.cpp \
kreplacements\kreplacements.h \