Rename a few build variables for overall consistency

pull/1/head
Timothy Pearson 12 years ago
parent 84e0480c01
commit ddb3ecbfc4

@ -1,6 +1,6 @@
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
LDADD = $(LIB_KSYCOCA) $(LIB_KFILE) LDADD = $(LIB_KSYCOCA) $(LIB_TDEFILE)
SUBDIRS = designer pics SUBDIRS = designer pics

@ -15,7 +15,7 @@ kde_module_LTLIBRARIES = konqsidebar_mediaplayer.la
# the Part's source, library search path, and link libraries # the Part's source, library search path, and link libraries
konqsidebar_mediaplayer_la_SOURCES = mediawidget_skel.ui engine.cpp player.cpp mediawidget.cpp mediaplayer.cpp controls.cpp konqsidebar_mediaplayer_la_SOURCES = mediawidget_skel.ui engine.cpp player.cpp mediawidget.cpp mediaplayer.cpp controls.cpp
konqsidebar_mediaplayer_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) konqsidebar_mediaplayer_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
konqsidebar_mediaplayer_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) -lkonqsidebarplugin -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde konqsidebar_mediaplayer_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEFILE) -lkonqsidebarplugin -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde
globaladddir = $(kde_datadir)/konqsidebartng/add globaladddir = $(kde_datadir)/konqsidebartng/add
globaladd_DATA = mplayer_add.desktop globaladd_DATA = mplayer_add.desktop

@ -17,7 +17,7 @@ konq_sidebarnews_la_SOURCES = sidebar_news.cpp sidebar_news.skel nsstacktabwidge
sidebarsettings.kcfgc \ sidebarsettings.kcfgc \
configfeedsbase.ui configfeeds.cpp configfeedsbase.ui configfeeds.cpp
konq_sidebarnews_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) konq_sidebarnews_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
konq_sidebarnews_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) -lkonqsidebarplugin konq_sidebarnews_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEFILE) -lkonqsidebarplugin
globaladddir = $(kde_datadir)/konqsidebartng/add globaladddir = $(kde_datadir)/konqsidebartng/add

@ -6,7 +6,7 @@ noatunwakeup_la_SOURCES = wakeup.cpp \
kpercentspinbox.cpp kpercentspinbox.cpp
noatunwakeup_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined noatunwakeup_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
noatunwakeup_la_LIBADD = $(LIB_KFILE) -lnoatun -lm noatunwakeup_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm
noatunwakeup_la_METASOURCES = AUTO noatunwakeup_la_METASOURCES = AUTO

@ -3,7 +3,7 @@ INCLUDES= $(all_includes) $(SDL_CFLAGS) -I$(kde_includes)/tde
kde_module_LTLIBRARIES = noatunblurscope.la kde_module_LTLIBRARIES = noatunblurscope.la
noatunblurscope_la_SOURCES = sdlscope.cpp scopedisplayer.cpp noatunblurscope_la_SOURCES = sdlscope.cpp scopedisplayer.cpp
noatunblurscope_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) noatunblurscope_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
noatunblurscope_la_LIBADD = $(LIB_KFILE) -lnoatun -lm $(SDL_LIBS) noatunblurscope_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm $(SDL_LIBS)
noatunblurscope_la_METASOURCES = AUTO noatunblurscope_la_METASOURCES = AUTO
noatun_DATA = blurscope.plugin noatun_DATA = blurscope.plugin

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = noatun_ffrs.la
noatun_ffrs_la_SOURCES = ffrs.cpp noatun_ffrs_la_SOURCES = ffrs.cpp
noatun_ffrs_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined noatun_ffrs_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
noatun_ffrs_la_LIBADD = $(LIB_KFILE) -lnoatun -lm noatun_ffrs_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm
noatun_ffrs_la_METASOURCES = AUTO noatun_ffrs_la_METASOURCES = AUTO

@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = noatunluckytag.la
noatunluckytag_la_SOURCES = luckytag.cpp parsedmp3filename.cpp noatunluckytag_la_SOURCES = luckytag.cpp parsedmp3filename.cpp
noatunluckytag_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined noatunluckytag_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
noatunluckytag_la_LIBADD = $(LIB_KFILE) -lnoatun -lnoatuntags noatunluckytag_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lnoatuntags
noatunluckytag_la_METASOURCES = AUTO noatunluckytag_la_METASOURCES = AUTO

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = noatunlyrics.la
noatunlyrics_la_SOURCES = lyrics.cpp historymanager.cpp cmodule.cpp noatunlyrics_la_SOURCES = lyrics.cpp historymanager.cpp cmodule.cpp
noatunlyrics_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined noatunlyrics_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
noatunlyrics_la_LIBADD = $(LIB_TDEHTML) $(LIB_KFILE) -lnoatun noatunlyrics_la_LIBADD = $(LIB_TDEHTML) $(LIB_TDEFILE) -lnoatun
noatunlyrics_la_METASOURCES = AUTO noatunlyrics_la_METASOURCES = AUTO

@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = noatunnexscope.la
noatunnexscope_la_SOURCES = noatunplugin.cpp noatunnexscope_la_SOURCES = noatunplugin.cpp
noatunnexscope_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined noatunnexscope_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
noatunnexscope_la_LIBADD = $(LIB_KFILE) -lnoatun noatunnexscope_la_LIBADD = $(LIB_TDEFILE) -lnoatun
bin_PROGRAMS = nexscope.bin bin_PROGRAMS = nexscope.bin

@ -3,7 +3,7 @@ INCLUDES= $(all_includes) -I$(kde_includes)/tde
kde_module_LTLIBRARIES = noatunmadness.la kde_module_LTLIBRARIES = noatunmadness.la
noatunmadness_la_SOURCES = madness.cpp noatunmadness_la_SOURCES = madness.cpp
noatunmadness_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined noatunmadness_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
noatunmadness_la_LIBADD = $(LIB_KFILE) -lnoatun -lm noatunmadness_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm
noatunmadness_la_METASOURCES = AUTO noatunmadness_la_METASOURCES = AUTO
noatun_DATA = madness.plugin noatun_DATA = madness.plugin

@ -2,7 +2,7 @@ INCLUDES= -I$(kde_includes)/arts $(all_includes) -I$(kde_includes)/tde
kde_module_LTLIBRARIES = noatunpitchablespeed.la kde_module_LTLIBRARIES = noatunpitchablespeed.la
noatunpitchablespeed_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined noatunpitchablespeed_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
noatunpitchablespeed_la_LIBADD = $(LIB_KFILE) -lnoatun -lm -lartsmodules noatunpitchablespeed_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm -lartsmodules
noatunpitchablespeed_la_SOURCES = pitchablespeed.cpp speedtuner.ui noatunpitchablespeed_la_SOURCES = pitchablespeed.cpp speedtuner.ui
noatunpitchablespeed_la_METASOURCES = AUTO noatunpitchablespeed_la_METASOURCES = AUTO

@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = noatunsynaescope.la
noatunsynaescope_la_SOURCES = synaescope.cpp cmodule.cpp noatunsynaescope_la_SOURCES = synaescope.cpp cmodule.cpp
noatunsynaescope_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined noatunsynaescope_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
noatunsynaescope_la_LIBADD = $(LIB_KFILE) -lnoatun -lm noatunsynaescope_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm
bin_PROGRAMS = noatunsynaescope.bin bin_PROGRAMS = noatunsynaescope.bin

@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = noatuntippecanoe.la
noatuntippecanoe_la_SOURCES = synaescope.cpp noatuntippecanoe_la_SOURCES = synaescope.cpp
noatuntippecanoe_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined noatuntippecanoe_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
noatuntippecanoe_la_LIBADD = $(LIB_KFILE) -lnoatun -lm noatuntippecanoe_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm
bin_PROGRAMS = noatuntippecanoe.bin bin_PROGRAMS = noatuntippecanoe.bin

@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = noatuntyler.la
noatuntyler_la_SOURCES = tyler.cpp noatuntyler_la_SOURCES = tyler.cpp
noatuntyler_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined noatuntyler_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
noatuntyler_la_LIBADD = $(LIB_KFILE) -lnoatun -lm noatuntyler_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm
bin_PROGRAMS = noatuntyler.bin bin_PROGRAMS = noatuntyler.bin

@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = noatunwavecapture.la
noatunwavecapture_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined noatunwavecapture_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
noatunwavecapture_la_LIBADD = $(LIB_KFILE) -lnoatun -lm -lartsmodules noatunwavecapture_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm -lartsmodules
noatunwavecapture_la_SOURCES = wavecapture.cpp noatunwavecapture_la_SOURCES = wavecapture.cpp
noatunwavecapture_la_METASOURCES = AUTO noatunwavecapture_la_METASOURCES = AUTO

@ -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_CERT_H__ #ifndef __TDEFILE_CERT_H__
#define __KFILE_CERT_H__ #define __TDEFILE_CERT_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_CERT_H__ #endif // __TDEFILE_CERT_H__

@ -17,8 +17,8 @@
* *
*/ */
#ifndef __KFILE_DESKTOP_H__ #ifndef __TDEFILE_DESKTOP_H__
#define __KFILE_DESKTOP_H__ #define __TDEFILE_DESKTOP_H__
#include <tdefilemetainfo.h> #include <tdefilemetainfo.h>
#include <kurl.h> #include <kurl.h>

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

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

@ -19,8 +19,8 @@
***************************************************************************/ ***************************************************************************/
#ifndef __KFILE_MHTML_H__ #ifndef __TDEFILE_MHTML_H__
#define __KFILE_MHTML_H__ #define __TDEFILE_MHTML_H__
/** /**
* Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h> * Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h>
@ -42,5 +42,5 @@ private:
TQString decodeRFC2047String(const TQString &msg); TQString decodeRFC2047String(const TQString &msg);
}; };
#endif // __KFILE_MHTML_H__ #endif // __TDEFILE_MHTML_H__

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

Loading…
Cancel
Save