Merge pull request #5829 from BOINC/vko_unify_samples_install

samples: unify installation target
BOINC · Oct 1, 2024 · 711d4f1 · 711d4f1
2 parents 3a278c1 + 3cffc41
commit 711d4f1
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -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

diff --git a/samples/condor/Makefile b/samples/condor/Makefile
@@ -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
diff --git a/samples/example_app/Makefile b/samples/example_app/Makefile
@@ -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.

diff --git a/samples/multi_thread/Makefile b/samples/multi_thread/Makefile
@@ -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
diff --git a/samples/openclapp/Makefile b/samples/openclapp/Makefile
@@ -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 \

diff --git a/samples/sporadic/Makefile b/samples/sporadic/Makefile
@@ -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 \

diff --git a/samples/vboxmonitor/Makefile b/samples/vboxmonitor/Makefile
@@ -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
diff --git a/samples/vboxwrapper/Makefile b/samples/vboxwrapper/Makefile
@@ -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
diff --git a/samples/wrappture/Makefile b/samples/wrappture/Makefile
@@ -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