|
|
37486b6 |
diff -up frysk-0.4/frysk-common/Makefile.gen.sh.nopkglibdir frysk-0.4/frysk-common/Makefile.gen.sh
|
|
|
37486b6 |
--- frysk-0.4/frysk-common/Makefile.gen.sh.nopkglibdir 2012-02-11 23:00:39.095000078 -0500
|
|
|
37486b6 |
+++ frysk-0.4/frysk-common/Makefile.gen.sh 2012-02-11 23:00:39.544000078 -0500
|
|
|
37486b6 |
@@ -225,7 +225,10 @@ echo_PROGRAMS ()
|
|
|
37486b6 |
*dir/* )
|
|
|
37486b6 |
# extract the directory prefix
|
|
|
37486b6 |
local dir=`echo /"$1" | sed -e 's,.*/\([a-z]*\)dir/.*,\1,'`
|
|
|
37486b6 |
- echo "${dir}_PROGRAMS += $1"
|
|
|
37486b6 |
+ case $dir in
|
|
|
37486b6 |
+ pkglib ) echo "noinst_PROGRAMS += $1" ;;
|
|
|
37486b6 |
+ * ) echo "${dir}_PROGRAMS += $1" ;;
|
|
|
37486b6 |
+ esac
|
|
|
37486b6 |
;;
|
|
|
37486b6 |
* )
|
|
|
37486b6 |
echo "noinst_PROGRAMS += $1"
|
|
|
37486b6 |
@@ -726,8 +729,16 @@ do
|
|
|
37486b6 |
do
|
|
|
37486b6 |
d=`dirname $file`
|
|
|
37486b6 |
b=`basename $file ${suffix}`
|
|
|
37486b6 |
- echo `expr $d : '.*/\([a-z]*\)dir'`_SCRIPTS += $d/$b
|
|
|
37486b6 |
- check_MANS $d/$b
|
|
|
37486b6 |
+ dir=`expr $d : '.*/\([a-z]*\)dir'`
|
|
|
37486b6 |
+ case $dir in
|
|
|
37486b6 |
+ pkglib )
|
|
|
37486b6 |
+ echo noinst_SCRIPTS += $d/$b
|
|
|
37486b6 |
+ ;;
|
|
|
37486b6 |
+ * )
|
|
|
37486b6 |
+ echo "${dir}_SCRIPTS += $d/$b"
|
|
|
37486b6 |
+ check_MANS $d/$b
|
|
|
37486b6 |
+ ;;
|
|
|
37486b6 |
+ esac
|
|
|
37486b6 |
cat <
|
|
|
37486b6 |
${d}/${b}: ${file}
|
|
|
37486b6 |
\$(SUBST)
|
|
|
37486b6 |
diff -up frysk-0.4/frysk-common/Makefile.rules.nopkglibdir frysk-0.4/frysk-common/Makefile.rules
|
|
|
37486b6 |
--- frysk-0.4/frysk-common/Makefile.rules.nopkglibdir 2012-02-11 23:00:39.493000079 -0500
|
|
|
37486b6 |
+++ frysk-0.4/frysk-common/Makefile.rules 2012-02-11 23:01:33.129016031 -0500
|
|
|
37486b6 |
@@ -53,7 +53,6 @@ FRYSK_ASCOMPILE = $(CCAS) $(DEFS) $(DEFA
|
|
|
37486b6 |
|
|
|
37486b6 |
# Initialize everything to empty and then use += to add things in.
|
|
|
37486b6 |
|
|
|
37486b6 |
-noinst_SCRIPTS =
|
|
|
37486b6 |
SUFFIXES =
|
|
|
37486b6 |
BUILT_SOURCES =
|
|
|
37486b6 |
CLEANFILES = $(BUILT_SOURCES)
|
|
|
37486b6 |
@@ -61,14 +60,11 @@ CLEANDIRS =
|
|
|
37486b6 |
MOSTLYCLEANFILES = core.[1-9]*
|
|
|
37486b6 |
noinst_PROGRAMS =
|
|
|
37486b6 |
noinst_DATA =
|
|
|
37486b6 |
+noinst_SCRIPTS =
|
|
|
37486b6 |
bin_PROGRAMS =
|
|
|
37486b6 |
bin_SCRIPTS =
|
|
|
37486b6 |
sbin_PROGRAMS =
|
|
|
37486b6 |
sbin_SCRIPTS =
|
|
|
37486b6 |
-pkgdata_PROGRAMS =
|
|
|
37486b6 |
-pkglib_PROGRAMS =
|
|
|
37486b6 |
-pkglib_SCRIPTS =
|
|
|
37486b6 |
-pkglibdir = $(libdir)/@PACKAGE@
|
|
|
37486b6 |
pkglib32_PROGRAMS =
|
|
|
37486b6 |
pkglib32dir = $(lib32dir)/@PACKAGE@
|
|
|
37486b6 |
pkglib64dir = $(lib64dir)/@PACKAGE@
|
|
|
37486b6 |
diff -up frysk-0.4/frysk-core/Makefile.am.nopkglibdir frysk-0.4/frysk-core/Makefile.am
|
|
|
37486b6 |
--- frysk-0.4/frysk-core/Makefile.am.nopkglibdir 2012-02-11 23:00:39.226000079 -0500
|
|
|
37486b6 |
+++ frysk-0.4/frysk-core/Makefile.am 2012-02-11 23:01:40.329995991 -0500
|
|
|
37486b6 |
@@ -70,7 +70,7 @@ GEN_GCJ_LDADD_LIST += -lstdc++
|
|
|
37486b6 |
GEN_GCJ_LDADD_LIST += -laudit
|
|
|
37486b6 |
|
|
|
37486b6 |
# For TestExec.java
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-exec-alias
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-exec-alias
|
|
|
37486b6 |
frysk_pkglibdir_funit_exec_alias_SOURCES =
|
|
|
37486b6 |
frysk/pkglibdir/funit-exec-alias: frysk/pkglibdir/funit-exec
|
|
|
37486b6 |
cp -p frysk/pkglibdir/funit-exec $@
|
|
|
37486b6 |
@@ -79,7 +79,7 @@ frysk/pkglibdir/funit-exec-alias: frysk/
|
|
|
37486b6 |
frysk_pkglibdir_test1_LDADD = -lm
|
|
|
37486b6 |
|
|
|
37486b6 |
if DO_ARCH32_TEST
|
|
|
37486b6 |
-pkglib32_PROGRAMS += frysk/pkglibdir/arch32/funit-exec-alias
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/arch32/funit-exec-alias
|
|
|
37486b6 |
frysk_pkglibdir_arch32_funit_exec_alias_SOURCES =
|
|
|
37486b6 |
frysk/pkglibdir/arch32/funit-exec-alias: frysk/pkglibdir/arch32/funit-exec
|
|
|
37486b6 |
cp -p frysk/pkglibdir/arch32/funit-exec $@
|
|
|
37486b6 |
@@ -103,8 +103,8 @@ frysk/debuginfo/TestTypeFactory.java: fr
|
|
|
37486b6 |
# of the test program (in particular c++ exceptions).
|
|
|
37486b6 |
|
|
|
37486b6 |
# funit-stacks
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-nodebug
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-noeh
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-nodebug
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-noeh
|
|
|
37486b6 |
frysk_pkglibdir_funit_stacks_nodebug_SOURCES =
|
|
|
37486b6 |
frysk_pkglibdir_funit_stacks_noeh_SOURCES =
|
|
|
37486b6 |
frysk/pkglibdir/funit-stacks-nodebug: frysk/pkglibdir/funit-stacks
|
|
|
37486b6 |
@@ -115,8 +115,8 @@ frysk/pkglibdir/funit-stacks-noeh: frysk
|
|
|
37486b6 |
frysk/pkglibdir/funit-stacks $@
|
|
|
37486b6 |
|
|
|
37486b6 |
# funit-empty-functions
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-empty-functions-nodebug
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-empty-functions-noeh
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-empty-functions-nodebug
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-empty-functions-noeh
|
|
|
37486b6 |
frysk_pkglibdir_funit_empty_functions_nodebug_SOURCES =
|
|
|
37486b6 |
frysk_pkglibdir_funit_empty_functions_noeh_SOURCES =
|
|
|
37486b6 |
frysk/pkglibdir/funit-empty-functions-nodebug: frysk/pkglibdir/funit-empty-functions
|
|
|
37486b6 |
@@ -127,8 +127,8 @@ frysk/pkglibdir/funit-empty-functions-no
|
|
|
37486b6 |
frysk/pkglibdir/funit-empty-functions $@
|
|
|
37486b6 |
|
|
|
37486b6 |
# funit-stacks-exit
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-exit-nodebug
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-exit-noeh
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-exit-nodebug
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-exit-noeh
|
|
|
37486b6 |
frysk_pkglibdir_funit_stacks_exit_nodebug_SOURCES =
|
|
|
37486b6 |
frysk_pkglibdir_funit_stacks_exit_noeh_SOURCES =
|
|
|
37486b6 |
frysk/pkglibdir/funit-stacks-exit-nodebug: frysk/pkglibdir/funit-stacks-exit
|
|
|
37486b6 |
@@ -139,8 +139,8 @@ frysk/pkglibdir/funit-stacks-exit-noeh:
|
|
|
37486b6 |
frysk/pkglibdir/funit-stacks-exit $@
|
|
|
37486b6 |
|
|
|
37486b6 |
# funit-scopes
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-scopes-nodebug
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-scopes-noeh
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-scopes-nodebug
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-scopes-noeh
|
|
|
37486b6 |
frysk_pkglibdir_funit_scopes_nodebug_SOURCES =
|
|
|
37486b6 |
frysk_pkglibdir_funit_scopes_noeh_SOURCES =
|
|
|
37486b6 |
frysk/pkglibdir/funit-scopes-nodebug: frysk/pkglibdir/funit-scopes
|
|
|
37486b6 |
@@ -151,8 +151,8 @@ frysk/pkglibdir/funit-scopes-noeh: frysk
|
|
|
37486b6 |
frysk/pkglibdir/funit-scopes $@
|
|
|
37486b6 |
|
|
|
37486b6 |
# funit-scopes-workaround
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-scopes-workaround-nodebug
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-scopes-workaround-noeh
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-scopes-workaround-nodebug
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-scopes-workaround-noeh
|
|
|
37486b6 |
frysk_pkglibdir_funit_scopes_workaround_nodebug_SOURCES =
|
|
|
37486b6 |
frysk_pkglibdir_funit_scopes_workaround_noeh_SOURCES =
|
|
|
37486b6 |
frysk/pkglibdir/funit-scopes-workaround-nodebug: frysk/pkglibdir/funit-scopes-workaround
|
|
|
37486b6 |
@@ -163,8 +163,8 @@ frysk/pkglibdir/funit-scopes-workaround-
|
|
|
37486b6 |
frysk/pkglibdir/funit-scopes-workaround $@
|
|
|
37486b6 |
|
|
|
37486b6 |
# funit-stack-inlined
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-stack-inlined-nodebug
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-stack-inlined-noeh
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-stack-inlined-nodebug
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-stack-inlined-noeh
|
|
|
37486b6 |
frysk_pkglibdir_funit_stack_inlined_nodebug_SOURCES =
|
|
|
37486b6 |
frysk_pkglibdir_funit_stack_inlined_noeh_SOURCES =
|
|
|
37486b6 |
frysk/pkglibdir/funit-stack-inlined-nodebug: frysk/pkglibdir/funit-stack-inlined
|
|
|
37486b6 |
@@ -175,8 +175,8 @@ frysk/pkglibdir/funit-stack-inlined-noeh
|
|
|
37486b6 |
frysk/pkglibdir/funit-stack-inlined $@
|
|
|
37486b6 |
|
|
|
37486b6 |
# funit-stacks-values
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-values-nodebug
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-values-noeh
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-values-nodebug
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-values-noeh
|
|
|
37486b6 |
frysk_pkglibdir_funit_stacks_values_nodebug_SOURCES =
|
|
|
37486b6 |
frysk_pkglibdir_funit_stacks_values_noeh_SOURCES =
|
|
|
37486b6 |
frysk/pkglibdir/funit-stacks-values-nodebug: frysk/pkglibdir/funit-stacks-values
|
|
|
37486b6 |
@@ -187,8 +187,8 @@ frysk/pkglibdir/funit-stacks-values-noeh
|
|
|
37486b6 |
frysk/pkglibdir/funit-stacks-values $@
|
|
|
37486b6 |
|
|
|
37486b6 |
# funit-stacks-linenum
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-linenum-nodebug
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-stacks-linenum-noeh
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-linenum-nodebug
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-stacks-linenum-noeh
|
|
|
37486b6 |
frysk_pkglibdir_funit_stacks_linenum_nodebug_SOURCES =
|
|
|
37486b6 |
frysk_pkglibdir_funit_stacks_linenum_noeh_SOURCES =
|
|
|
37486b6 |
frysk/pkglibdir/funit-stacks-linenum-nodebug: frysk/pkglibdir/funit-stacks-linenum
|
|
|
37486b6 |
@@ -199,8 +199,8 @@ frysk/pkglibdir/funit-stacks-linenum-noe
|
|
|
37486b6 |
frysk/pkglibdir/funit-stacks-linenum $@
|
|
|
37486b6 |
|
|
|
37486b6 |
# funit-cpp-scopes-class
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-cpp-scopes-class-nodebug
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-cpp-scopes-class-noeh
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-cpp-scopes-class-nodebug
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-cpp-scopes-class-noeh
|
|
|
37486b6 |
frysk_pkglibdir_funit_cpp_scopes_class_nodebug_SOURCES =
|
|
|
37486b6 |
frysk_pkglibdir_funit_cpp_scopes_class_noeh_SOURCES =
|
|
|
37486b6 |
frysk/pkglibdir/funit-cpp-scopes-class-nodebug: frysk/pkglibdir/funit-cpp-scopes-class
|
|
|
37486b6 |
@@ -213,13 +213,13 @@ frysk/pkglibdir/funit-cpp-scopes-class-n
|
|
|
37486b6 |
|
|
|
37486b6 |
# Create executables for symbol tests for TestSymbol.java.
|
|
|
37486b6 |
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-symbols-nodebug
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-symbols-nodebug
|
|
|
37486b6 |
frysk_pkglibdir_funit_symbols_nodebug_SOURCES =
|
|
|
37486b6 |
frysk/pkglibdir/funit-symbols-nodebug: frysk/pkglibdir/funit-symbols
|
|
|
37486b6 |
strip --strip-debug -o $@ frysk/pkglibdir/funit-symbols
|
|
|
37486b6 |
|
|
|
37486b6 |
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-symbols-stripped
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-symbols-stripped
|
|
|
37486b6 |
frysk_pkglibdir_funit_symbols_stripped_SOURCES =
|
|
|
37486b6 |
frysk/pkglibdir/funit-symbols-stripped: frysk/pkglibdir/funit-symbols
|
|
|
37486b6 |
strip -o $@ frysk/pkglibdir/funit-symbols
|
|
|
37486b6 |
@@ -268,13 +268,13 @@ uninstall-sysroot-local:
|
|
|
37486b6 |
rm -rf $(pkglib32dir)/test-sysroot
|
|
|
37486b6 |
|
|
|
37486b6 |
if DO_ARCH32_TEST
|
|
|
37486b6 |
-pkglib32_PROGRAMS += frysk/pkglibdir/arch32/funit-symbols-nodebug
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/arch32/funit-symbols-nodebug
|
|
|
37486b6 |
frysk_pkglibdir_arch32_funit_symbols_nodebug_SOURCES =
|
|
|
37486b6 |
frysk/pkglibdir/arch32/funit-symbols-nodebug: frysk/pkglibdir/arch32/funit-symbols
|
|
|
37486b6 |
strip --strip-debug -o $@ frysk/pkglibdir/arch32/funit-symbols
|
|
|
37486b6 |
|
|
|
37486b6 |
|
|
|
37486b6 |
-pkglib32_PROGRAMS += frysk/pkglibdir/arch32/funit-symbols-stripped
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/arch32/funit-symbols-stripped
|
|
|
37486b6 |
frysk_pkglibdir_arch32_funit_symbols_stripped_SOURCES =
|
|
|
37486b6 |
frysk/pkglibdir/arch32/funit-symbols-stripped: frysk/pkglibdir/arch32/funit-symbols
|
|
|
37486b6 |
strip -o $@ frysk/pkglibdir/arch32/funit-symbols
|
|
|
37486b6 |
@@ -318,7 +318,7 @@ frysk/pkgdatadir/test-core-x86:
|
|
|
37486b6 |
ln -s -f @abs_top_builddir@/../frysk-sys/$@ $@
|
|
|
37486b6 |
|
|
|
37486b6 |
# The following links two files into one executable
|
|
|
37486b6 |
-pkglib_PROGRAMS += frysk/pkglibdir/funit-scopes-multi-file
|
|
|
37486b6 |
+noinst_PROGRAMS += frysk/pkglibdir/funit-scopes-multi-file
|
|
|
37486b6 |
frysk_pkglibdir_funit_scopes_multi_file_SOURCES =
|
|
|
37486b6 |
frysk/pkglibdir/funit-scopes-multi-file:
|
|
|
37486b6 |
gcc -g $(srcdir)/frysk/pkglibdir/funit-scopes-multi-file-a.c $(srcdir)/frysk/pkglibdir/funit-scopes-multi-file-b.c -o frysk/pkglibdir/funit-scopes-multi-file
|
|
|
37486b6 |
diff -up frysk-0.4/frysk-imports/tests/Makefile.am.nopkglibdir frysk-0.4/frysk-imports/tests/Makefile.am
|
|
|
37486b6 |
--- frysk-0.4/frysk-imports/tests/Makefile.am.nopkglibdir 2008-06-09 14:03:07.000000000 -0400
|
|
|
37486b6 |
+++ frysk-0.4/frysk-imports/tests/Makefile.am 2012-02-11 23:01:46.275993979 -0500
|
|
|
37486b6 |
@@ -42,7 +42,6 @@ AM_CFLAGS = -Werror -Wall -I$(top_srcdir
|
|
|
37486b6 |
# Gag all the output from the failing tests
|
|
|
37486b6 |
noinst_PROGRAMS =
|
|
|
37486b6 |
noinst_SCRIPTS =
|
|
|
37486b6 |
-pkglib_SCRIPTS =
|
|
|
37486b6 |
TESTS_ENVIRONMENT = eval > /dev/null 2>&1
|
|
|
37486b6 |
XFAIL_TESTS =
|
|
|
37486b6 |
PASS_TESTS =
|