Fixed broken build (and removed non-functional broken fix). API

subdirs must be built first, before client.

svn path=/trunk/boinc/; revision=4803
This commit is contained in:
Bruce Allen 2004-12-09 10:23:56 +00:00
parent f4ef0f5126
commit 927a11ce93
3 changed files with 12 additions and 2 deletions

View File

@ -16,7 +16,9 @@ if BUILD_CLIENTGUI
CLIENTGUI_SUBDIRS = clientgui CLIENTGUI_SUBDIRS = clientgui
endif endif
SUBDIRS = m4 RSAEuro $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS) $(CLIENTGUI_SUBDIRS) $(API_SUBDIRS) # ORDER MATTERS below. One must build dependencies FIRST, then things
# that depend on them later
SUBDIRS = m4 RSAEuro $(API_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS) $(CLIENTGUI_SUBDIRS)
# Putting a directory name recursively copies the entire contents - the # Putting a directory name recursively copies the entire contents - the
# dist-hook below gets rid of CVS directories. # dist-hook below gets rid of CVS directories.

View File

@ -20943,3 +20943,11 @@ David 8 Dec 2004
boinc_api.C,h boinc_api.C,h
client/ client/
Makefile.am Makefile.am
Bruce 9 Dec 2004
- Fixed broken build (and removed non-functional broken fix). API
subdirs must be built first.
Makefile.am
client/
Makefile.am

View File

@ -51,7 +51,7 @@ boinc_client_SOURCES = \
time_stats.C \ time_stats.C \
whetstone.C whetstone.C
boinc_client_DEPENDENCIES = $(LIBRSA) ../lib boinc_client_DEPENDENCIES = $(LIBRSA)
boinc_client_CPPFLAGS = -I $(srcdir)/win $(AM_CPPFLAGS) -O3 boinc_client_CPPFLAGS = -I $(srcdir)/win $(AM_CPPFLAGS) -O3
boinc_client_LDADD = -L../lib -lboinc $(RSA_LIBS) $(PTHREAD_LIBS) boinc_client_LDADD = -L../lib -lboinc $(RSA_LIBS) $(PTHREAD_LIBS)
#boinc_client_LDFLAGS = $(STATIC_FLAGS) #boinc_client_LDFLAGS = $(STATIC_FLAGS)