[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesdk/cervisia
From:       Benjamin Reed <ranger () befunk ! com>
Date:       2005-03-04 17:25:46
Message-ID: 20050304172546.A289A157B9 () office ! kde ! org
[Download RAW message or body]

CVS commit by reed: 

fix bus errors on Mac OS X


  M +7 -5      Makefile.am   1.68
  M +1 -1      main.cpp   1.22
  M +12 -8     cvsservice/Makefile.am   1.13
  M +1 -1      cvsservice/cvsaskpass.cpp   1.6
  M +1 -1      cvsservice/main.cpp   1.3


--- kdesdk/cervisia/Makefile.am  #1.67:1.68
@@ -4,5 +4,7 @@
 SUBDIRS = cvsservice . pics
 
-bin_PROGRAMS = cervisia
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+kdeinit_LTLIBRARIES = cervisia.la
 kde_module_LTLIBRARIES = libcervisiapart.la
 noinst_LTLIBRARIES = libcervisia.la
@@ -28,8 +30,8 @@
 libcervisiapart_la_COMPILE_FIRST = cvsservice/cvsservice_stub.h cervisiasettings.h
 
-cervisia_SOURCES = main.cpp cervisiashell.cpp
-cervisia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-cervisia_LDADD = $(LIB_KPARTS) $(LIB_KUTILS) cvsservice/libcvsservice.la libcervisia.la
-cervisia_COMPILE_FIRST = cvsservice/cvsservice_stub.h cervisiasettings.h
+cervisia_la_SOURCES = main.cpp cervisiashell.cpp
+cervisia_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
+cervisia_la_LIBADD = $(LIB_KPARTS) $(LIB_KUTILS) cvsservice/libcvsservice.la libcervisia.la
+cervisia_la_COMPILE_FIRST = cvsservice/cvsservice_stub.h cervisiasettings.h
 
 man_MANS = cervisia.1

--- kdesdk/cervisia/main.cpp  #1.21:1.22
@@ -132,5 +132,5 @@ static int ShowAnnotateDialog(const QStr
 
 
-int main(int argc, char **argv)
+extern "C" int kdemain(int argc, char **argv)
 {
     static KCmdLineOptions options[] = {

--- kdesdk/cervisia/cvsservice/Makefile.am  #1.12:1.13
@@ -9,16 +9,17 @@
 
 # cvs DCOP service
-bin_PROGRAMS = cvsservice cvsaskpass
+bin_PROGRAMS =
+kdeinit_LTLIBRARIES = cvsservice.la cvsaskpass.la
 
-cvsservice_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-cvsservice_LDADD = $(LIB_KIO)
-cvsservice_SOURCES = main.cpp cvsservice.cpp cvsjob.cpp \
+cvsservice_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+cvsservice_la_LIBADD = $(LIB_KIO)
+cvsservice_la_SOURCES = main.cpp cvsservice.cpp cvsjob.cpp \
         cvsservice.skel cvsservice.stub cvsjob.skel cvsjob.stub \
         repository.cpp repository.skel repository.stub sshagent.cpp \
         cvsserviceutils.cpp cvsloginjob.cpp cvsloginjob.skel cvsloginjob.stub
 
-cvsaskpass_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-cvsaskpass_LDADD = $(LIB_KDEUI)
-cvsaskpass_SOURCES = cvsaskpass.cpp
+cvsaskpass_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+cvsaskpass_la_LIBADD = $(LIB_KDEUI)
+cvsaskpass_la_SOURCES = cvsaskpass.cpp
 
 include_HEADERS = cvsservice_stub.h cvsjob_stub.h repository_stub.h
@@ -31,5 +32,8 @@
 libcvsservice_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 0:1
 libcvsservice_la_LIBADD = $(LIB_KDECORE)
-libcvsservice_la_SOURCES = cvsservice.stub cvsjob.stub repository.stub
+libcvsservice_la_SOURCES = cvsservice.stub cvsjob.stub repository.stub dummy.cpp
+
+dummy.cpp:
+        echo > dummy.cpp
 
 # let automoc handle all of the meta source files (moc)

--- kdesdk/cervisia/cvsservice/cvsaskpass.cpp  #1.5:1.6
@@ -36,5 +36,5 @@ static KCmdLineOptions options[] =
 
 
-int main(int argc, char** argv)
+extern "C" int kdemain(int argc, char** argv)
 {
     KAboutData about("cvsaskpass", I18N_NOOP("cvsaskpass"), "0.1",

--- kdesdk/cervisia/cvsservice/main.cpp  #1.2:1.3
@@ -26,5 +26,5 @@
 
 
-int main(int argc, char** argv)
+extern "C" int kdemain(int argc, char** argv)
 {
     KAboutData about("cvsservice", I18N_NOOP("CVS DCOP service"), "0.1",


[prev in list] [next in list] [prev in thread] [next in thread]