gcalctool r2062 - in branches/gnome-2-22: . gcalctool m4 po



Author: rancell
Date: Thu Apr 10 01:46:43 2008
New Revision: 2062
URL: http://svn.gnome.org/viewvc/gcalctool?rev=2062&view=rev

Log:
Fix build so make distcheck works (Bug #526702)


Added:
   branches/gnome-2-22/m4/Makefile.am
   branches/gnome-2-22/po/POTFILES.skip
Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/Makefile.am
   branches/gnome-2-22/configure.in
   branches/gnome-2-22/gcalctool/Makefile.am

Modified: branches/gnome-2-22/Makefile.am
==============================================================================
--- branches/gnome-2-22/Makefile.am	(original)
+++ branches/gnome-2-22/Makefile.am	Thu Apr 10 01:46:43 2008
@@ -29,7 +29,7 @@
 	gnome-doc-utils.make	\
 	gcalctool.desktop
 
-SUBDIRS = po gcalctool glade help
+SUBDIRS = po gcalctool glade help m4
 
 SCHEMAS_FILE = gcalctool.schemas
 
@@ -48,7 +48,6 @@
 	gcalctoolrc \
 	gcalctool.desktop.in \
 	gnome-doc-utils.make	\
-	m4/*.m4			\
 	intltool-extract.in     \
 	intltool-merge.in       \
 	intltool-update.in      \

Modified: branches/gnome-2-22/configure.in
==============================================================================
--- branches/gnome-2-22/configure.in	(original)
+++ branches/gnome-2-22/configure.in	Thu Apr 10 01:46:43 2008
@@ -95,6 +95,7 @@
 Makefile
 gcalctool/Makefile
 po/Makefile.in
+m4/Makefile
 glade/Makefile
 help/Makefile
 help/bg/Makefile

Modified: branches/gnome-2-22/gcalctool/Makefile.am
==============================================================================
--- branches/gnome-2-22/gcalctool/Makefile.am	(original)
+++ branches/gnome-2-22/gcalctool/Makefile.am	Thu Apr 10 01:46:43 2008
@@ -72,19 +72,19 @@
 	$(COMPILE) -c $(INCLUDES) -o $@ $(srcdir)/lr_parser.c
 
 lex.ce.o: lex.ce.c calctool.h
-	$(COMPILE) -c $(INCLUDES) -o $@ $(srcdir)/lex.ce.c
+	$(COMPILE) -c $(INCLUDES) -o $@ lex.ce.c
 
 lex.lr.o: lex.lr.c calctool.h
-	$(COMPILE) -c $(INCLUDES) -o $@ $(srcdir)/lex.lr.c
+	$(COMPILE) -c $(INCLUDES) -o $@ lex.lr.c
 
 ce_parser.tab.o: ce_parser.tab.c
-	$(COMPILE) -c $(INCLUDES) -o $@ $(srcdir)/ce_parser.tab.c
+	$(COMPILE) -c $(INCLUDES) -o $@ ce_parser.tab.c
 
 ce_parser.tab.c: ce_parser.y calctool.h
 	bison -d -p ce -d $(srcdir)/ce_parser.y
 
 lr_parser.tab.o: lr_parser.tab.c
-	$(COMPILE) -c $(INCLUDES) -o $@ $(srcdir)/lr_parser.tab.c
+	$(COMPILE) -c $(INCLUDES) -o $@ lr_parser.tab.c
 
 lr_parser.tab.c: lr_parser.y calctool.h
 	bison -d -p lr $(srcdir)/lr_parser.y

Added: branches/gnome-2-22/m4/Makefile.am
==============================================================================
--- (empty file)
+++ branches/gnome-2-22/m4/Makefile.am	Thu Apr 10 01:46:43 2008
@@ -0,0 +1,3 @@
+EXTRA_DIST = gnome-doc-utils.m4 \
+             intltool.m4
+

Added: branches/gnome-2-22/po/POTFILES.skip
==============================================================================
--- (empty file)
+++ branches/gnome-2-22/po/POTFILES.skip	Thu Apr 10 01:46:43 2008
@@ -0,0 +1,4 @@
+gcalctool/ce_parser.tab.c
+gcalctool/lr_parser.tab.c
+gcalctool/ce_parser.tab.c
+gcalctool/lr_parser.tab.c



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