From 74dcb7ab207b731cb3df55154e8023b9ebbd6bc0 Mon Sep 17 00:00:00 2001 From: Karl Chen Date: Sat, 14 Jun 2003 21:52:52 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=1481 --- lib/Makefile.am | 7 +++++++ lib/Makefile.in | 34 +++++++++++++++++----------------- sched/start | 4 ++-- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index 2f82590dd9..2d65363657 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -8,6 +8,13 @@ noinst_LIBRARIES = libboinc.a EXTRA_DIST = result_state.h libboinc_a_SOURCES = \ + api_app.C \ + api_test.C \ + boinc_api.C \ + graphics_api.C \ + graphics_data.C \ + mfile.C \ + x_opengl.C \ app_ipc.C \ countries.C \ parse.C \ diff --git a/lib/Makefile.in b/lib/Makefile.in index a01245a57f..d6d8fac19a 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -51,20 +51,7 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLIENT_BIN_FILENAME = @CLIENT_BIN_FILENAME@ CPP = @CPP@ - -CPPFLAGS = -g -Wall \ - -DHOSTTYPE=\"@host@\" \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/api \ - -I$(top_srcdir)/db \ - -I$(top_srcdir)/RSAEuro/source \ - -I$(top_srcdir)/client \ - -I$(top_srcdir)/tools \ - -I$(MYSQL_INCLUDES) \ - -I$(MYSQL_INCLUDES2) \ - -I$(MYSQL_INCLUDES3) \ - -include $(top_srcdir)/config.h - +CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -162,7 +149,22 @@ RSA_LIBS = \ -lrsaeuro -# -pedantic +AM_CFLAGS = -g -Wall +AM_CXXFLAGS = -g -Wall + +AM_CPPFLAGS = \ + -DHOSTTYPE=\"@host@\" \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/api \ + -I$(top_srcdir)/db \ + -I$(top_srcdir)/RSAEuro/source \ + -I$(top_srcdir)/client \ + -I$(top_srcdir)/tools \ + -I$(MYSQL_INCLUDES) \ + -I$(MYSQL_INCLUDES2) \ + -I$(MYSQL_INCLUDES3) \ + -include $(top_srcdir)/config.h + # this is useful as a dependency to make sure librsaeuro gets compiled before # programs linking to it: @@ -579,8 +581,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-info-am - # -DVERSION=$(VERSION) - $(LIBRSA): cd $(top_builddir)/RSAEuro/source; ${MAKE} librsaeuro.a # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/sched/start b/sched/start index 8aee4cf0fc..23d09f54ea 100755 --- a/sched/start +++ b/sched/start @@ -213,10 +213,10 @@ def double_fork(): # Do second fork. try: pid = os.fork() - if pid > 0: sys.exit(0) # Exit second parent. + if pid > 0: sys._exit(0) # Exit second parent. except OSError, e: sys.stderr.write("fork #2 failed: (%d) %s\n" % (e.errno, e.strerror)) - sys.exit(1) + sys._exit(1) return 0 def write_pid_file(pidfile):