mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	build-sys: drop LIBOIL_{FLAGS|LIBS} from Makefile.am since we don't use the library anymore
This commit is contained in:
		
							parent
							
								
									1200a0b143
								
							
						
					
					
						commit
						470e9a8787
					
				
					 1 changed files with 24 additions and 24 deletions
				
			
		| 
						 | 
				
			
			@ -177,8 +177,8 @@ pulseaudio_SOURCES = \
 | 
			
		|||
		daemon/ltdl-bind-now.c daemon/ltdl-bind-now.h \
 | 
			
		||||
		daemon/main.c
 | 
			
		||||
 | 
			
		||||
pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS) $(LIBOIL_CFLAGS) $(DBUS_CFLAGS)
 | 
			
		||||
pulseaudio_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) $(LIBOIL_LIBS) $(DBUS_LIBS)
 | 
			
		||||
pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS) $(DBUS_CFLAGS)
 | 
			
		||||
pulseaudio_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) $(DBUS_LIBS)
 | 
			
		||||
# This is needed because automake doesn't properly expand the foreach below
 | 
			
		||||
pulseaudio_DEPENDENCIES = libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(PREOPEN_LIBS)
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -496,18 +496,18 @@ sig2str_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 | 
			
		|||
 | 
			
		||||
resampler_test_SOURCES = tests/resampler-test.c
 | 
			
		||||
resampler_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
 | 
			
		||||
resampler_test_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
 | 
			
		||||
resampler_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
 | 
			
		||||
resampler_test_CFLAGS = $(AM_CFLAGS)
 | 
			
		||||
resampler_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 | 
			
		||||
 | 
			
		||||
mix_test_SOURCES = tests/mix-test.c
 | 
			
		||||
mix_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
 | 
			
		||||
mix_test_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
 | 
			
		||||
mix_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
 | 
			
		||||
mix_test_CFLAGS = $(AM_CFLAGS)
 | 
			
		||||
mix_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 | 
			
		||||
 | 
			
		||||
remix_test_SOURCES = tests/remix-test.c
 | 
			
		||||
remix_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
 | 
			
		||||
remix_test_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
 | 
			
		||||
remix_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
 | 
			
		||||
remix_test_CFLAGS = $(AM_CFLAGS)
 | 
			
		||||
remix_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 | 
			
		||||
 | 
			
		||||
smoother_test_SOURCES = tests/smoother-test.c
 | 
			
		||||
smoother_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
 | 
			
		||||
| 
						 | 
				
			
			@ -516,38 +516,38 @@ smoother_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 | 
			
		|||
 | 
			
		||||
envelope_test_SOURCES = tests/envelope-test.c
 | 
			
		||||
envelope_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
 | 
			
		||||
envelope_test_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
 | 
			
		||||
envelope_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
 | 
			
		||||
envelope_test_CFLAGS = $(AM_CFLAGS)
 | 
			
		||||
envelope_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 | 
			
		||||
 | 
			
		||||
proplist_test_SOURCES = tests/proplist-test.c
 | 
			
		||||
proplist_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
 | 
			
		||||
proplist_test_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
 | 
			
		||||
proplist_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
 | 
			
		||||
proplist_test_CFLAGS = $(AM_CFLAGS)
 | 
			
		||||
proplist_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 | 
			
		||||
 | 
			
		||||
rtstutter_SOURCES = tests/rtstutter.c
 | 
			
		||||
rtstutter_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
 | 
			
		||||
rtstutter_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
 | 
			
		||||
rtstutter_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
 | 
			
		||||
rtstutter_CFLAGS = $(AM_CFLAGS)
 | 
			
		||||
rtstutter_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 | 
			
		||||
 | 
			
		||||
stripnul_SOURCES = tests/stripnul.c
 | 
			
		||||
stripnul_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
 | 
			
		||||
stripnul_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
 | 
			
		||||
stripnul_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
 | 
			
		||||
stripnul_CFLAGS = $(AM_CFLAGS)
 | 
			
		||||
stripnul_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 | 
			
		||||
 | 
			
		||||
lock_autospawn_test_SOURCES = tests/lock-autospawn-test.c
 | 
			
		||||
lock_autospawn_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
 | 
			
		||||
lock_autospawn_test_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
 | 
			
		||||
lock_autospawn_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
 | 
			
		||||
lock_autospawn_test_CFLAGS = $(AM_CFLAGS)
 | 
			
		||||
lock_autospawn_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 | 
			
		||||
 | 
			
		||||
prioq_test_SOURCES = tests/prioq-test.c
 | 
			
		||||
prioq_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
 | 
			
		||||
prioq_test_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
 | 
			
		||||
prioq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
 | 
			
		||||
prioq_test_CFLAGS = $(AM_CFLAGS)
 | 
			
		||||
prioq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 | 
			
		||||
 | 
			
		||||
sigbus_test_SOURCES = tests/sigbus-test.c
 | 
			
		||||
sigbus_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la
 | 
			
		||||
sigbus_test_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
 | 
			
		||||
sigbus_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS)
 | 
			
		||||
sigbus_test_CFLAGS = $(AM_CFLAGS)
 | 
			
		||||
sigbus_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 | 
			
		||||
 | 
			
		||||
gtk_test_SOURCES = tests/gtk-test.c
 | 
			
		||||
gtk_test_LDADD = $(AM_LDADD) libpulse.la libpulse-mainloop-glib.la
 | 
			
		||||
| 
						 | 
				
			
			@ -858,9 +858,9 @@ libpulsecore_@PA_MAJORMINORMICRO@_la_SOURCES = \
 | 
			
		|||
		pulsecore/time-smoother.c pulsecore/time-smoother.h \
 | 
			
		||||
		pulsecore/database.h
 | 
			
		||||
 | 
			
		||||
libpulsecore_@PA_MAJORMINORMICRO@_la_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(WINSOCK_CFLAGS) $(LIBOIL_CFLAGS)
 | 
			
		||||
libpulsecore_@PA_MAJORMINORMICRO@_la_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(WINSOCK_CFLAGS)
 | 
			
		||||
libpulsecore_@PA_MAJORMINORMICRO@_la_LDFLAGS = -avoid-version
 | 
			
		||||
libpulsecore_@PA_MAJORMINORMICRO@_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LTLIBICONV) libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecore-foreign.la
 | 
			
		||||
libpulsecore_@PA_MAJORMINORMICRO@_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la libpulsecore-foreign.la
 | 
			
		||||
 | 
			
		||||
if HAVE_X11
 | 
			
		||||
libpulsecore_@PA_MAJORMINORMICRO@_la_SOURCES += pulsecore/x11wrap.c pulsecore/x11wrap.h
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue