diff options
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | misc/Makefile.common | 17 | ||||
| -rw-r--r-- | src/demuxers/Makefile.am | 2 | ||||
| -rw-r--r-- | src/input/Makefile.am | 2 | ||||
| -rw-r--r-- | src/video_out/macosx/Makefile.am | 2 | ||||
| -rw-r--r-- | src/xine-engine/Makefile.am | 2 | ||||
| -rw-r--r-- | src/xine-utils/Makefile.am | 2 |
7 files changed, 8 insertions, 21 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index e2eec74c5..36b695bc8 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -4,7 +4,7 @@ EXTRA_DIST = Makefile.common noinst_LTLIBRARIES = libxineposix.la noinst_HEADERS = os_internal.h -include_HEADERS = os_types.h +xineinclude_HEADERS = os_types.h libxineposix_la_SOURCES = libxineposix_la_LIBADD = @LTLIBOBJS@ diff --git a/misc/Makefile.common b/misc/Makefile.common index ad23067f6..b3772941f 100644 --- a/misc/Makefile.common +++ b/misc/Makefile.common @@ -1,5 +1,7 @@ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la +xineincludedir = $(includedir)/xine + xineplugdir = $(XINE_PLUGINDIR) xineplug_ldflags = $(NOUNDEF) -avoid-version -module @@ -39,21 +41,6 @@ install-debug: debug done; $(MAKE) $(AM_MAKEFLAGS) install-data-hook -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(install_sh) -d $(DESTDIR)$(includedir)/xine - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p; \ - done - -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/xine/$$p; \ - done - uninstall-hook: @if echo '$(libdir)' | egrep ^'$(XINE_PLUGINDIR)' >/dev/null; then \ list='$(lib_LTLIBRARIES)'; for p in $$list; do \ diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am index b571c18e4..8a931c2d6 100644 --- a/src/demuxers/Makefile.am +++ b/src/demuxers/Makefile.am @@ -136,5 +136,5 @@ xineplug_dmx_iff_la_LIBADD = $(XINE_LIB) xineplug_dmx_flv_la_SOURCES = demux_flv.c xineplug_dmx_flv_la_LIBADD = $(XINE_LIB) -include_HEADERS = demux.h +xineinclude_HEADERS = demux.h noinst_HEADERS = asfheader.h qtpalette.h group_games.h group_audio.h id3.h ebml.h matroska.h iff.h flacutils.h diff --git a/src/input/Makefile.am b/src/input/Makefile.am index f8e17ae61..dbe9d97dc 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -151,6 +151,6 @@ xineplug_inp_pvr_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS) xineplug_inp_pvr_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) xineplug_inp_pvr_la_LDFLAGS = -avoid-version -module -include_HEADERS = input_plugin.h +xineinclude_HEADERS = input_plugin.h noinst_HEADERS = net_buf_ctrl.h mms.h mmsh.h pnm.h media_helper.h videodev2.h http_helper.h diff --git a/src/video_out/macosx/Makefile.am b/src/video_out/macosx/Makefile.am index 0a70d9220..a69f30dc5 100644 --- a/src/video_out/macosx/Makefile.am +++ b/src/video_out/macosx/Makefile.am @@ -21,7 +21,7 @@ libxineMacOSXVideo_la_LDFLAGS = -version-info \ -Wl,-framework -Wl,Cocoa -framework Cocoa \ -Wl,-framework -Wl,OpenGL -framework OpenGL -include_HEADERS = video_window.h XineOpenGLView.h XineVideoWindow.h +xineinclude_HEADERS = video_window.h XineOpenGLView.h XineVideoWindow.h endif diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 97fb6a033..acda9424e 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -35,7 +35,7 @@ libxine_la_LDFLAGS = \ $(def_ldflags) -include_HEADERS = buffer.h metronom.h configfile.h vo_scale.h \ +xineinclude_HEADERS = buffer.h metronom.h configfile.h vo_scale.h \ audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \ video_overlay.h osd.h scratch.h xine_plugin.h xineintl.h \ plugin_catalog.h audio_decoder.h video_decoder.h post.h \ diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index 7406abf86..95de06b9e 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -32,7 +32,7 @@ libxineutils_la_SOURCES = $(pppc_files) \ pool.c \ ring_buffer.c -include_HEADERS = \ +xineinclude_HEADERS = \ attributes.h \ compat.h \ xine_buffer.h \ |