ekiga r7145 - in branches/gnome-2-24: . win32

[mschneid svn gnome org]

Author: mschneid
Date: Thu Oct  2 20:36:26 2008
New Revision: 7145
URL: http://svn.gnome.org/viewvc/ekiga?rev=7145&view=rev

Log:
Fix make dist.


Modified:
   branches/gnome-2-24/Makefile.am
   branches/gnome-2-24/win32/Makefile

Modified: branches/gnome-2-24/Makefile.am
==============================================================================
--- branches/gnome-2-24/Makefile.am	(original)
+++ branches/gnome-2-24/Makefile.am	Thu Oct  2 20:36:26 2008
@@ -20,12 +20,6 @@
 WIN32_DIST = \
 	win32/ico/ekiga.ico					\
 	win32/ico/ekiga-uninstall.ico					\
-	win32/diff/opal_opal.pc.in				\
-	win32/diff/ptlib_Makefile.am				\
-	win32/diff/opal_configure.ac				\
-	win32/diff/opal_Makefile.am				\
-	win32/diff/ptlib_configure.ac				\
-	win32/diff/ptlib_pwlib.pc.in				\
 	ekiga.rc						\
 	win32/Makefile						\
 	win32/nsisinstaller/ekiga.nsi				\

Modified: branches/gnome-2-24/win32/Makefile
==============================================================================
--- branches/gnome-2-24/win32/Makefile	(original)
+++ branches/gnome-2-24/win32/Makefile	Thu Oct  2 20:36:26 2008
@@ -457,7 +457,7 @@
 	echo --- Getting OPAL $(OPAL_REV)...
 	$(SVN) co $(OPAL_URL) $(SRCDIR)/$(OPAL_ARCHIVE) -r $(OPAL_REV)
 
-$(OPAL_DIR)/configure: binaries $(LIBDIR)/libogg.a $(LIBDIR)/libspeex.a $(LIBDIR)/libpt_s.a $(SRCDIR)/$(OPAL_ARCHIVE) $(EKIGA_WIN32_DIFF_DIR)/opal_configure.ac $(EKIGA_WIN32_DIFF_DIR)/opal_Makefile.am $(EKIGA_WIN32_DIFF_DIR)/opal_opal.pc.in $(BINDIR)/avcodec.dll $(LIBDIR)/libx264.a $(LIBDIR)/libtheora.a
+$(OPAL_DIR)/configure: binaries $(LIBDIR)/libogg.a $(LIBDIR)/libspeex.a $(LIBDIR)/libpt_s.a $(SRCDIR)/$(OPAL_ARCHIVE) $(BINDIR)/avcodec.dll $(LIBDIR)/libx264.a $(LIBDIR)/libtheora.a
 	rm -rf $(OPAL_DIR) $(LIBDIR)/libopal_s.a
 	$(CP) -r $(SRCDIR)/$(OPAL_ARCHIVE) $(OPAL_DIR)
 
@@ -644,8 +644,6 @@
 		fi \
 	done
 	(cd $(TARGETDIR)/;zip -9r ekiga.zip Ekiga )
-	zip -9r $(TARGETDIR)/ekiga_build.zip Makefile $(EKIGA_WIN32_DIFF_DIR)/* ico/*
-	tar cfvz $(TARGETDIR)/ekiga_build.tgz Makefile $(EKIGA_WIN32_DIFF_DIR)/* ico/*
 	touch $@
 
 #### README about NSIS installer ####