diff --git a/WINGs/Documentation/Makefile.am b/WINGs/Documentation/Makefile.am index d884e13f..56eec887 100644 --- a/WINGs/Documentation/Makefile.am +++ b/WINGs/Documentation/Makefile.am @@ -1,6 +1,6 @@ ## automake input file for WINGs - Documentation -AUTOMAKE_OPTIONS = no-dependencies +AUTOMAKE_OPTIONS = EXTRA_DIST = diff --git a/WINGs/Examples/Makefile.am b/WINGs/Examples/Makefile.am index a8783f79..42519cb1 100644 --- a/WINGs/Examples/Makefile.am +++ b/WINGs/Examples/Makefile.am @@ -1,6 +1,6 @@ ## automake input file for WINGs - Examples -AUTOMAKE_OPTIONS = no-dependencies +AUTOMAKE_OPTIONS = noinst_PROGRAMS = connect server fontl puzzle colorpick diff --git a/WINGs/Extras/Makefile.am b/WINGs/Extras/Makefile.am index 3ff4001c..ca984ea8 100644 --- a/WINGs/Extras/Makefile.am +++ b/WINGs/Extras/Makefile.am @@ -1,6 +1,6 @@ ## automake input file for WINGs -AUTOMAKE_OPTIONS = no-dependencies +AUTOMAKE_OPTIONS = # is this a kluge? if so, how should i do it? includedir = @includedir@/WINGs diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am index 92057d1c..90770d0a 100644 --- a/WINGs/Makefile.am +++ b/WINGs/Makefile.am @@ -1,6 +1,6 @@ ## automake input file for WINGs -AUTOMAKE_OPTIONS = no-dependencies +AUTOMAKE_OPTIONS = SUBDIRS = WINGs . po Documentation Resources diff --git a/WINGs/Tests/Makefile.am b/WINGs/Tests/Makefile.am index 56c1dd1d..54c90ffc 100644 --- a/WINGs/Tests/Makefile.am +++ b/WINGs/Tests/Makefile.am @@ -1,6 +1,6 @@ ## automake input file for WINGs - Tests -AUTOMAKE_OPTIONS = no-dependencies +AUTOMAKE_OPTIONS = noinst_PROGRAMS = wtest wmquery wmfile testmywidget diff --git a/WINGs/WINGs/Makefile.am b/WINGs/WINGs/Makefile.am index 19174954..b77333ba 100644 --- a/WINGs/WINGs/Makefile.am +++ b/WINGs/WINGs/Makefile.am @@ -1,6 +1,6 @@ ## automake input file for WINGs - Headers subdir -AUTOMAKE_OPTIONS = no-dependencies +AUTOMAKE_OPTIONS = # is this a kluge? if so, how should i do it? includedir = @includedir@/WINGs diff --git a/WPrefs.app/Makefile.am b/WPrefs.app/Makefile.am index 06532f7c..05bd3e3f 100644 --- a/WPrefs.app/Makefile.am +++ b/WPrefs.app/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = xpm tiff po -AUTOMAKE_OPTIONS = no-dependencies +AUTOMAKE_OPTIONS = wpexecbindir = @wprefs_bindir@ diff --git a/src/Makefile.am b/src/Makefile.am index 81e6f9a3..3fe3962a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -AUTOMAKE_OPTIONS = no-dependencies +AUTOMAKE_OPTIONS = BUILT_SOURCES = wconfig.h diff --git a/util/Makefile.am b/util/Makefile.am index 3855b396..5149e4a6 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = po -AUTOMAKE_OPTIONS = no-dependencies +AUTOMAKE_OPTIONS = pkgdatadir = $(datadir)/@PACKAGE@ diff --git a/wrlib/Makefile.am b/wrlib/Makefile.am index 815514cd..32323f6d 100644 --- a/wrlib/Makefile.am +++ b/wrlib/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = . -AUTOMAKE_OPTIONS = no-dependencies +AUTOMAKE_OPTIONS = EXTRA_DIST = tests diff --git a/wrlib/tests/Makefile.am b/wrlib/tests/Makefile.am index 411992c8..ceec40a6 100644 --- a/wrlib/tests/Makefile.am +++ b/wrlib/tests/Makefile.am @@ -1,6 +1,6 @@ ## automake input file for wrlib -AUTOMAKE_OPTIONS = no-dependencies +AUTOMAKE_OPTIONS = noinst_PROGRAMS = testdraw testgrad testrot view