diff kdiff3/src/Makefile.qt @ 51:c59d5a3a8ff3

0.9.80

--- a/kdiff3/src/Makefile.qt	Fri Oct 17 16:54:25 2003 +0000
+++ b/kdiff3/src/Makefile.qt	Tue Dec 09 20:29:43 2003 +0000
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: kdiff3
-# Generated by qmake (1.05a) (Qt 3.1.2-snapshot-20030618) on: Thu Oct  2 22:13:20 2003
+# Generated by qmake (1.06c) (Qt 3.2.1) on: Mon Dec  8 20:06:47 2003
 # Project:  kdiff3.pro
 # Template: app
 # Command: $(QMAKE) -o Makefile kdiff3.pro
@@ -12,8 +12,8 @@
 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
+CFLAGS   = -pipe -O2 -march=i586 -mcpu=i686 -fmessage-length=0 -fPIC -Wall -W -O2 -march=i586 -mcpu=i686 -fmessage-length=0 -fPIC -D_REENTRANT  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT
+CXXFLAGS = -pipe -O2 -march=i586 -mcpu=i686 -fmessage-length=0 -fPIC -Wall -W -O2 -march=i586 -mcpu=i686 -fmessage-length=0 -fPIC -D_REENTRANT  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT
 LEXFLAGS = 
 YACCFLAGS= -d
 INCPATH  = -I$(QTDIR)/mkspecs/default -I. -Ikreplacements -I/usr/include -I$(QTDIR)/include
@@ -28,8 +28,8 @@
 TAR      = tar -cf
 GZIP     = gzip -9f
 COPY     = cp -f
-COPY_FILE= $(COPY) -p
-COPY_DIR = $(COPY) -pR
+COPY_FILE= $(COPY)
+COPY_DIR = $(COPY) -r
 DEL_FILE = rm -f
 SYMLINK  = ln -sf
 DEL_DIR  = rmdir
@@ -43,7 +43,8 @@
 
 ####### Files
 
-HEADERS = diff.h \
+HEADERS = version.h \
+		diff.h \
 		kdiff3.h \
 		merger.h \
 		optiondialog.h \
@@ -64,7 +65,10 @@
 		fileaccess.cpp \
 		kdiff3_shell.cpp \
 		kdiff3_part.cpp \
-		kreplacements/kreplacements.cpp
+		kreplacements/kreplacements.cpp \
+		gnudiff_analyze.cpp \
+		gnudiff_io.cpp \
+		gnudiff_xmalloc.cpp
 OBJECTS = diff.o \
 		difftextwindow.o \
 		kdiff3.o \
@@ -77,7 +81,10 @@
 		fileaccess.o \
 		kdiff3_shell.o \
 		kdiff3_part.o \
-		kreplacements.o
+		kreplacements.o \
+		gnudiff_analyze.o \
+		gnudiff_io.o \
+		gnudiff_xmalloc.o
 FORMS = 
 UICDECLS = 
 UICIMPLS = 
@@ -105,7 +112,7 @@
 first: all
 ####### Implicit rules
 
-.SUFFIXES: .c .cpp .cc .cxx .C
+.SUFFIXES: .c .o .cpp .cc .cxx .C
 
 .cpp.o:
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
@@ -126,10 +133,11 @@
 
 all: $(TARGET)
 
-$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
+$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC)  
+	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
 
 mocables: $(SRCMOC)
+uicables: $(UICDECLS) $(UICIMPLS)
 
 $(MOC): 
 	( cd $(QTDIR)/src/moc ; $(MAKE) )
@@ -146,7 +154,7 @@
 yaccclean:
 lexclean:
 clean: mocclean
-	-$(DEL_FILE) $(OBJECTS) 
+	-$(DEL_FILE) $(OBJECTS)
 	-$(DEL_FILE) *~ core *.core
 
 
@@ -191,10 +199,10 @@
 		xpm/autoadvance.xpm \
 		xpm/showwhitespace.xpm \
 		xpm/showlinenumbers.xpm \
-		xpm/startmerge.xpm \
 		common.h
 
-main.o: main.cpp kdiff3_shell.h
+main.o: main.cpp kdiff3_shell.h \
+		version.h
 
 merger.o: merger.cpp merger.h \
 		diff.h \
@@ -216,10 +224,13 @@
 		kdiff3.h \
 		optiondialog.h \
 		fileaccess.h \
-		common.h
+		gnudiff_diff.h \
+		common.h \
+		gnudiff_system.h
 
 directorymergewindow.o: directorymergewindow.cpp directorymergewindow.h \
 		optiondialog.h \
+		xpm/startmerge.xpm \
 		common.h \
 		fileaccess.h
 
@@ -243,6 +254,16 @@
 		kreplacements/kreplacements.moc
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o kreplacements.o kreplacements/kreplacements.cpp
 
+gnudiff_analyze.o: gnudiff_analyze.cpp gnudiff_diff.h \
+		gnudiff_xalloc.h \
+		gnudiff_system.h
+
+gnudiff_io.o: gnudiff_io.cpp gnudiff_diff.h \
+		gnudiff_xalloc.h \
+		gnudiff_system.h
+
+gnudiff_xmalloc.o: gnudiff_xmalloc.cpp gnudiff_xalloc.h
+
 moc_diff.o: moc_diff.cpp diff.h common.h \
 		fileaccess.h
 
@@ -302,7 +323,6 @@
 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)"