From fcdadb3fee5d32dbf7c650ae24108a2f8ee2966f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 29 Jan 2013 23:32:07 -0600 Subject: Rename a few build variables for overall consistency --- arts/builder/Makefile.am | 2 +- arts/tools/Makefile.am | 2 +- noatun/modules/dcopiface/Makefile.am | 2 +- noatun/modules/excellent/Makefile.am | 2 +- noatun/modules/htmlexport/Makefile.am | 2 +- noatun/modules/infrared/Makefile.am | 2 +- noatun/modules/kaiman/Makefile.am | 2 +- noatun/modules/keyz/Makefile.am | 2 +- noatun/modules/kjofol-skin/Makefile.am | 2 +- noatun/modules/marquis/Makefile.am | 2 +- noatun/modules/monoscope/Makefile.am | 2 +- noatun/modules/net/Makefile.am | 2 +- noatun/modules/noatunui/Makefile.am | 2 +- noatun/modules/systray/Makefile.am | 2 +- noatun/modules/voiceprint/Makefile.am | 2 +- tdefile-plugins/Makefile.am | 14 +++++++------- tdefile-plugins/au/tdefile_au.h | 4 ++-- tdefile-plugins/avi/tdefile_avi.h | 4 ++-- tdefile-plugins/flac/tdefile_flac.h | 4 ++-- tdefile-plugins/mp3/tdefile_mp3.h | 4 ++-- tdefile-plugins/mpc/tdefile_mpc.h | 4 ++-- tdefile-plugins/mpeg/tdefile_mpeg.h | 4 ++-- tdefile-plugins/ogg/tdefile_ogg.h | 4 ++-- tdefile-plugins/sid/tdefile_sid.h | 4 ++-- tdefile-plugins/theora/tdefile_theora.h | 6 +++--- tdefile-plugins/wav/tdefile_wav.h | 4 ++-- tdemid/Makefile.am | 2 +- 27 files changed, 44 insertions(+), 44 deletions(-) diff --git a/arts/builder/Makefile.am b/arts/builder/Makefile.am index fb4af798..b16ccc39 100644 --- a/arts/builder/Makefile.am +++ b/arts/builder/Makefile.am @@ -25,7 +25,7 @@ artsbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECO # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. -artsbuilder_LDADD = $(LIB_KFILE) -lqtmcop $(LIB_X11) $(LIBPTHREAD) $(top_builddir)/arts/runtime/libartsbuilder.la -lsoundserver_idl -lartskde -lmcop -lartsflow_idl +artsbuilder_LDADD = $(LIB_TDEFILE) -lqtmcop $(LIB_X11) $(LIBPTHREAD) $(top_builddir)/arts/runtime/libartsbuilder.la -lsoundserver_idl -lartskde -lmcop -lartsflow_idl rcdir = $(kde_datadir)/artsbuilder rc_DATA = artsbuilderui.rc diff --git a/arts/tools/Makefile.am b/arts/tools/Makefile.am index 59900632..7d21a23a 100644 --- a/arts/tools/Makefile.am +++ b/arts/tools/Makefile.am @@ -59,7 +59,7 @@ bin_PROGRAMS = artscontrol artscontrol_SOURCES = main.cpp levelmeters.cpp artscontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lartsflow -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) artscontrol_LDADD = libartscontrolsupport.la \ - $(LIB_TDEUI) $(LIB_KSYCOCA) $(LIB_KFILE) \ + $(LIB_TDEUI) $(LIB_KSYCOCA) $(LIB_TDEFILE) \ -lqtmcop -lartsflow -lartsflow_idl -lsoundserver_idl -lartskde -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) xdg_apps_DATA = artscontrol.desktop diff --git a/noatun/modules/dcopiface/Makefile.am b/noatun/modules/dcopiface/Makefile.am index 6d55fc72..3f8645a4 100644 --- a/noatun/modules/dcopiface/Makefile.am +++ b/noatun/modules/dcopiface/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = noatun_dcopiface.la noatun_dcopiface_la_SOURCES = dcopiface.cpp dcopiface.skel noatun_dcopiface_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_dcopiface_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la +noatun_dcopiface_la_LIBADD = $(LIB_TDEFILE) $(top_builddir)/noatun/library/libnoatun.la noatun_dcopiface_la_METASOURCES = AUTO diff --git a/noatun/modules/excellent/Makefile.am b/noatun/modules/excellent/Makefile.am index a2558676..49d8eb70 100644 --- a/noatun/modules/excellent/Makefile.am +++ b/noatun/modules/excellent/Makefile.am @@ -5,7 +5,7 @@ noatun_excellent_la_SOURCES = noatunui.cpp\ userinterface.cpp noatun_excellent_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_excellent_la_LIBADD = $(LIB_KFILE) \ +noatun_excellent_la_LIBADD = $(LIB_TDEFILE) \ $(top_builddir)/noatun/library/libnoatun.la \ $(top_builddir)/noatun/library/libnoatuncontrols.la \ -lqtmcop -lkmedia2_idl -lsoundserver_idl diff --git a/noatun/modules/htmlexport/Makefile.am b/noatun/modules/htmlexport/Makefile.am index bbea16ab..d508b57a 100644 --- a/noatun/modules/htmlexport/Makefile.am +++ b/noatun/modules/htmlexport/Makefile.am @@ -6,7 +6,7 @@ noatun_htmlexport_la_SOURCES = htmlexport.cpp noinst_HEADERS = htmlexport.h noatun_htmlexport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_htmlexport_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_htmlexport_la_LIBADD = $(LIB_TDEFILE) $(top_builddir)/noatun/library/libnoatun.la \ -lqtmcop -lkmedia2_idl -lsoundserver_idl noatun_htmlexport_la_METASOURCES = AUTO diff --git a/noatun/modules/infrared/Makefile.am b/noatun/modules/infrared/Makefile.am index bf8a7212..31eea1f5 100644 --- a/noatun/modules/infrared/Makefile.am +++ b/noatun/modules/infrared/Makefile.am @@ -6,7 +6,7 @@ noatun_infrared_la_SOURCES = infrared.cpp lirc.cpp irprefs.cpp noinst_HEADERS = infrared.h lirc.h irprefs.h noatun_infrared_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_infrared_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_infrared_la_LIBADD = $(LIB_TDEFILE) $(top_builddir)/noatun/library/libnoatun.la \ -lqtmcop -lkmedia2_idl -lsoundserver_idl noatun_infrared_la_METASOURCES = AUTO diff --git a/noatun/modules/kaiman/Makefile.am b/noatun/modules/kaiman/Makefile.am index a8205a59..5879a940 100644 --- a/noatun/modules/kaiman/Makefile.am +++ b/noatun/modules/kaiman/Makefile.am @@ -9,7 +9,7 @@ noatun_kaiman_la_SOURCES = \ pref.cpp noatun_kaiman_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_kaiman_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_kaiman_la_LIBADD = $(LIB_TDEFILE) $(top_builddir)/noatun/library/libnoatun.la \ -lqtmcop -lkmedia2_idl -lsoundserver_idl noatun_kaiman_la_METASOURCES = AUTO diff --git a/noatun/modules/keyz/Makefile.am b/noatun/modules/keyz/Makefile.am index 61c9f1bd..fd4b2646 100644 --- a/noatun/modules/keyz/Makefile.am +++ b/noatun/modules/keyz/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = noatun_keyz.la noatun_keyz_la_SOURCES = keyz.cpp noatun_keyz_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_keyz_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la +noatun_keyz_la_LIBADD = $(LIB_TDEFILE) $(top_builddir)/noatun/library/libnoatun.la noatun_keyz_la_METASOURCES = AUTO diff --git a/noatun/modules/kjofol-skin/Makefile.am b/noatun/modules/kjofol-skin/Makefile.am index f3e9504a..ad139ffb 100644 --- a/noatun/modules/kjofol-skin/Makefile.am +++ b/noatun/modules/kjofol-skin/Makefile.am @@ -23,7 +23,7 @@ noatun_kjofol_la_SOURCES = kjloader.cpp kjwidget.cpp kjbutton.cpp kjseeker.cpp \ kjskinselectorwidget.ui kjguisettingswidget.ui noatun_kjofol_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_kjofol_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_kjofol_la_LIBADD = $(LIB_TDEFILE) $(top_builddir)/noatun/library/libnoatun.la \ $(LIB_KIO) -lm \ $(top_builddir)/arts/modules/libartsmodules.la diff --git a/noatun/modules/marquis/Makefile.am b/noatun/modules/marquis/Makefile.am index a2fc3e3f..c283ccd5 100644 --- a/noatun/modules/marquis/Makefile.am +++ b/noatun/modules/marquis/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = noatun_marquis.la noatun_marquis_la_SOURCES = marquis.cpp plugin.cpp noatun_marquis_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_marquis_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_marquis_la_LIBADD = $(LIB_TDEFILE) $(top_builddir)/noatun/library/libnoatun.la \ -lqtmcop -lkmedia2_idl -lsoundserver_idl noatun_marquis_la_METASOURCES = AUTO diff --git a/noatun/modules/monoscope/Makefile.am b/noatun/modules/monoscope/Makefile.am index 55c58a05..57ab3787 100644 --- a/noatun/modules/monoscope/Makefile.am +++ b/noatun/modules/monoscope/Makefile.am @@ -5,7 +5,7 @@ noatun_monoscope_la_SOURCES = monoscope.cpp #prefs.cpp noatun_monoscope_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_monoscope_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la -lm +noatun_monoscope_la_LIBADD = $(LIB_TDEFILE) $(top_builddir)/noatun/library/libnoatun.la -lm noatun_monoscope_la_METASOURCES = AUTO diff --git a/noatun/modules/net/Makefile.am b/noatun/modules/net/Makefile.am index 9398a602..854c5849 100644 --- a/noatun/modules/net/Makefile.am +++ b/noatun/modules/net/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = noatun_net.la noatun_net_la_SOURCES = net.cpp noatun_net_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_net_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la +noatun_net_la_LIBADD = $(LIB_TDEFILE) $(top_builddir)/noatun/library/libnoatun.la noatun_net_la_METASOURCES = AUTO diff --git a/noatun/modules/noatunui/Makefile.am b/noatun/modules/noatunui/Makefile.am index 443afd6c..86206168 100644 --- a/noatun/modules/noatunui/Makefile.am +++ b/noatun/modules/noatunui/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = noatun_ui.la noatun_ui_la_SOURCES = noatunui.cpp userinterface.cpp noatun_ui_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_ui_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_ui_la_LIBADD = $(LIB_TDEFILE) $(top_builddir)/noatun/library/libnoatun.la \ $(top_builddir)/noatun/library/libnoatuncontrols.la \ -lqtmcop -lkmedia2_idl -lsoundserver_idl diff --git a/noatun/modules/systray/Makefile.am b/noatun/modules/systray/Makefile.am index 1dcfdd25..e0424b1d 100644 --- a/noatun/modules/systray/Makefile.am +++ b/noatun/modules/systray/Makefile.am @@ -6,7 +6,7 @@ noatun_systray_la_SOURCES = systray.cpp noatunui.cpp kitsystemtray.cpp cmodule.c noatun_systray_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_systray_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la +noatun_systray_la_LIBADD = $(LIB_TDEFILE) $(top_builddir)/noatun/library/libnoatun.la noatun_systray_la_METASOURCES = AUTO diff --git a/noatun/modules/voiceprint/Makefile.am b/noatun/modules/voiceprint/Makefile.am index 22c3f65c..b1e71d44 100644 --- a/noatun/modules/voiceprint/Makefile.am +++ b/noatun/modules/voiceprint/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = noatun_voiceprint.la noatun_voiceprint_la_SOURCES = voiceprint.cpp prefs.cpp noatun_voiceprint_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_voiceprint_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la -lm +noatun_voiceprint_la_LIBADD = $(LIB_TDEFILE) $(top_builddir)/noatun/library/libnoatun.la -lm noatun_voiceprint_la_METASOURCES = AUTO diff --git a/tdefile-plugins/Makefile.am b/tdefile-plugins/Makefile.am index fc127f02..6bdf4ccb 100644 --- a/tdefile-plugins/Makefile.am +++ b/tdefile-plugins/Makefile.am @@ -1,22 +1,22 @@ if include_ogg_SUBDIR -KFILE_OGG_SUBDIR=ogg +TDEFILE_OGG_SUBDIR=ogg endif if include_flac_SUBDIR -KFILE_FLAC_SUBDIR=flac +TDEFILE_FLAC_SUBDIR=flac endif if include_mp3_SUBDIR -KFILE_MP3_SUBDIR=mp3 +TDEFILE_MP3_SUBDIR=mp3 endif if include_mpc_SUBDIR -KFILE_MPC_SUBDIR=mpc +TDEFILE_MPC_SUBDIR=mpc endif if include_theora_SUBDIR -KFILE_THEORA_SUBDIR=theora +TDEFILE_THEORA_SUBDIR=theora endif -SUBDIRS=m3u $(KFILE_MP3_SUBDIR) $(KFILE_MPC_SUBDIR) au avi mpeg wav sid $(KFILE_OGG_SUBDIR) \ - $(KFILE_FLAC_SUBDIR) $(KFILE_THEORA_SUBDIR) +SUBDIRS=m3u $(TDEFILE_MP3_SUBDIR) $(TDEFILE_MPC_SUBDIR) au avi mpeg wav sid $(TDEFILE_OGG_SUBDIR) \ + $(TDEFILE_FLAC_SUBDIR) $(TDEFILE_THEORA_SUBDIR) diff --git a/tdefile-plugins/au/tdefile_au.h b/tdefile-plugins/au/tdefile_au.h index 7ac18c9c..9d5104ef 100644 --- a/tdefile-plugins/au/tdefile_au.h +++ b/tdefile-plugins/au/tdefile_au.h @@ -17,8 +17,8 @@ * */ -#ifndef __KFILE_AU_H__ -#define __KFILE_AU_H__ +#ifndef __TDEFILE_AU_H__ +#define __TDEFILE_AU_H__ #include diff --git a/tdefile-plugins/avi/tdefile_avi.h b/tdefile-plugins/avi/tdefile_avi.h index b73f324b..a533723b 100644 --- a/tdefile-plugins/avi/tdefile_avi.h +++ b/tdefile-plugins/avi/tdefile_avi.h @@ -17,8 +17,8 @@ * */ -#ifndef __KFILE_AVI_H__ -#define __KFILE_AVI_H__ +#ifndef __TDEFILE_AVI_H__ +#define __TDEFILE_AVI_H__ #include #include diff --git a/tdefile-plugins/flac/tdefile_flac.h b/tdefile-plugins/flac/tdefile_flac.h index f4f3c96f..982a8a51 100644 --- a/tdefile-plugins/flac/tdefile_flac.h +++ b/tdefile-plugins/flac/tdefile_flac.h @@ -21,8 +21,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef __KFILE_FLAC_H__ -#define __KFILE_FLAC_H__ +#ifndef __TDEFILE_FLAC_H__ +#define __TDEFILE_FLAC_H__ #include diff --git a/tdefile-plugins/mp3/tdefile_mp3.h b/tdefile-plugins/mp3/tdefile_mp3.h index 209c81a6..cc01aa3e 100644 --- a/tdefile-plugins/mp3/tdefile_mp3.h +++ b/tdefile-plugins/mp3/tdefile_mp3.h @@ -16,8 +16,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef __KFILE_MP3_H__ -#define __KFILE_MP3_H__ +#ifndef __TDEFILE_MP3_H__ +#define __TDEFILE_MP3_H__ #include diff --git a/tdefile-plugins/mpc/tdefile_mpc.h b/tdefile-plugins/mpc/tdefile_mpc.h index 8b3345ed..4bb3a387 100644 --- a/tdefile-plugins/mpc/tdefile_mpc.h +++ b/tdefile-plugins/mpc/tdefile_mpc.h @@ -21,8 +21,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef __KFILE_MPC_H__ -#define __KFILE_MPC_H__ +#ifndef __TDEFILE_MPC_H__ +#define __TDEFILE_MPC_H__ #include diff --git a/tdefile-plugins/mpeg/tdefile_mpeg.h b/tdefile-plugins/mpeg/tdefile_mpeg.h index 13035837..113bd8ee 100644 --- a/tdefile-plugins/mpeg/tdefile_mpeg.h +++ b/tdefile-plugins/mpeg/tdefile_mpeg.h @@ -17,8 +17,8 @@ * */ -#ifndef __KFILE_MPEG_H__ -#define __KFILE_MPEG_H__ +#ifndef __TDEFILE_MPEG_H__ +#define __TDEFILE_MPEG_H__ #include #include diff --git a/tdefile-plugins/ogg/tdefile_ogg.h b/tdefile-plugins/ogg/tdefile_ogg.h index 0737dff7..f03e4283 100644 --- a/tdefile-plugins/ogg/tdefile_ogg.h +++ b/tdefile-plugins/ogg/tdefile_ogg.h @@ -18,8 +18,8 @@ * $Id$ */ -#ifndef __KFILE_OGG_H__ -#define __KFILE_OGG_H__ +#ifndef __TDEFILE_OGG_H__ +#define __TDEFILE_OGG_H__ #include diff --git a/tdefile-plugins/sid/tdefile_sid.h b/tdefile-plugins/sid/tdefile_sid.h index ba9931f7..fadf13f5 100644 --- a/tdefile-plugins/sid/tdefile_sid.h +++ b/tdefile-plugins/sid/tdefile_sid.h @@ -18,8 +18,8 @@ * $Id$ */ -#ifndef KFILE_SID_H -#define KFILE_SID_H +#ifndef TDEFILE_SID_H +#define TDEFILE_SID_H #include diff --git a/tdefile-plugins/theora/tdefile_theora.h b/tdefile-plugins/theora/tdefile_theora.h index 88e465c2..a1aa0c09 100644 --- a/tdefile-plugins/theora/tdefile_theora.h +++ b/tdefile-plugins/theora/tdefile_theora.h @@ -18,8 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef __KFILE_THEORA_H__ -#define __KFILE_THEORA_H__ +#ifndef __TDEFILE_THEORA_H__ +#define __TDEFILE_THEORA_H__ /** * Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h> @@ -39,5 +39,5 @@ public: virtual bool readInfo( KFileMetaInfo& info, uint what); }; -#endif // __KFILE_THEORA_H__ +#endif // __TDEFILE_THEORA_H__ diff --git a/tdefile-plugins/wav/tdefile_wav.h b/tdefile-plugins/wav/tdefile_wav.h index c3a5b2ba..53eb6ccd 100644 --- a/tdefile-plugins/wav/tdefile_wav.h +++ b/tdefile-plugins/wav/tdefile_wav.h @@ -17,8 +17,8 @@ * */ -#ifndef __KFILE_WAV_H__ -#define __KFILE_WAV_H__ +#ifndef __TDEFILE_WAV_H__ +#define __TDEFILE_WAV_H__ #include diff --git a/tdemid/Makefile.am b/tdemid/Makefile.am index fe582e8b..5984d23e 100644 --- a/tdemid/Makefile.am +++ b/tdemid/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libtdemidpart.la lib_LTLIBRARIES = libtdemidlib.la libtdemidlib_la_LDFLAGS = $(all_libraries) -libtdemidlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -ltdemid $(LIB_QT) $(LIB_TDEUI) -lDCOP $(LIB_TDECORE) +libtdemidlib_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) $(LIB_KIO) -ltdemid $(LIB_QT) $(LIB_TDEUI) -lDCOP $(LIB_TDECORE) libtdemidpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module libtdemidpart_la_LIBADD = libtdemidlib.la -- cgit v1.2.3