Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

samples: unify installation target #5829

Merged
merged 1 commit into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,16 @@ samples/multi_thread/*multi_thread
samples/sleeper/*sleeper
samples/vboxmonitor/*vboxmonitor
samples/vboxwrapper/*vboxwrapper
samples/vboxwrapper/vboxwrapper_*-*
samples/worker/*worker
samples/worker/worker_*-*
samples/wrapper/*wrapper
samples/wrapper/wrapper_*-*
samples/openclapp/*openclapp
samples/wrappture/*wrappture_example
samples/wrappture/*fermi
samples/**/*.exe
samples/sporadic/sporadic
sched/adjust_user_priority
sched/antique_file_deleter
sched/census
Expand Down
3 changes: 1 addition & 2 deletions samples/condor/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,4 @@ boinc_gahp: boinc_gahp.cpp $(BOINC_SOURCE_LIB_DIR)/remote_submit.h $(BOINC_SOURC
-o boinc_gahp boinc_gahp.cpp $(BOINC_SOURCE_LIB_DIR)/remote_submit.cpp \
-lcurl -lssl -lcrypto -lboinc $(CURL_EXTRA_LDFLAGS) $(MAKEFILE_LDFLAGS) $(STDCPPTC)

install:
echo "Install step"
install: all
2 changes: 1 addition & 1 deletion samples/example_app/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ clean: distclean
distclean:
/bin/rm -f $(PROGS) $(GUI_PROGS) $(addsuffix .exe, $(PROGS)) $(addsuffix .exe, $(GUI_PROGS)) *.o libstdc++.a ttfont.cpp

install: uc2
install: all

# specify library paths explicitly (rather than -l)
# because otherwise you might get a version in /usr/lib etc.
Expand Down
3 changes: 1 addition & 2 deletions samples/multi_thread/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,4 @@ distclean:
multi_thread: multi_thread.o $(MAKEFILE_STDLIB) $(BOINC_API_DIR)/libboinc_api.a $(BOINC_LIB_DIR)/libboinc.a
$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o multi_thread multi_thread.o $(MAKEFILE_LDFLAGS) -lboinc_api -lboinc $(STDCPPTC)

install:
echo "Install step"
install: all
2 changes: 1 addition & 1 deletion samples/openclapp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ clean:
distclean:
/bin/rm -f $(PROGS) *.o libstdc++.a

install: openclapp
install: all

openclapp: openclapp.o boinc_opencl.o libstdc++.a
$(CXX) $(CXXFLAGS) -o openclapp openclapp.o boinc_opencl.o \
Expand Down
2 changes: 1 addition & 1 deletion samples/sporadic/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ clean: distclean
distclean:
/bin/rm -f sporadic $(addsuffix .exe, sporadic) *.o libstdc++.a

install: sporadic
install: all

sporadic: sporadic.o $(MAKEFILE_STDLIB) $(BOINC_API_DIR)/libboinc_api.a $(BOINC_LIB_DIR)/libboinc.a
$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o sporadic sporadic.o \
Expand Down
2 changes: 2 additions & 0 deletions samples/vboxmonitor/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,5 @@ distclean:

vboxmonitor: vboxmonitor.o $(MAKEFILE_STDLIB) $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o vboxmonitor vboxmonitor.o $(MAKEFILE_LDFLAGS) -lboinc_api -lboinc $(STDCPPTC)

install: all
2 changes: 2 additions & 0 deletions samples/vboxwrapper/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,5 @@ vboxwrapper.o: vboxwrapper.cpp $(HEADERS)

vboxwrapper$(VBOXWRAPPER_RELEASE_SUFFIX): vboxwrapper.o vbox_common.o vbox_vboxmanage.o vboxcheckpoint.o vboxjob.o vboxlogging.o floppyio.o $(MAKEFILE_STDLIB) $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o vboxwrapper$(VBOXWRAPPER_RELEASE_SUFFIX) vboxwrapper.o vbox_common.o vbox_vboxmanage.o vboxcheckpoint.o vboxjob.o vboxlogging.o floppyio.o $(MAKEFILE_LDFLAGS) -lboinc_api -lboinc -lrt $(STDCPPTC)

install: all
2 changes: 2 additions & 0 deletions samples/wrappture/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,5 @@ wrappture_example: wrappture.o wrappture_example.o $(MAKEFILE_STDLIB) $(BOINC_LI

fermi: fermi.cpp
$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o fermi fermi.cpp

install: all
Loading