Commit 9e3b5398 authored by pwrd's avatar pwrd Committed by Claes Sjöfors

Build fixes

parent f5b96fd7
...@@ -139,10 +139,15 @@ $(export_lib) : $(objects) ...@@ -139,10 +139,15 @@ $(export_lib) : $(objects)
fi fi
jar cfm $(export_lib) manifest.stub jar cfm $(export_lib) manifest.stub
@ cd $(pwre_broot)/$(pwre_target)/bld; \ @ cd $(pwre_broot)/$(pwre_target)/bld; \
echo "Inserting png and gif files"; \ echo "Inserting png and gif files " $(comp_name); \
jar uf $(export_lib) jpwr/$(comp_name)/*.gif; \ jar uf $(export_lib) jpwr/$(comp_name)/*.gif; \
jar uf $(export_lib) jpwr/$(comp_name)/*.png; \ jar uf $(export_lib) jpwr/$(comp_name)/*.png; \
find jpwr/$(comp_name) -name "*.class" -exec jar uf $(export_lib) {} \;; \ dirname=$(comp_name); \
if [ $(comp_name) == "rt_client" ]; then \
find jpwr/rt -name "*.class" -exec jar uf $(export_lib) {} \;; \
else \
find jpwr/$(comp_name) -name "*.class" -exec jar uf $(export_lib) {} \;; \
fi; \
chmod a+r $(export_lib); chmod a+r $(export_lib);
# @ jar cvfm $(export_lib) manifest.stub jpwr/$(comp_name)/*.class jpwr/$(comp_name)/*.gif # @ jar cvfm $(export_lib) manifest.stub jpwr/$(comp_name)/*.class jpwr/$(comp_name)/*.gif
......
...@@ -450,8 +450,8 @@ else ...@@ -450,8 +450,8 @@ else
pwre_config_check_lib libsqlite3 LIBSQLITE3 lib lib 0 "/usr/lib/libsqlite3.so:/usr/lib/$hwpl-linux-$gnu/libsqlite3.so" pwre_config_check_lib libsqlite3 LIBSQLITE3 lib lib 0 "/usr/lib/libsqlite3.so:/usr/lib/$hwpl-linux-$gnu/libsqlite3.so"
pwre_config_check_include hdf5 HDF5 1 "/usr/lib/openmpi/include/mpi.h:/usr/lib/$hwpl-linux-$gnu/openmpi/include/mpi.h" pwre_config_check_include hdf5 HDF5 1 "/usr/lib/openmpi/include/mpi.h:/usr/lib/$hwpl-linux-$gnu/openmpi/include/mpi.h"
pwre_config_check_include hdf5 HDF5 1 "/usr/include/hdf5/openmpi/hdf5.h:/usr/lib/$hwpl-linux-$gnu/hdf5/openmpi/include/hdf5.h" pwre_config_check_include hdf5 HDF5 1 "/usr/include/hdf5/openmpi/hdf5.h:/usr/lib/$hwpl-linux-$gnu/hdf5/openmpi/include/hdf5.h"
pwre_config_check_lib libhdf5 LIBHDF5 lib lib 0 "/usr/lib/libhdf5.so:/usr/lib/$hwpl-linux-$gnu/libhdf5_openmpi.so:/usr/lib/$hwpl-linux-$gnu/libmpi.so.20" pwre_config_check_lib libhdf5 LIBHDF5 lib lib 0 "/usr/lib/libhdf5.so:/usr/lib/$hwpl-linux-$gnu/libhdf5_openmpi.so:/usr/lib/$hwpl-linux-$gnu/libmpi.so"
pwre_config_check_lib libhdf5 LIBHDF5 lib lib 0 "/usr/lib/$hwpl-linux-$gnu/libmpi.so.20" pwre_config_check_lib libhdf5 LIBHDF5 lib lib 0 "/usr/lib/$hwpl-linux-$gnu/libmpi.so"
pwre_config_check_lib rabbitmq RABBITMQ lib rabbitmq 1 "/usr/lib/$hwpl-linux-$gnu/librabbitmq.so" pwre_config_check_lib rabbitmq RABBITMQ lib rabbitmq 1 "/usr/lib/$hwpl-linux-$gnu/librabbitmq.so"
pwre_config_check_lib mq MQ lib mq 1 "/usr/lib/libdmq.so:/usr/local/dmq/lib/libdmq.so:/usr/local/lib/libdmq.so" pwre_config_check_lib mq MQ lib mq 1 "/usr/lib/libdmq.so:/usr/local/dmq/lib/libdmq.so:/usr/local/lib/libdmq.so"
pwre_config_check_lib wmq WMQ lib wmq 1 "/usr/lib/libmqic.so" pwre_config_check_lib wmq WMQ lib wmq 1 "/usr/lib/libmqic.so"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment