[Xfce4-commits] r25386 - in squeeze/trunk: . libsqueeze src

[Stephan Arts]

Author: stephan
Date: 2007-04-05 11:56:18 +0000 (Thu, 05 Apr 2007)
New Revision: 25386

Removed:
   squeeze/trunk/tests/
Modified:
   squeeze/trunk/Makefile.am
   squeeze/trunk/configure.in.in
   squeeze/trunk/libsqueeze/Makefile.am
   squeeze/trunk/src/Makefile.am
Log:
remove tests (since that doesn't work anyways), and changed stuff to get make distcheck working (which it almost does)

Modified: squeeze/trunk/Makefile.am
===================================================================
--- squeeze/trunk/Makefile.am	2007-04-05 11:34:07 UTC (rev 25385)
+++ squeeze/trunk/Makefile.am	2007-04-05 11:56:18 UTC (rev 25386)
@@ -4,7 +4,7 @@
 	1.8								\
 	dist-bzip2
 
-SUBDIRS = pixmaps libsqueeze tests po docs src icons
+SUBDIRS = pixmaps libsqueeze po docs src icons
 
 wrapperdir = $(libexecdir)/thunar-archive-plugin/
 wrapper_SCRIPTS = squeeze.tap

Modified: squeeze/trunk/configure.in.in
===================================================================
--- squeeze/trunk/configure.in.in	2007-04-05 11:34:07 UTC (rev 25385)
+++ squeeze/trunk/configure.in.in	2007-04-05 11:56:18 UTC (rev 25386)
@@ -136,8 +136,6 @@
 docs/reference/Makefile
 docs/reference/libsqueeze/Makefile
 docs/reference/libsqueeze/version.xml
-tests/Makefile
-tests/zip/Makefile
 ])
 
 echo "----------------------------------------"

Modified: squeeze/trunk/libsqueeze/Makefile.am
===================================================================
--- squeeze/trunk/libsqueeze/Makefile.am	2007-04-05 11:34:07 UTC (rev 25385)
+++ squeeze/trunk/libsqueeze/Makefile.am	2007-04-05 11:56:18 UTC (rev 25386)
@@ -28,7 +28,7 @@
 libsqueeze_1_la_CFLAGS = \
 	$(GLIB_CFLAGS)  \
 	$(DBUS_CFLAGS)  \
-	$(THUNAR_VFS_CFLAGS)
+	$(THUNAR_VFS_CFLAGS) -pg
 
 libsqueeze_1_la_LIBADD =
 
@@ -37,3 +37,5 @@
 
 libsqueeze_includedir= \
 	$(includedir)/libsqueeze
+
+INCLUDES = -I$(top_srcdir)

Modified: squeeze/trunk/src/Makefile.am
===================================================================
--- squeeze/trunk/src/Makefile.am	2007-04-05 11:34:07 UTC (rev 25385)
+++ squeeze/trunk/src/Makefile.am	2007-04-05 11:56:18 UTC (rev 25386)
@@ -38,14 +38,14 @@
 	$(XFCE4UTIL_CFLAGS) \
 	-DDATADIR=\"$(datadir)\" \
 	-DSRCDIR=\"$(top_srcdir)\" \
-	-DLOCALEDIR=\"$(localedir)\"
+	-DLOCALEDIR=\"$(localedir)\" -pg
  
 squeeze_LDADD = \
-	$(top_srcdir)/libsqueeze/libsqueeze-1.la \
+	$(top_builddir)/libsqueeze/libsqueeze-1.la \
 	@GTK_LIBS@ \
 	@GLIB_LIBS@ \
 	@DBUS_LIBS@ \
-	@THUNAR_VFS_LIBS@
+	@THUNAR_VFS_LIBS@ 
 
 # squeeze_LDFLAGS = -static