diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-29 23:20:03 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-29 23:20:03 -0600 |
| commit | 45ad53bf0b0be2bffdfeef2e23b63bf0e88f90cd (patch) | |
| tree | 499dcb585ccd6f77324220b066a9b6a72896df8d | |
| parent | 20b69889472b71f78200d1e541a0746ab0a2fae6 (diff) | |
| download | kaffeine-45ad53bf.tar.gz kaffeine-45ad53bf.zip | |
Rename a few build variables for overall consistency
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | aclocal.m4 | 6 | ||||
| -rw-r--r-- | kaffeine/src/player-parts/dummy-part/Makefile | 4 | ||||
| -rw-r--r-- | kaffeine/src/player-parts/dummy-part/Makefile.am | 2 | ||||
| -rw-r--r-- | kaffeine/src/player-parts/gstreamer-part/Makefile.am | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 9d8a105..1d46f61 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2087,14 +2087,14 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") # 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") @@ -2104,7 +2104,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 ]) @@ -2099,14 +2099,14 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") # 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") @@ -2116,7 +2116,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/kaffeine/src/player-parts/dummy-part/Makefile b/kaffeine/src/player-parts/dummy-part/Makefile index f8ec35a..6792f78 100644 --- a/kaffeine/src/player-parts/dummy-part/Makefile +++ b/kaffeine/src/player-parts/dummy-part/Makefile @@ -146,7 +146,7 @@ LIB_TDEPIM = -ltdepim LIB_TDEPRINT = -ltdeprint LIB_TDEUI = -ltdeui LIB_KDNSSD = -ltdednssd -LIB_KFILE = -ltdeio +LIB_TDEFILE = -ltdeio LIB_KFM = LIB_TDEHTML = -ltdehtml LIB_KIMPROXY = -ltdeimproxy @@ -329,7 +329,7 @@ INCLUDES = -I$(top_srcdir)/kaffeine/src/player-parts/ $(all_includes) noinst_HEADERS = dummy_part.h libdummypart_la_SOURCES = dummy_part.cpp -libdummypart_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) ../libkaffeinepart.la +libdummypart_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEFILE) ../libkaffeinepart.la #>- libdummypart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -avoid-version -no-undefined #>+ 1 libdummypart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -avoid-version -no-undefined $(KDE_NO_UNDEFINED) diff --git a/kaffeine/src/player-parts/dummy-part/Makefile.am b/kaffeine/src/player-parts/dummy-part/Makefile.am index 106d07a..3eef3de 100644 --- a/kaffeine/src/player-parts/dummy-part/Makefile.am +++ b/kaffeine/src/player-parts/dummy-part/Makefile.am @@ -8,7 +8,7 @@ METASOURCES = AUTO noinst_HEADERS = dummy_part.h libdummypart_la_SOURCES = dummy_part.cpp -libdummypart_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) ../libkaffeinepart.la +libdummypart_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEFILE) ../libkaffeinepart.la libdummypart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -avoid-version -no-undefined # this is where the desktop file will go diff --git a/kaffeine/src/player-parts/gstreamer-part/Makefile.am b/kaffeine/src/player-parts/gstreamer-part/Makefile.am index 9d2ff6f..889d0dc 100644 --- a/kaffeine/src/player-parts/gstreamer-part/Makefile.am +++ b/kaffeine/src/player-parts/gstreamer-part/Makefile.am @@ -7,7 +7,7 @@ METASOURCES = AUTO noinst_HEADERS = gstreamer_part.h timer.h video.h videosettings.h gstreamerconfig.h libgstreamerpart_la_SOURCES = gstreamer_part.cpp video.cpp timer.cpp videosettings.cpp gstreamerconfig.cpp -libgstreamerpart_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) ../kaffeine-part/libkaffeinepart.la +libgstreamerpart_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEFILE) ../kaffeine-part/libkaffeinepart.la libgstreamerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(KDE_PLUGIN) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_GSTREAMER) -lgstinterfaces-0.10 $(all_libraries) -avoid-version -no-undefined # this is where the desktop file will go |