[chronojump] Cleanup makefiles



commit 267a690e71f89d55fe79eae98d5782fd2a723e59
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Sun Jan 27 16:12:31 2013 +0100

    Cleanup makefiles

 Makefile.am    |    5 +++++
 configure.ac   |    2 +-
 win32/Makefile |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5a4886f..178d48b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,11 @@ if OSTYPE_LINUX
  SUBDIRS += chronopic-tests chronojump_server
 endif
 
+if OSTYPE_WINDOWS
+win32-bundle:
+	make -C win32 bundle
+endif
+
 # Build ChangeLog from GIT history
 ChangeLog:
 	@if test -f $(top_srcdir)/.git/HEAD; then \
diff --git a/configure.ac b/configure.ac
index 3437147..bcc74db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,7 +105,7 @@ PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0])
 PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])
 PKG_CHECK_MODULES([GLADE_SHARP_20], [glade-sharp-2.0])
 
-PKG_CHECK_MODULES(CESARPLAYER, [gtk+-2.0 >= 2.8 gdk-2.0 gio-2.0 glib-2.0 gstreamer-0.10 gstreamer-audio-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10 gobject-2.0 gstreamer-interfaces-0.10])
+PKG_CHECK_MODULES(CESARPLAYER, [gtk+-2.0 >= 2.8 gdk-2.0 gio-2.0 glib-2.0 gstreamer-0.10 gstreamer-audio-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10 gobject-2.0 gstreamer-interfaces-0.10 gstreamer-app-0.10 gstreamer-tag-0.10])
 AC_SUBST(CESARPLAYER_CFLAGS)
 AC_SUBST(CESARPLAYER_LIBS)
 
diff --git a/win32/Makefile b/win32/Makefile
index 3f6b55f..0a6b4af 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -4,7 +4,7 @@ deploy:
 	make install -C ../
 	mv dist/lib/bin/libcesarplayer-0.dll dist/bin
 
-bundle:
+bundle: deploy
 	windres logo.rc logo.o
 	MONO_PATH=dist/lib/chronojump mkbundle dist/lib/chronojump/Chronojump.exe --deps -c -o temp.c -oo temp.o
 	${CC} -g -o dist/bin/Chronojump.exe -Wall temp.c `pkg-config --cflags --libs mono-2`  logo.o temp.o



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]