Skip to content

Commit c4b79a7

Browse files
committed
sim headers are now installed at $(prefix)/sim/include
Added script to generate sim/include Makefile.am
1 parent a64671c commit c4b79a7

4 files changed

Lines changed: 12 additions & 2 deletions

File tree

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ AC_CONFIG_HEADERS([chimbuko_config.h])
159159
AC_SUBST([PS_FLAGS])
160160

161161
AC_CONFIG_SRCDIR([src/chimbuko.cpp])
162-
AC_CONFIG_FILES([Makefile src/Makefile app/Makefile sphinx/Makefile include/Makefile 3rdparty/Makefile test/Makefile test/unit_tests/Makefile test/unit_tests/ad/Makefile test/unit_tests/util/Makefile test/unit_tests/pserver/Makefile test/unit_tests/net/Makefile test/unit_tests/param/Makefile scripts/Makefile scripts/launch/Makefile sim/Makefile sim/src/Makefile sim/main/Makefile])
162+
AC_CONFIG_FILES([Makefile src/Makefile app/Makefile sphinx/Makefile include/Makefile 3rdparty/Makefile test/Makefile test/unit_tests/Makefile test/unit_tests/ad/Makefile test/unit_tests/util/Makefile test/unit_tests/pserver/Makefile test/unit_tests/net/Makefile test/unit_tests/param/Makefile scripts/Makefile scripts/launch/Makefile sim/Makefile sim/src/Makefile sim/main/Makefile sim/include/Makefile])
163163

164164
AC_CONFIG_FILES([app/ws_flask_stat.py:app/ws_flask_stat.py app/sst_view_parse.pl:app/sst_view_parse.pl])
165165
AC_CONFIG_FILES([run_test.sh:run_test.sh test/run_all.sh:test/run_all.sh test/run_ad.sh:test/run_ad.sh test/run_net.sh:test/run_net.sh test/run_provdb_client_test.sh:test/run_provdb_client_test.sh test/run_provdb_autoshutdown_test.sh:test/run_provdb_autoshutdown_test.sh test/unit_tests/run_all.sh:test/unit_tests/run_all.sh test/run_ad_with_provdb.sh:test/run_ad_with_provdb.sh test/run_stat_sender.sh:test/run_stat_sender.sh scripts/launch/run_services.sh:scripts/launch/run_services.sh], [chmod u+x $(echo $ac_tag | sed s/.*\://)])

scripts/getSimHeaders.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#Generate a Makefile for the sim/include directory (run from inside the directory)
2+
echo 'simincdir = $(prefix)/sim/include' > Makefile.am
3+
4+
echo -n 'nobase_siminc_HEADERS = ' >> Makefile.am
5+
6+
for i in $(find . -name '*.hpp' | sed 's/^\.\///'); do
7+
echo -n "$i " >> Makefile.am
8+
done

sim/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SUBDIRS = src main
1+
SUBDIRS = src main include

sim/include/Makefile.am

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
simincdir = $(prefix)/sim/include
2+
nobase_siminc_HEADERS = sim/event_id_map.hpp sim/id_map.hpp sim/ad_params.hpp sim/ad.hpp sim/pserver.hpp sim/thread_execution_api.hpp sim/provdb.hpp sim.hpp

0 commit comments

Comments
 (0)