projects / packages / xine-ui.git / blame
| Commit | Line | Data |
|---|---|---|
| 9ab02642 JB |
1 | --- xine-ui-0.9.21/configure.ac.orig 2003-05-20 21:12:06.000000000 +0200 |
| 2 | +++ xine-ui-0.9.21/configure.ac 2003-05-20 21:14:38.000000000 +0200 | |
| 3 | @@ -824,7 +824,7 @@ | |
| 4 | dnl | |
| 5 | dnl Some include paths ( !!! DO NOT REMOVE !!! ) | |
| 6 | dnl | |
| 7 | -INCLUDES='-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/readline -I$(top_builddir)/readline -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/src/common -I$(top_builddir)/src/common -I$(top_srcdir)/src/xitk/xine-toolkit -I$(top_builddir)/src/xitk/xine-toolkit -I$(prefix)/include $(INTLDIR)' | |
| 8 | +INCLUDES='-I$(top_srcdir) -I$(top_builddir) -I/usr/include/readline -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/src/common -I$(top_builddir)/src/common -I$(top_srcdir)/src/xitk/xine-toolkit -I$(top_builddir)/src/xitk/xine-toolkit -I$(prefix)/include $(INTLDIR)' | |
| 9 | AC_SUBST(INCLUDES) | |
| 10 | ||
| 11 | AC_DEFINE(NEED_MRLBROWSER,,[Define this to add mrl browser into xitk lib]) | |
| 12 | --- xine-ui-0.9.21/Makefile.am.orig 2003-03-25 15:33:01.000000000 +0100 | |
| 13 | +++ xine-ui-0.9.21/Makefile.am 2003-05-20 21:13:58.000000000 +0200 | |
| 14 | @@ -6,7 +6,7 @@ | |
| 15 | ||
| 16 | ACLOCAL_AMFLAGS = @XINE_ACFLAGS@ -I m4 | |
| 17 | ||
| 18 | -SUBDIRS = doc m4 readline intl po misc src | |
| 19 | +SUBDIRS = doc m4 intl po misc src | |
| 20 | ||
| 21 | DEBFILES = debian/README.Debian debian/changelog debian/control \ | |
| 22 | debian/copyright debian/links debian/menu \ | |
| 23 | --- xine-ui-0.9.21/src/xitk/Makefile.am.orig 2003-03-13 20:10:33.000000000 +0100 | |
| 24 | +++ xine-ui-0.9.21/src/xitk/Makefile.am 2003-05-20 21:15:20.000000000 +0200 | |
| 25 | @@ -48,11 +48,10 @@ | |
| 26 | $(X_LIBS) $(XTEST_LIBS) $(CURL_LIBS) -lX11 -lm $(DBG_LIBS) | |
| 27 | ||
| 28 | xine_remote_SOURCES = xine-remote.c | |
| 29 | -xine_remote_DEPENDENCIES = $(top_builddir)/readline/libreadline.la \ | |
| 30 | - $(top_builddir)/src/common/libcommon.la \ | |
| 31 | +xine_remote_DEPENDENCIES = $(top_builddir)/src/common/libcommon.la \ | |
| 32 | xine-remote.c | |
| 33 | xine_remote_LDADD = $(NET_LIBS) $(THREAD_LIBS) \ | |
| 34 | - $(top_builddir)/readline/libreadline.la $(TERMCAP_LIB) \ | |
| 35 | + -lreadline $(TERMCAP_LIB) \ | |
| 36 | $(top_builddir)/src/common/libcommon.la $(DBG_LIBS) | |
| 37 | ||
| 38 | session_ctrl_LDADD = @XINE_LIBS@ $(top_builddir)/src/common/libcommon.la $(DBG_LIBS) | |
| 39 | @@ -87,9 +86,6 @@ | |
| 40 | videowin.h \ | |
| 41 | viewlog.h | |
| 42 | ||
| 43 | -$(top_builddir)/readline/libreadline.la: | |
| 44 | - @cd $(top_builddir)/readline && $(MAKE) libreadline.la | |
| 45 | - | |
| 46 | $(top_builddir)/src/common/libcommon.la: | |
| 47 | @cd $(top_builddir)/src/common && $(MAKE) libcommon.la | |
| 48 |