diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 58 | ||||
| -rw-r--r-- | src/gnudiff_xmalloc.cpp | 2 | ||||
| -rw-r--r-- | src/kdiff3.h | 6 | ||||
| -rw-r--r-- | src/kdiff3_shell.h | 2 |
4 files changed, 5 insertions, 63 deletions
diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index d949623..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ - -# 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 version.h \ - smalldialogs.h difftextwindow.h mergeresultwindow.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 = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -kdiff3_LDADD = $(LIB_TDEPARTS) - -# 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 gnudiff_analyze.cpp gnudiff_io.cpp gnudiff_xmalloc.cpp \ - common.cpp smalldialogs.cpp -libkdiff3part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -libkdiff3part_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPRINT) $(LIB_TDEPARTS) $(LIB_TDEFILE) - -# 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 diff --git a/src/gnudiff_xmalloc.cpp b/src/gnudiff_xmalloc.cpp index 858faba..5bbb445 100644 --- a/src/gnudiff_xmalloc.cpp +++ b/src/gnudiff_xmalloc.cpp @@ -20,7 +20,7 @@ Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. */ #if HAVE_CONFIG_H -# include <config.h> +#include "config.h" #endif #include <sys/types.h> diff --git a/src/kdiff3.h b/src/kdiff3.h index 3bd90f9..e48f42b 100644 --- a/src/kdiff3.h +++ b/src/kdiff3.h @@ -18,12 +18,12 @@ #ifndef KDIFF3_H #define KDIFF3_H -#include "diff.h" - #ifdef HAVE_CONFIG_H -#include <config.h> +#include "config.h" #endif +#include "diff.h" + // include files for TQt #include <tqdialog.h> #include <tqsplitter.h> diff --git a/src/kdiff3_shell.h b/src/kdiff3_shell.h index 01389b5..b11f3b8 100644 --- a/src/kdiff3_shell.h +++ b/src/kdiff3_shell.h @@ -21,7 +21,7 @@ #define _KDIFF3SHELL_H_ #ifdef HAVE_CONFIG_H -#include <config.h> +#include "config.h" #endif #include <tdeapplication.h> |