TDE
/
tdemultimedia
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdemultimedia
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a few build variables for overall consistency

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent 2c5204a52f
commit fcdadb3fee
27 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File

2
arts/builder/Makefile.am
Unescape View File

@ -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, # the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones. # 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 rcdir = $(kde_datadir)/artsbuilder
rc_DATA = artsbuilderui.rc rc_DATA = artsbuilderui.rc

2
arts/tools/Makefile.am
Unescape View File

@ -59,7 +59,7 @@ bin_PROGRAMS = artscontrol
artscontrol_SOURCES = main.cpp levelmeters.cpp 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_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 \ 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) -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 xdg_apps_DATA = artscontrol.desktop

2
noatun/modules/dcopiface/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = noatun_dcopiface.la
noatun_dcopiface_la_SOURCES = dcopiface.cpp dcopiface.skel noatun_dcopiface_la_SOURCES = dcopiface.cpp dcopiface.skel
noatun_dcopiface_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined 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 noatun_dcopiface_la_METASOURCES = AUTO

2
noatun/modules/excellent/Makefile.am
Unescape View File

@ -5,7 +5,7 @@ noatun_excellent_la_SOURCES = noatunui.cpp\
userinterface.cpp userinterface.cpp
noatun_excellent_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined 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/libnoatun.la \
$(top_builddir)/noatun/library/libnoatuncontrols.la \ $(top_builddir)/noatun/library/libnoatuncontrols.la \
-lqtmcop -lkmedia2_idl -lsoundserver_idl -lqtmcop -lkmedia2_idl -lsoundserver_idl

2
noatun/modules/htmlexport/Makefile.am
Unescape View File

@ -6,7 +6,7 @@ noatun_htmlexport_la_SOURCES = htmlexport.cpp
noinst_HEADERS = htmlexport.h noinst_HEADERS = htmlexport.h
noatun_htmlexport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined 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 -lqtmcop -lkmedia2_idl -lsoundserver_idl
noatun_htmlexport_la_METASOURCES = AUTO noatun_htmlexport_la_METASOURCES = AUTO

2
noatun/modules/infrared/Makefile.am
Unescape View File

@ -6,7 +6,7 @@ noatun_infrared_la_SOURCES = infrared.cpp lirc.cpp irprefs.cpp
noinst_HEADERS = infrared.h lirc.h irprefs.h noinst_HEADERS = infrared.h lirc.h irprefs.h
noatun_infrared_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined 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 -lqtmcop -lkmedia2_idl -lsoundserver_idl
noatun_infrared_la_METASOURCES = AUTO noatun_infrared_la_METASOURCES = AUTO

2
noatun/modules/kaiman/Makefile.am
Unescape View File

@ -9,7 +9,7 @@ noatun_kaiman_la_SOURCES = \
pref.cpp pref.cpp
noatun_kaiman_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined 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 -lqtmcop -lkmedia2_idl -lsoundserver_idl
noatun_kaiman_la_METASOURCES = AUTO noatun_kaiman_la_METASOURCES = AUTO

2
noatun/modules/keyz/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = noatun_keyz.la
noatun_keyz_la_SOURCES = keyz.cpp noatun_keyz_la_SOURCES = keyz.cpp
noatun_keyz_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined 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 noatun_keyz_la_METASOURCES = AUTO

2
noatun/modules/kjofol-skin/Makefile.am
Unescape View File

@ -23,7 +23,7 @@ noatun_kjofol_la_SOURCES = kjloader.cpp kjwidget.cpp kjbutton.cpp kjseeker.cpp \
kjskinselectorwidget.ui kjguisettingswidget.ui kjskinselectorwidget.ui kjguisettingswidget.ui
noatun_kjofol_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined 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 \ $(LIB_KIO) -lm \
$(top_builddir)/arts/modules/libartsmodules.la $(top_builddir)/arts/modules/libartsmodules.la

2
noatun/modules/marquis/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = noatun_marquis.la
noatun_marquis_la_SOURCES = marquis.cpp plugin.cpp noatun_marquis_la_SOURCES = marquis.cpp plugin.cpp
noatun_marquis_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined 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 -lqtmcop -lkmedia2_idl -lsoundserver_idl
noatun_marquis_la_METASOURCES = AUTO noatun_marquis_la_METASOURCES = AUTO

2
noatun/modules/monoscope/Makefile.am
Unescape View File

@ -5,7 +5,7 @@ noatun_monoscope_la_SOURCES = monoscope.cpp
#prefs.cpp #prefs.cpp
noatun_monoscope_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined 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 noatun_monoscope_la_METASOURCES = AUTO

2
noatun/modules/net/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = noatun_net.la
noatun_net_la_SOURCES = net.cpp noatun_net_la_SOURCES = net.cpp
noatun_net_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined 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 noatun_net_la_METASOURCES = AUTO

2
noatun/modules/noatunui/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = noatun_ui.la
noatun_ui_la_SOURCES = noatunui.cpp userinterface.cpp noatun_ui_la_SOURCES = noatunui.cpp userinterface.cpp
noatun_ui_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined 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 \ $(top_builddir)/noatun/library/libnoatuncontrols.la \
-lqtmcop -lkmedia2_idl -lsoundserver_idl -lqtmcop -lkmedia2_idl -lsoundserver_idl

2
noatun/modules/systray/Makefile.am
Unescape View File

@ -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_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 noatun_systray_la_METASOURCES = AUTO

2
noatun/modules/voiceprint/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = noatun_voiceprint.la
noatun_voiceprint_la_SOURCES = voiceprint.cpp prefs.cpp noatun_voiceprint_la_SOURCES = voiceprint.cpp prefs.cpp
noatun_voiceprint_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined 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 noatun_voiceprint_la_METASOURCES = AUTO

14
tdefile-plugins/Makefile.am
Unescape View File

@ -1,22 +1,22 @@
if include_ogg_SUBDIR if include_ogg_SUBDIR
KFILE_OGG_SUBDIR=ogg TDEFILE_OGG_SUBDIR=ogg
endif endif
if include_flac_SUBDIR if include_flac_SUBDIR
KFILE_FLAC_SUBDIR=flac TDEFILE_FLAC_SUBDIR=flac
endif endif
if include_mp3_SUBDIR if include_mp3_SUBDIR
KFILE_MP3_SUBDIR=mp3 TDEFILE_MP3_SUBDIR=mp3
endif endif
if include_mpc_SUBDIR if include_mpc_SUBDIR
KFILE_MPC_SUBDIR=mpc TDEFILE_MPC_SUBDIR=mpc
endif endif
if include_theora_SUBDIR if include_theora_SUBDIR
KFILE_THEORA_SUBDIR=theora TDEFILE_THEORA_SUBDIR=theora
endif endif
SUBDIRS=m3u $(KFILE_MP3_SUBDIR) $(KFILE_MPC_SUBDIR) au avi mpeg wav sid $(KFILE_OGG_SUBDIR) \ SUBDIRS=m3u $(TDEFILE_MP3_SUBDIR) $(TDEFILE_MPC_SUBDIR) au avi mpeg wav sid $(TDEFILE_OGG_SUBDIR) \
$(KFILE_FLAC_SUBDIR) $(KFILE_THEORA_SUBDIR) $(TDEFILE_FLAC_SUBDIR) $(TDEFILE_THEORA_SUBDIR)

4
tdefile-plugins/au/tdefile_au.h
Unescape View File

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

4
tdefile-plugins/avi/tdefile_avi.h
Unescape View File

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

4
tdefile-plugins/flac/tdefile_flac.h
Unescape View File

@ -21,8 +21,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef __KFILE_FLAC_H__ #ifndef __TDEFILE_FLAC_H__
#define __KFILE_FLAC_H__ #define __TDEFILE_FLAC_H__
#include <tdefilemetainfo.h> #include <tdefilemetainfo.h>

4
tdefile-plugins/mp3/tdefile_mp3.h
Unescape View File

@ -16,8 +16,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef __KFILE_MP3_H__ #ifndef __TDEFILE_MP3_H__
#define __KFILE_MP3_H__ #define __TDEFILE_MP3_H__
#include <tdefilemetainfo.h> #include <tdefilemetainfo.h>

4
tdefile-plugins/mpc/tdefile_mpc.h
Unescape View File

@ -21,8 +21,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef __KFILE_MPC_H__ #ifndef __TDEFILE_MPC_H__
#define __KFILE_MPC_H__ #define __TDEFILE_MPC_H__
#include <tdefilemetainfo.h> #include <tdefilemetainfo.h>

4
tdefile-plugins/mpeg/tdefile_mpeg.h
Unescape View File

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

4
tdefile-plugins/ogg/tdefile_ogg.h
Unescape View File

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

4
tdefile-plugins/sid/tdefile_sid.h
Unescape View File

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

6
tdefile-plugins/theora/tdefile_theora.h
Unescape View File

@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#ifndef __KFILE_THEORA_H__ #ifndef __TDEFILE_THEORA_H__
#define __KFILE_THEORA_H__ #define __TDEFILE_THEORA_H__
/** /**
* Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h> * Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h>
@ -39,5 +39,5 @@ public:
virtual bool readInfo( KFileMetaInfo& info, uint what); virtual bool readInfo( KFileMetaInfo& info, uint what);
}; };
#endif // __KFILE_THEORA_H__ #endif // __TDEFILE_THEORA_H__

4
tdefile-plugins/wav/tdefile_wav.h
Unescape View File

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

2
tdemid/Makefile.am
Unescape View File

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libtdemidpart.la
lib_LTLIBRARIES = libtdemidlib.la lib_LTLIBRARIES = libtdemidlib.la
libtdemidlib_la_LDFLAGS = $(all_libraries) 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_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
libtdemidpart_la_LIBADD = libtdemidlib.la libtdemidpart_la_LIBADD = libtdemidlib.la

Write Preview
Loading…
Cancel
Save