From 1ebe2e2ac75e854139de6a7550e8a2b6c2918f00 Mon Sep 17 00:00:00 2001 From: Plamen Petrov Date: Wed, 30 Jan 2008 15:13:54 +0200 Subject: [PATCH] compile finally works - I really need to learn autoconf/automake.... P. --- Makefile.in | 2 +- po/Makefile.in | 2 +- src/Makefile.am | 8 +++----- src/Makefile.in | 16 +++++++--------- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Makefile.in b/Makefile.in index b1db634..a0cecbf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -805,7 +805,7 @@ dist-hook: .NOEXPORT: #>+ 2 -KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure Makefile.am acinclude.m4 +KDE_DIST=subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure acinclude.m4 Makefile.am #>+ 2 docs-am: diff --git a/po/Makefile.in b/po/Makefile.in index c12b15f..661f421 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -529,7 +529,7 @@ uninstall-am: uninstall-info-am .NOEXPORT: #>+ 2 -KDE_DIST=Makefile.in bg.gmo Makefile.am +KDE_DIST=Makefile.in Makefile.am #>+ 4 bg.gmo: bg.po diff --git a/src/Makefile.am b/src/Makefile.am index 373a063..9897ced 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,10 +22,9 @@ KDE_ICON = AUTO bin_PROGRAMS = kmk # the application source, library search path, and link libraries -kmk_SOURCES = kmkcatalogfile.cpp kmkglobalsettings.h kmkglobalsettings.cpp \ - kmk_progress_disp_base.ui kmk_progress_disp.cpp \ - kmktagedbase.ui kmktaged.cpp \ - kmksettingsbase.ui kmksettings_dialog.cpp \ +kmk_SOURCES = kmk_progress_disp_base.ui kmktagedbase.ui kmksettingsbase.ui \ + kmkcatalogfile.cpp kmkglobalsettings.h kmkglobalsettings.cpp \ + kmk_progress_disp.cpp kmktaged.cpp kmksettings_dialog.cpp \ kmk.cpp main.cpp kmk_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(taglib_libs) kmk_LDADD = $(LIB_KDEUI) @@ -37,4 +36,3 @@ shelldesktop_DATA = kmk.desktop # this is where the shell's XML-GUI resource file goes shellrcdir = $(kde_datadir)/kmk shellrc_DATA = kmkui.rc - diff --git a/src/Makefile.in b/src/Makefile.in index f266e94..990c53f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -358,16 +358,14 @@ noinst_HEADERS = kmk.h kmk_progress_disp.h kmkcatalogfile.h \ KDE_ICON = AUTO # the application source, library search path, and link libraries -#>- kmk_SOURCES = kmkcatalogfile.cpp kmkglobalsettings.h kmkglobalsettings.cpp \ -#>- kmk_progress_disp_base.ui kmk_progress_disp.cpp \ -#>- kmktagedbase.ui kmktaged.cpp \ -#>- kmksettingsbase.ui kmksettings_dialog.cpp \ +#>- kmk_SOURCES = kmk_progress_disp_base.ui kmktagedbase.ui kmksettingsbase.ui \ +#>- kmkcatalogfile.cpp kmkglobalsettings.h kmkglobalsettings.cpp \ +#>- kmk_progress_disp.cpp kmktaged.cpp kmksettings_dialog.cpp \ #>- kmk.cpp main.cpp -#>+ 5 -kmk_SOURCES=kmkcatalogfile.cpp kmkglobalsettings.h kmkglobalsettings.cpp \ - kmk_progress_disp.cpp \ - kmktaged.cpp \ - kmksettings_dialog.cpp \ +#>+ 4 +kmk_SOURCES= \ + kmkcatalogfile.cpp kmkglobalsettings.h kmkglobalsettings.cpp \ + kmk_progress_disp.cpp kmktaged.cpp kmksettings_dialog.cpp \ kmk.cpp main.cpp kmk_progress_disp_base.cpp kmktagedbase.cpp kmksettingsbase.cpp kmk_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(taglib_libs) -- 2.11.4.GIT