diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /kdesktop/Makefile.am | |
| parent | eba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff) | |
| download | tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kdesktop/Makefile.am')
| -rw-r--r-- | kdesktop/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kdesktop/Makefile.am b/kdesktop/Makefile.am index f363ac17e..959018afb 100644 --- a/kdesktop/Makefile.am +++ b/kdesktop/Makefile.am @@ -15,7 +15,7 @@ noinst_LTLIBRARIES = libkdesktopsettings.la libkdesktopsettings_la_LDFLAGS = $(all_libraries) -no-undefined libkdesktopsettings_la_LIBADD = $(LIB_TDECORE) -libkdesktopsettings_la_SOURCES = kdesktopsettings.kcfgc klaunchsettings.kcfgc +libkdesktopsettings_la_SOURCES = kdesktopsettings.kcfgc tdelaunchsettings.kcfgc kdesktop_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \ lockeng.cc KDesktopIface.skel \ @@ -56,10 +56,10 @@ lockeng.lo: kdesktopsettings.h main.lo: kdesktopsettings.h minicli.lo: kdesktopsettings.h -# List made with: grep -l klaunchsettings.h *[pc] | sed -e 's/\.c.*$/.lo: klaunchsettings.h/' -desktop.lo: klaunchsettings.h -klaunchsettings.lo: klaunchsettings.h -startupid.lo: klaunchsettings.h +# List made with: grep -l tdelaunchsettings.h *[pc] | sed -e 's/\.c.*$/.lo: tdelaunchsettings.h/' +desktop.lo: tdelaunchsettings.h +tdelaunchsettings.lo: tdelaunchsettings.h +startupid.lo: tdelaunchsettings.h messages: rc.cpp $(EXTRACTRC) lock/*.ui >> rc.cpp @@ -74,4 +74,4 @@ autostartdir = $(datadir)/autostart konqservice_DATA = kdesktopSetAsBackground.desktop konqservicedir = $(kde_datadir)/konqueror/servicemenus -kde_kcfg_DATA = kdesktop.kcfg klaunch.kcfg +kde_kcfg_DATA = kdesktop.kcfg tdelaunch.kcfg |