diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-29 23:24:34 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-29 23:24:34 -0600 |
| commit | afd3a8ce4adcbb0153ed1d0518cd56e748e80a6e (patch) | |
| tree | 0ad46df5935d3152c27972dbd2c72b62518260f9 | |
| parent | e5c5e261e1d474bc9a8716f1309f3b9d8f62e4fc (diff) | |
| download | ktechlab-afd3a8ce.tar.gz ktechlab-afd3a8ce.zip | |
Rename a few build variables for overall consistency
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | aclocal.m4 | 6 | ||||
| -rw-r--r-- | microbe/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index a8eac91..acb89f8 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2083,14 +2083,14 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KDNSSD, "-ltdednssd") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-ltdeio") - AC_SUBST(LIB_KFILE, "-ltdeio") + AC_SUBST(LIB_TDEFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-ltdefile") + AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2100,7 +2100,7 @@ else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2095,14 +2095,14 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KDNSSD, "-ltdednssd") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-ltdeio") - AC_SUBST(LIB_KFILE, "-ltdeio") + AC_SUBST(LIB_TDEFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-ltdefile") + AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2112,7 +2112,7 @@ else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/microbe/Makefile.am b/microbe/Makefile.am index f86b8fb..3f18963 100644 --- a/microbe/Makefile.am +++ b/microbe/Makefile.am @@ -7,4 +7,4 @@ microbe_SOURCES = btreebase.cpp btreenode.cpp main.cpp traverser.cpp \ parser.cpp noinst_HEADERS = btreebase.h btreenode.h traverser.h pic14.h variable.h \ optimizer.h microbe.h parser.h -microbe_LDADD = -lpthread $(LIB_KFILE) +microbe_LDADD = -lpthread $(LIB_TDEFILE) diff --git a/src/Makefile.am b/src/Makefile.am index c386dc9..ff33a84 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,7 +19,7 @@ ktechlab_LDADD = $(top_builddir)/src/gui/libgui.la \ $(top_builddir)/src/mechanics/libmechanics.la $(top_builddir)/src/electronics/libelectronics.la \ $(top_builddir)/src/electronics/simulation/libelements.la $(top_builddir)/src/electronics/components/libcomponents.la \ $(top_builddir)/src/languages/liblanguages.la $(top_builddir)/src/drawparts/libdrawparts.la \ - $(top_builddir)/src/core/libcore.la -ltdeutils -ltdetexteditor $(LIB_KFILE) $(LIB_TDEPRINT) $(LIB_QT) $(LIB_GPSIM) + $(top_builddir)/src/core/libcore.la -ltdeutils -ltdetexteditor $(LIB_TDEFILE) $(LIB_TDEPRINT) $(LIB_QT) $(LIB_GPSIM) # which sources should be compiled for ktechlab ktechlab_SOURCES = ktechlab.cpp node.cpp connector.cpp itemlibrary.cpp \ |