[xine-cvs] CVS: xine-ui/src/xitk Makefile.am,1.49,1.50

[Stephen T. <st...@us...>]

Update of /cvsroot/xine/xine-ui/src/xitk
In directory usw-pr-cvs1:/tmp/cvs-serv15329/src/xitk

Modified Files:
	Makefile.am 
Log Message:
In place of having symbolic links to the source files in src/common a 
library was created instead. This library is called libcommon.la named after
the directory were the files are located. This library is not installed
during "make install". Its for internal purposes only. Doing this
transformation to a library allowed xine-ui to build via "make distcheck".

Apparently the symbolic links was causing havoc with "make distcheck" by
not removing symbolic links during "make distclean". This also eliminates
the need for maintaining an updated list of files used in a directory.



Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/Makefile.am,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- Makefile.am	10 Nov 2002 21:41:10 -0000	1.49
+++ Makefile.am	17 Nov 2002 06:59:51 -0000	1.50
@@ -4,21 +4,25 @@
 
 EXTRA_DIST = file_browser.c file_browser.h
 
-if HAVE_TERMCAP
-remote = xine-remote
-endif
+#if HAVE_TERMCAP
+#remote = xine-remote
+#endif
+remote=
 
 bin_PROGRAMS = xine $(remote)
 
-if HAVE_GETOPT_LONG
-else
-GETOPT_C = getopt.c getopt1.c
-GETOPT_H = getopt.h
-endif
+
+#COMMON_DIR = $(top_srcdir)/src/common
+
+#if HAVE_GETOPT_LONG
+#else
+#GETOPT_C = $(COMMON_DIR)/getopt.c \
+#	   $(COMMON_DIR)/getopt1.c
+#GETOPT_H = $(COMMON_DIR)/getopt.h
+#endif
 
 ## xscreensaver-remote.c
 xine_SOURCES = \
-	$(GETOPT_C) \
 	actions.c \
 	config_wrapper.c \
 	control.c \
@@ -34,7 +38,6 @@
 	setup.c \
 	skins.c \
 	snapshot.c \
-	utils.c \
 	panel.c \
 	playlist.c \
 	mediamark.c \
@@ -42,18 +45,19 @@
 	videowin.c \
 	viewlog.c
 
-xine_DEPENDENTIES = utils.h monitor.h 
+xine_DEPENDENCIES = $(top_builddir)/src/common/libcommon.la $(top_builddir)/src/xitk/xine-toolkit/libxitk.la
 # double @XINE_LIBS@ to ensure correct libpath (libtool may add -L...)
-xine_LDADD = @XINE_LIBS@ $(top_builddir)/src/xitk/xine-toolkit/libxitk.la \
-	$(X_PRE_LIBS) @XINE_LIBS@ $(LIRC_LIBS) $(DYNAMIC_LD_LIBS) \
-	$(X_LIBS) $(XTEST_LIBS) -lX11 -lm
-
-xine_remote_SOURCES = $(GETOPT_C) xine-remote.c
-xine_remote_DEPENDENTIES = xine-remote.c
-xine_remote_LDADD = $(NET_LIBS) $(THREAD_LIBS) $(top_builddir)/readline/libreadline.la $(TERMCAP_LIB)
+xine_LDADD = @XINE_LIBS@ $(top_builddir)/src/common/libcommon.la \
+	     $(top_builddir)/src/xitk/xine-toolkit/libxitk.la \
+	     $(X_PRE_LIBS) @XINE_LIBS@ $(LIRC_LIBS) $(DYNAMIC_LD_LIBS) \
+	     $(X_LIBS) $(XTEST_LIBS) -lX11 -lm
+
+# DISABLED CORBA SUPPORT: Must port to new API
+#xine_remote_SOURCES = $(GETOPT_C)
+#xine_remote_DEPENDENCIES = $(top_builddir)/readline/libreadline.la
+#xine_remote_LDADD = $(NET_LIBS) $(THREAD_LIBS) $(top_builddir)/readline/libreadline.la $(TERMCAP_LIB)
 
 noinst_HEADERS = \
-	$(GETOPT_H) \
 	common.h \
 	actions.h \
 	config_wrapper.h \
@@ -77,35 +81,17 @@
 	videowin.h \
 	viewlog.h
 
+# Use this instead of the rule below
+#xine_remote_CFLAGS = -DNETWORK_CLIENT
 
-$(top_builddir)/readline/libreadline.la:
-	@cd $(top_builddir)/readline && $(MAKE) libreadline.la
-
-xine-remote.c:	$(srcdir)/network.c
-	$(LN_S) $(srcdir)/network.c ./xine-remote.c
-
-xine-remote.o: xine-remote.c
-	$(COMPILE) -DNETWORK_CLIENT -c `test -f $< || echo '$(srcdir)/'`$<
-##	@$(MAKE) CFLAGS="$(CFLAGS)  
-
-utils.c:
-	$(LN_S) $(top_srcdir)/src/common/utils.c ./utils.c
-
-monitor.c:
-	$(LN_S) $(top_srcdir)/src/common/monitor.c ./monitor.c
+# Old rule
+#xine-remote.o: xine-remote.c
+#	$(COMPILE) -DNETWORK_CLIENT -c `test -f $< || echo '$(srcdir)/'`$<
 
 ##xscreensaver-remote.c:
 ##	$(LN_S) $(top_srcdir)/src/common/xscreensaver-remote.c \
 ##	./xscreensaver-remote.c
 
-getopt.c:
-	$(LN_S) $(top_srcdir)/src/common/getopt.c ./getopt.c
-
-getopt1.c:
-	$(LN_S) $(top_srcdir)/src/common/getopt1.c ./getopt1.c
-
-getopt.h:
-	$(LN_S) $(top_srcdir)/src/common/getopt.h ./getopt.h
 
 debug:
 	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) -Ixine-toolkit/"
@@ -123,4 +109,3 @@
 	-@echo "This command is intended for maintainers to use;"
 	-@echo "it deletes files that may require special tools to rebuild."
 	-rm -f Makefile.in
-	-rm -f utils.c monitor.c xine-remote.c