gnome-subtitles r981 - in trunk: . src

[pcastro svn gnome org]

Author: pcastro
Date: Mon Apr 14 23:23:47 2008
New Revision: 981
URL: http://svn.gnome.org/viewvc/gnome-subtitles?rev=981&view=rev

Log:
Do not include SubLib anymore. Reference SubLib using pkg-config.


Modified:
   trunk/Makefile.am
   trunk/configure.ac
   trunk/src/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Mon Apr 14 23:23:47 2008
@@ -1,15 +1,10 @@
-SUBDIRS = $(SUBLIB_DIR) $(GSTPB_DIR) . src data po help
+SUBDIRS = $(GSTPB_DIR) . src data po help
 
 ACLOCAL_AMFLAGS = -I m4
 
-sublibdir = $(pkglibdir)
-sublib_SCRIPTS = build/sublib.dll
 gstpbdir = $(pkglibdir)
 gstpb_SCRIPTS = build/GStreamerPlaybin.dll build/libgstreamer_playbin.so
 
-$(sublib_SCRIPTS):
-	cp -f $(SUBLIB_DIR)/build/sublib.dll build
-
 $(gstpb_SCRIPTS):
 	cp -f $(GSTPB_DIR)/src/GStreamerPlaybin.dll build && cp -f $(GSTPB_DIR)/src/libgstreamer_playbin.so build
 
@@ -28,5 +23,3 @@
 	intltool-merge 		\
 	intltool-update		\
 	gnome-doc-utils.make
-	
-	

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Apr 14 23:23:47 2008
@@ -1,5 +1,5 @@
 AC_PREREQ(2.58)
-AC_INIT(gnome-subtitles, 0.7.2, http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-subtitles)
+AC_INIT(gnome-subtitles, 0.8, http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-subtitles)
 
 GNOME_COMMON_INIT
 
@@ -57,30 +57,6 @@
 	mkdir build
 fi
 
-echo -n "checking for sublib package dir... "
-for i in sublib*
-do
-	SUBLIB_DIR=$i
-done
-if test -d $SUBLIB_DIR
-then
-	echo $SUBLIB_DIR
-	AC_CONFIG_SUBDIRS($SUBLIB_DIR)
-else
-	echo "no"
-	SUBLIB_DIR=""
-	echo -n "checking for build/sublib.dll... "
-	if test -f "build/sublib.dll"
-	then
-		echo "yes"
-	else
-		echo "no"
-		AC_MSG_ERROR([SubLib not found. Place a compiled sublib.dll into the `build' dir OR extract a sublib source package into gnome-subtitles base dir.])
-	fi
-fi
-
-AC_SUBST(SUBLIB_DIR)
-
 echo -n "checking for gstreamer-playbin package dir... "
 for i in gstreamer-playbin*
 do
@@ -126,6 +102,11 @@
 PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0 glade-sharp-2.0 gnome-sharp-2.0 gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION)
 
+dnl SubLib
+SUBLIB_REQUIRED_VERSION=0.9
+PKG_CHECK_MODULES(SUBLIB, sublib >= $SUBLIB_REQUIRED_VERSION)
+
+
 AC_SUBST(MCS)
 
 dnl Handle GConf

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Apr 14 23:23:47 2008
@@ -6,7 +6,6 @@
 
 ASSEMBLY = $(GS_BUILDDIR)/gnome-subtitles.exe
 ASSEMBLY_CONFIG = $(ASSEMBLY).config
-SUBLIB = $(GS_BUILDDIR)/sublib.dll
 GSTPB = $(GS_BUILDDIR)/GStreamerPlaybin.dll
 
 GS_SOURCES = \
@@ -41,12 +40,11 @@
 	$(GS_DATADIR)/video-set-subtitle-start-16x.png
 
 GS_SYSTEM_REFERENCES = \
-	$(SUBLIB) \
 	$(GSTPB) \
 	Mono.Posix.dll
 
 $(ASSEMBLY): $(GS_SOURCES) $(GS_RESOURCES)
-	$(MCS) $(MCS_FLAGS) -target:winexe -out:$(ASSEMBLY) $(GS_SYSTEM_REFERENCES:%=-r:%) $(GTKSHARP_LIBS) $(GS_RESOURCES:%=-resource:%) $(GS_SOURCES)
+	$(MCS) $(MCS_FLAGS) -target:winexe -out:$(ASSEMBLY) $(GS_SYSTEM_REFERENCES:%=-r:%) $(GTKSHARP_LIBS) $(SUBLIB_LIBS) $(GS_RESOURCES:%=-resource:%) $(GS_SOURCES)
 
 $(ASSEMBLY_CONFIG):
 	cp -f $(srcdir)/GnomeSubtitles/Execution/gnome-subtitles.exe.config $(GS_BUILDDIR)