Don't link against kdeinit modules (AKA brockterribleword).

svn path=/trunk/kdebase/kwin/; revision=233862

Makefile.am

@@ -2,8 +2,7 @@ INCLUDES = $(all_includes)
 
 SUBDIRS = . kcmkwin pics clients
 
-bin_PROGRAMS = kwin
-lib_LTLIBRARIES = kwin.la
+kdeinit_LTLIBRARIES = kwin.la
 
 # workspace.cpp has to be first in order not to break --enable-final
 kwin_la_SOURCES = workspace.cpp client.cpp placement.cpp atoms.cpp  main.cpp \
@@ -17,10 +16,6 @@ include_HEADERS = KWinInterface.h
 kwinincludedir = $(includedir)/kwin
 kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h
 
-kwin_SOURCES = kwin_main.cpp
-kwin_LDADD = kwin.la
-kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-
 KDE_ICON = kwin
 
 METASOURCES = AUTO

kwin_main.cpp

@@ -1,7 +0,0 @@
-extern "C" { int kdemain(int, char *[]); }
-
-int main(int c, char *v[])
-{
-  return kdemain(c,v);
-}
-

main.cpp

@@ -190,7 +190,6 @@ static void sighandler(int) {
 static const char *version = "0.95";
 static const char *description = I18N_NOOP( "The KDE window manager." );
 
-extern "C" { int kdemain(int, char *[]); }
 
 static KCmdLineOptions args[] =
 {
@@ -198,7 +197,7 @@ static KCmdLineOptions args[] =
     KCmdLineLastOption
 };
 
-int kdemain( int argc, char * argv[] )
+extern "C" int kdemain( int argc, char * argv[] )
 {
     bool restored = false;
     for (int arg = 1; arg < argc; arg++) {