From 7f2ee5c8556468cde3800df2cae5e2b3110e637e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 5 Nov 2011 21:46:14 -0500 Subject: [PATCH] Rename kde libraries to tde --- acinclude.m4.in | 4 ++-- am_edit | 56 ++++++++++++++++++++++++------------------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/acinclude.m4.in b/acinclude.m4.in index 5bd0b1c..cf2252f 100644 --- a/acinclude.m4.in +++ b/acinclude.m4.in @@ -1964,7 +1964,7 @@ AC_CACHE_VAL(ac_cv_have_kde, if test "$kde_qtver" = 1; then kde_check_header="ksock.h" - kde_check_lib="libkdecore.la" + kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" kde_check_lib="libkio.la" @@ -2394,7 +2394,7 @@ if test "x$kde_cv_func_$1" = xyes; then else case "$1" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_$1="yes - in libkdefakes" + kde_cv_proto_$1="yes - in libtdefakes" ;; *) kde_cv_proto_$1=unknown diff --git a/am_edit b/am_edit index 867565b..c41cef2 100644 --- a/am_edit +++ b/am_edit @@ -274,11 +274,11 @@ sub processMakefile ($) if ($sources_changed{$program}) { my $lookup = $program . '_SOURCES\s*=[ \t]*(.*)'; - if($program =~ /libkdeinit_(.*)/) { + if($program =~ /libtdeinit_(.*)/) { my $prog = $1; substituteLine($prog . '_SOURCES\s*=[ \t]*(.*)', "${prog}_SOURCES = ${prog}_dummy.$cxxsuffix\n" . - "libkdeinit_${prog}_SOURCES = " . $sources{$program}); + "libtdeinit_${prog}_SOURCES = " . $sources{$program}); $sources{$prog} = "${prog}_dummy.$cxxsuffix"; } else { @@ -638,7 +638,7 @@ sub initialise () } next if ($ocv); - next if ($program =~ /^am_libkdeinit_/); + next if ($program =~ /^am_libtdeinit_/); $program =~ s/^am_// if ($program =~ /^am_/); @@ -888,17 +888,17 @@ sub tag_KDEINIT() $lookup = $kdeinit . '_la_LIBADD\s*=[ \t]*(.*)'; if($MakefileData =~ m/\n$lookup/) { my $libadd = $1; - substituteLine($lookup, "${kdeinit}_la_LIBADD = libkdeinit_${kdeinit}.la"); - appendLines("libkdeinit_${kdeinit}_la_LIBADD = $libadd\n"); + substituteLine($lookup, "${kdeinit}_la_LIBADD = libtdeinit_${kdeinit}.la"); + appendLines("libtdeinit_${kdeinit}_la_LIBADD = $libadd\n"); } - appendLines("libkdeinit_${kdeinit}_la_LDFLAGS = -no-undefined -avoid-version \$(all_libraries)\n"); + appendLines("libtdeinit_${kdeinit}_la_LDFLAGS = -no-undefined -avoid-version \$(all_libraries)\n"); # add library dependencies $lookup = $kdeinit . '_la_DEPENDENCIES\s*=[ \t]*(.*)'; if($MakefileData =~ m/\n$lookup/) { my $libdeps = $1; - substituteLine($lookup, "${kdeinit}_la_DEPENDENCIES = libkdeinit_${kdeinit}.la"); - appendLines("libkdeinit_${kdeinit}_la_DEPENDENCIES = $libdeps\n"); + substituteLine($lookup, "${kdeinit}_la_DEPENDENCIES = libtdeinit_${kdeinit}.la"); + appendLines("libtdeinit_${kdeinit}_la_DEPENDENCIES = $libdeps\n"); } # make library objects @@ -906,29 +906,29 @@ sub tag_KDEINIT() if($MakefileData =~ m/\n$lookup/) { my $libobjects = $1; substituteLine($lookup, "am_${kdeinit}_la_OBJECTS = ${kdeinit}_dummy.lo"); - appendLines("am_libkdeinit_${kdeinit}_la_OBJECTS = $libobjects\n"); - my $prog = "libkdeinit_${kdeinit}_la"; + appendLines("am_libtdeinit_${kdeinit}_la_OBJECTS = $libobjects\n"); + my $prog = "libtdeinit_${kdeinit}_la"; push(@programs, $prog); $realObjs{$prog} = $libobjects; - $realname{$prog} = "libkdeinit_${kdeinit}.la"; + $realname{$prog} = "libtdeinit_${kdeinit}.la"; } - $target_adds{"libkdeinit_${kdeinit}.la"} = "\$(libkdeinit_${kdeinit}_la_OBJECTS) \$(libkdeinit_${kdeinit}_la_DEPENDENCIES)\n" . - "\t\$(CXXLINK) -rpath \$(libdir) \$(libkdeinit_${kdeinit}_la_LDFLAGS) ". - "\$(libkdeinit_${kdeinit}_la_OBJECTS) " . - "\$(libkdeinit_${kdeinit}_la_LIBADD) " . + $target_adds{"libtdeinit_${kdeinit}.la"} = "\$(libtdeinit_${kdeinit}_la_OBJECTS) \$(libtdeinit_${kdeinit}_la_DEPENDENCIES)\n" . + "\t\$(CXXLINK) -rpath \$(libdir) \$(libtdeinit_${kdeinit}_la_LDFLAGS) ". + "\$(libtdeinit_${kdeinit}_la_OBJECTS) " . + "\$(libtdeinit_${kdeinit}_la_LIBADD) " . "\$(LIBS)\n"; - # make libkdeinit sources + # make libtdeinit sources $lookup = $kdeinit . '_la_SOURCES\s*=[ \t]*(.*)'; if($MakefileData =~ m/\n$lookup/) { my $srces = $1; - $sources_changed{"libkdeinit_${kdeinit}_la"} = 1; - $sources{"libkdeinit_${kdeinit}_la"} = $srces; + $sources_changed{"libtdeinit_${kdeinit}_la"} = 1; + $sources{"libtdeinit_${kdeinit}_la"} = $srces; } - # make libkdeinit metasources + # make libtdeinit metasources $lookup = $kdeinit . '_la_METASOURCES\s*=[ \t]*(.*)'; - substituteLine($lookup, "libkdeinit_${kdeinit}_la_METASOURCES = $1") + substituteLine($lookup, "libtdeinit_${kdeinit}_la_METASOURCES = $1") if($MakefileData =~ m/\n$lookup/); =cut @@ -940,14 +940,14 @@ sub tag_KDEINIT() if($MakefileData =~ m/\n$lookup/) { my $srces = $1; $srces =~ s/\b$kdeinit\.c\b/\$(${kdeinit}_SOURCES)/; - $srces =~ s/\$\(${kdeinit}_la_SOURCES\)/\$(libkdeinit_${kdeinit}_la_SOURCES)/; + $srces =~ s/\$\(${kdeinit}_la_SOURCES\)/\$(libtdeinit_${kdeinit}_la_SOURCES)/; substituteLine($lookup, "SOURCES = $srces"); } $lookup = 'DIST_SOURCES\s*=[ \t](.*)'; if($MakefileData =~ m/\n$lookup/) { my $srces = $1; $srces =~ s/\b$kdeinit\.c\b/\$(${kdeinit}_SOURCES)/; - $srces =~ s/\$\(${kdeinit}_la_SOURCES\)/\$(libkdeinit_${kdeinit}_la_SOURCES)/; + $srces =~ s/\$\(${kdeinit}_la_SOURCES\)/\$(libtdeinit_${kdeinit}_la_SOURCES)/; substituteLine($lookup, "DIST_SOURCES = $srces"); } } @@ -957,8 +957,8 @@ sub tag_KDEINIT() if($MakefileData =~ m/\n$lookup/) { $realObjs{$kdeinit} = "${kdeinit}.la.\$(OBJEXT)"; substituteLine("${kdeinit}_LDFLAGS\\s*=.*", "${kdeinit}_LDFLAGS = \$(all_libraries)"); - substituteLine("${kdeinit}_LDADD\\s*=.*", "${kdeinit}_LDADD = libkdeinit_${kdeinit}.la"); - substituteLine("${kdeinit}_DEPENDENCIES\\s*=.*", "${kdeinit}_DEPENDENCIES = libkdeinit_${kdeinit}.la"); + substituteLine("${kdeinit}_LDADD\\s*=.*", "${kdeinit}_LDADD = libtdeinit_${kdeinit}.la"); + substituteLine("${kdeinit}_DEPENDENCIES\\s*=.*", "${kdeinit}_DEPENDENCIES = libtdeinit_${kdeinit}.la"); } =cut # add binary @@ -968,20 +968,20 @@ sub tag_KDEINIT() $sources{$kdeinit} = "${kdeinit}.la.$cxxsuffix"; $lines .= "${kdeinit}_LDFLAGS = \$(KDE_RPATH) -no-undefined \$(all_libraries)\n"; - $lines .= "${kdeinit}_LDADD = libkdeinit_${kdeinit}.la\n"; - $lines .= "${kdeinit}_DEPENDENCIES = libkdeinit_${kdeinit}.la\n"; + $lines .= "${kdeinit}_LDADD = libtdeinit_${kdeinit}.la\n"; + $lines .= "${kdeinit}_DEPENDENCIES = libtdeinit_${kdeinit}.la\n"; $target_adds{"${kdeinit}\$(EXEEXT)"} = "\$(${kdeinit}_OBJECTS) \$(${kdeinit}_DEPENDENCIES)\n" . "\t\@rm -f ${kdeinit}\$(EXEEXT)\n" . "\t\$(CXXLINK) \$(${kdeinit}_LDFLAGS) \$(${kdeinit}_OBJECTS) \$(${kdeinit}_LDADD) \$(LIBS)\n"; - $ltlibs .= " libkdeinit_${kdeinit}.la"; + $ltlibs .= " libtdeinit_${kdeinit}.la"; } } appendLines($lines); - # add libkdeinit target + # add libtdeinit target $lookup = 'lib_LTLIBRARIES\s*=[ \t]*(.*)'; if($MakefileData =~ m/\n$lookup/) { substituteLine($lookup, "lib_LTLIBRARIES = $1 $ltlibs");