Rename a few build variables for overall consistency

pull/1/head
Timothy Pearson 11 years ago
parent 2c5204a52f
commit fcdadb3fee

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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)

@ -17,8 +17,8 @@
*
*/
#ifndef __KFILE_AU_H__
#define __KFILE_AU_H__
#ifndef __TDEFILE_AU_H__
#define __TDEFILE_AU_H__
#include <tdefilemetainfo.h>

@ -17,8 +17,8 @@
*
*/
#ifndef __KFILE_AVI_H__
#define __KFILE_AVI_H__
#ifndef __TDEFILE_AVI_H__
#define __TDEFILE_AVI_H__
#include <tdefilemetainfo.h>
#include <tqfile.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 <tdefilemetainfo.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 <tdefilemetainfo.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 <tdefilemetainfo.h>

@ -17,8 +17,8 @@
*
*/
#ifndef __KFILE_MPEG_H__
#define __KFILE_MPEG_H__
#ifndef __TDEFILE_MPEG_H__
#define __TDEFILE_MPEG_H__
#include <tdefilemetainfo.h>
#include <tqfile.h>

@ -18,8 +18,8 @@
* $Id$
*/
#ifndef __KFILE_OGG_H__
#define __KFILE_OGG_H__
#ifndef __TDEFILE_OGG_H__
#define __TDEFILE_OGG_H__
#include <tdefilemetainfo.h>

@ -18,8 +18,8 @@
* $Id$
*/
#ifndef KFILE_SID_H
#define KFILE_SID_H
#ifndef TDEFILE_SID_H
#define TDEFILE_SID_H
#include <tdefilemetainfo.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__

@ -17,8 +17,8 @@
*
*/
#ifndef __KFILE_WAV_H__
#define __KFILE_WAV_H__
#ifndef __TDEFILE_WAV_H__
#define __TDEFILE_WAV_H__
#include <tdefilemetainfo.h>

@ -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

Loading…
Cancel
Save