Merge branch 'refs/heads/t/makefile_conventions'

[paraslash.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index c1b5e1dcae0b7391ca31a81cfe46e494c30a131b..6e84b6fd291b5111f2c0aef473b7d05f10950f5f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,18 +2,17 @@ prefix := @prefix@
 exec_prefix := @exec_prefix@
 
 # These two use prefix and exec_prefix
-BINDIR := @bindir@
+bindir := @bindir@
 datarootdir := @datarootdir@
 
 PACKAGE_TARNAME := @PACKAGE_TARNAME@
 PACKAGE_VERSION := @PACKAGE_VERSION@
 
-INSTALL := @install@
-GENGETOPT := @gengetopt@
-HELP2MAN := @help2man@
+M4 := @M4@
+GENGETOPT := @GENGETOPT@
+HELP2MAN := @HELP2MAN@
 
 ggo_descriptions_declared := @ggo_descriptions_declared@
-object_executable_matrix := @object_executable_matrix@
 
 executables := @executables@
 receivers := @receivers@
@@ -35,7 +34,6 @@ play_objs := @play_objs@
 speex_cppflags := @speex_cppflags@
 opus_cppflags := @opus_cppflags@
 vorbis_cppflags := @vorbis_cppflags@
-arch_cppflags := @arch_cppflags@
 osl_cppflags := @osl_cppflags@
 id3tag_cppflags := @id3tag_cppflags@
 openssl_cppflags := @openssl_cppflags@
@@ -53,7 +51,6 @@ alsa_cppflags := @alsa_cppflags@
 oss_cppflags := @oss_cppflags@
 mp4v2_cppflags := @mp4v2_cppflags@
 
-clock_gettime_ldflags := @clock_gettime_ldflags@
 id3tag_ldflags := @id3tag_ldflags@
 ogg_ldflags := @ogg_ldflags@
 vorbis_ldflags := @vorbis_ldflags@
@@ -69,10 +66,7 @@ ao_ldflags := @ao_ldflags@
 readline_ldflags := @readline_ldflags@
 samplerate_ldflags := @samplerate_ldflags@
 osl_ldflags := @osl_ldflags@
-socket_ldflags := @socket_ldflags@
-nsl_ldflags := @nsl_ldflags@
 curses_ldflags := @curses_ldflags@
-core_audio_ldflags := @core_audio_ldflags@
 crypto_ldflags := @crypto_ldflags@
 iconv_ldflags := @iconv_ldflags@
 mp4v2_ldflags := @mp4v2_ldflags@