[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/geas Makefile.am examples/Makefile.am exam...
|
From: |
Reinhard Mueller |
|
Subject: |
gnue/geas Makefile.am examples/Makefile.am exam... |
|
Date: |
Wed, 16 May 2001 08:55:21 -0700 |
CVSROOT: /cvs
Module name: gnue
Changes by: Reinhard Mueller <address@hidden> 01/05/16 08:55:17
Modified files:
geas : Makefile.am
geas/examples : Makefile.am
geas/examples/businessobjects: Makefile.am
geas/examples/businessobjects/methods: Makefile.am
geas/idl : Makefile.am
geas/lib : Makefile.am
geas/lib/classdefs: Makefile.am
geas/lib/md5 : Makefile.am
geas/src : Makefile.am
geas/src/datamonitor: Makefile.am
geas/src/methods: Makefile.am
geas/src/objectcache: Makefile.am
geas/src/objectstore: Makefile.am
geas/src/oql : Makefile.am
geas/tools : Makefile.am
Log message:
General cleanup of all makefiles.
make, make dist, and make install should work now.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/Makefile.am.diff?cvsroot=OldCVS&tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/examples/Makefile.am.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/examples/businessobjects/Makefile.am.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/examples/businessobjects/methods/Makefile.am.diff?cvsroot=OldCVS&tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/idl/Makefile.am.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/lib/Makefile.am.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/lib/classdefs/Makefile.am.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/lib/md5/Makefile.am.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/Makefile.am.diff?cvsroot=OldCVS&tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/datamonitor/Makefile.am.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/Makefile.am.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/objectcache/Makefile.am.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/objectstore/Makefile.am.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/oql/Makefile.am.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/tools/Makefile.am.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: gnue/geas/Makefile.am
diff -u gnue/geas/Makefile.am:1.7 gnue/geas/Makefile.am:1.8
--- gnue/geas/Makefile.am:1.7 Wed Jan 31 13:38:00 2001
+++ gnue/geas/Makefile.am Wed May 16 08:55:16 2001
@@ -1,33 +1,9 @@
-## Process this file with automake to produce Makefile.in
+## $Id: Makefile.am,v 1.8 2001/05/16 15:55:16 reinhard Exp $
-SUBDIRS = lib src tools examples idl
+SUBDIRS = lib src tools examples idl
-INCLUDES = \
- $(GLIB_CFLAGS) \
- $(DMALLOC_CFLAGS)
+rpms: dist
+ rpm -ta $(top_builddir)/geas-0.0.4.tar.gz
-EXTRA_DIST = \
- TODO \
- geas.spec.in
-
-BUILD_EXTRA_DIST = \
- geas.spec
-
dist-hook: geas.spec
cp geas.spec $(distdir)
-
-rpms: distcheck
- rpm -ta $(top_builddir)/@address@hidden@address@hidden
-
-localstate_DUMMY =
-
-MAINTAINERCLEANFILES = \
- configure \
- config.guess \
- config.sub \
- ltconfig \
- ltmain.sh \
- aclocal.m4 \
- config.h.in \
- stamp-h.in \
- Makefile.in
Index: gnue/geas/examples/Makefile.am
diff -u gnue/geas/examples/Makefile.am:1.1 gnue/geas/examples/Makefile.am:1.2
--- gnue/geas/examples/Makefile.am:1.1 Tue Jan 30 14:32:23 2001
+++ gnue/geas/examples/Makefile.am Wed May 16 08:55:16 2001
@@ -1,4 +1,4 @@
-## Process this file with automake to produce Makefile.in
+## $Id: Makefile.am,v 1.2 2001/05/16 15:55:16 reinhard Exp $
SUBDIRS = businessobjects
Index: gnue/geas/examples/businessobjects/Makefile.am
diff -u gnue/geas/examples/businessobjects/Makefile.am:1.3
gnue/geas/examples/businessobjects/Makefile.am:1.4
--- gnue/geas/examples/businessobjects/Makefile.am:1.3 Thu Mar 8 19:27:06 2001
+++ gnue/geas/examples/businessobjects/Makefile.am Wed May 16 08:55:16 2001
@@ -1,9 +1,7 @@
-## Process this file with automake to produce Makefile.in
+## $Id: Makefile.am,v 1.4 2001/05/16 15:55:16 reinhard Exp $
-SUBDIRS= methods
+SUBDIRS = methods
-pkgdata_DATA = \
- addrbook.gcd
+pkgdata_DATA = addrbook.gcd
-EXTRA_DIST= $(pkgdata_DATA)
-
+EXTRA_DIST = $(pkgdata_DATA)
Index: gnue/geas/examples/businessobjects/methods/Makefile.am
diff -u gnue/geas/examples/businessobjects/methods/Makefile.am:1.10
gnue/geas/examples/businessobjects/methods/Makefile.am:1.11
--- gnue/geas/examples/businessobjects/methods/Makefile.am:1.10 Tue May 15
10:54:17 2001
+++ gnue/geas/examples/businessobjects/methods/Makefile.am Wed May 16
08:55:16 2001
@@ -1,3 +1,4 @@
+## $Id: Makefile.am,v 1.11 2001/05/16 15:55:16 reinhard Exp $
INCLUDES = -I$(top_srcdir) `glib-config gmodule glib --cflags` `orbit-config
client --cflags`
@@ -6,4 +7,3 @@
libtest_la_SOURCES = test.c
libtest_la_LDFLAGS = -rdynamic -avoid-version -module
libtest_la_LIBADD = -ldl
-
Index: gnue/geas/idl/Makefile.am
diff -u gnue/geas/idl/Makefile.am:1.4 gnue/geas/idl/Makefile.am:1.5
--- gnue/geas/idl/Makefile.am:1.4 Wed Mar 14 20:17:14 2001
+++ gnue/geas/idl/Makefile.am Wed May 16 08:55:16 2001
@@ -1,3 +1,5 @@
+## $Id: Makefile.am,v 1.5 2001/05/16 15:55:16 reinhard Exp $
+
IDL_FILES = \
connection.idl \
dataobject.idl \
@@ -10,14 +12,11 @@
typedefs.idl \
query.idl \
transaction.idl \
- methodprovider.idl
+ methodprovider.idl \
+ treshna.idl
idldir= $(datadir)/idl
idl_DATA= $(IDL_FILES)
-
-EXTRA_DIST = \
- $(IDL_FILES)
-MAINTAINERCLEANFILES = \
- Makefile.in
+EXTRA_DIST = $(IDL_FILES)
Index: gnue/geas/lib/Makefile.am
diff -u gnue/geas/lib/Makefile.am:1.2 gnue/geas/lib/Makefile.am:1.3
--- gnue/geas/lib/Makefile.am:1.2 Tue Jan 9 15:48:01 2001
+++ gnue/geas/lib/Makefile.am Wed May 16 08:55:16 2001
@@ -1,4 +1,3 @@
-SUBDIRS = md5 classdefs
+## $Id: Makefile.am,v 1.3 2001/05/16 15:55:16 reinhard Exp $
-MAINTAINERCLEANFILES = \
- Makefile.in
+SUBDIRS = classdefs md5
Index: gnue/geas/lib/classdefs/Makefile.am
diff -u gnue/geas/lib/classdefs/Makefile.am:1.5
gnue/geas/lib/classdefs/Makefile.am:1.6
--- gnue/geas/lib/classdefs/Makefile.am:1.5 Thu Mar 8 16:12:47 2001
+++ gnue/geas/lib/classdefs/Makefile.am Wed May 16 08:55:16 2001
@@ -1,20 +1,10 @@
-lib_LIBRARIES = libclassdefs.a
+noinst_LIBRARIES = libclassdefs.a
-# -DIN_GCD_LIBRARY is used to prevent including files
-# from the wrong place
-INCLUDES = -DIN_GCD_LIBRARY \
- $(GLIB_CFLAGS) \
- $(DMALLOC_CFLAGS) \
- -ggdb
-
-LFLAGS = -i
-YFLAGS = -d -v
-
-BUILT_SOURCES = \
- yparser.h \
- yparser.c \
- lparser.c
+INCLUDES = $(GLIB_CFLAGS) -ggdb
+AM_LFLAGS = -i
+AM_YFLAGS = -d -v
+
libclassdefs_headers = \
classdata.h \
gcdparser.h \
@@ -28,14 +18,13 @@
classdata_database.c \
yparser.y \
lparser.l
-
-CLEANFILES = \
- $(BUILT_SOURCES) \
- y.output
-
-MAINTAINERCLEANFILES = \
- Makefile.in
-dist-hook:
- cd $(distdir); rm -f $(BUILT_SOURCES)
+CLEANFILES = y.output
+# This is to work around a bug in automake 1.4. These files should be
+# maintainer-clean'ed by default.
+MAINTAINERCLEANFILES += lparser.c yparser.h yparser.c
+# and this file should be in DIST_COMMON
+EXTRA_DIST += yparser.h
+# in current CVS version of automake (2001-05-16) these bugs are fixed
+# so with the next release of automake these lines can be deleted
Index: gnue/geas/lib/md5/Makefile.am
diff -u gnue/geas/lib/md5/Makefile.am:1.1 gnue/geas/lib/md5/Makefile.am:1.2
--- gnue/geas/lib/md5/Makefile.am:1.1 Thu Dec 21 20:27:40 2000
+++ gnue/geas/lib/md5/Makefile.am Wed May 16 08:55:16 2001
@@ -1,8 +1,5 @@
-lib_LIBRARIES = libmd5.a
+## $Id: Makefile.am,v 1.2 2001/05/16 15:55:16 reinhard Exp $
-libmd5_a_SOURCES = \
- md5.c \
- md5.h
+noinst_LIBRARIES = libmd5.a
-MAINTAINERCLEANFILES = \
- Makefile.in
+libmd5_a_SOURCES = md5.c md5.h
Index: gnue/geas/src/Makefile.am
diff -u gnue/geas/src/Makefile.am:1.31 gnue/geas/src/Makefile.am:1.32
--- gnue/geas/src/Makefile.am:1.31 Mon May 14 14:57:57 2001
+++ gnue/geas/src/Makefile.am Wed May 16 08:55:16 2001
@@ -1,4 +1,4 @@
-## Process this file with automake to produce Makefile.in
+## $Id: Makefile.am,v 1.32 2001/05/16 15:55:16 reinhard Exp $
SUBDIRS = config objectstore oql objectcache methods datamonitor
@@ -10,7 +10,6 @@
PYTHON_CFLAGS= -DNO_USE_PYTHON
PYTHON_LFLAGS=
-
MODULES = \
$(top_builddir)/src/config/libconfig.a \
$(top_builddir)/src/oql/oql.o \
@@ -34,8 +33,6 @@
$(DB_CFLAGS) \
$(ORBIT_CFLAGS) \
$(DMALLOC_CFLAGS) \
- $(MEMORY_DEBUG_CFLAGS) \
- $(NAMESERVICE_CFLAGS) \
$(PYTHON_CFLAGS)
LDADD = \
@@ -85,7 +82,8 @@
geas-internal-classes.h \
schema.h \
geas-skeleton.h \
- servantlocator.h
+ servantlocator.h \
+ event_log_code.h
BUILT_SOURCES = \
$(IDLOUT) \
@@ -119,11 +117,6 @@
$(BUILT_SOURCES) \
*.ior \
*.pid
-
-DISTCLEANFILES =
-
-MAINTAINERCLEANFILES = \
- Makefile.in
$(IDLOUT) : $(IDL_FILES)
$(ORBIT_IDL) $(top_srcdir)/idl/geas.idl
Index: gnue/geas/src/datamonitor/Makefile.am
diff -u gnue/geas/src/datamonitor/Makefile.am:1.1
gnue/geas/src/datamonitor/Makefile.am:1.2
--- gnue/geas/src/datamonitor/Makefile.am:1.1 Sun Feb 18 19:42:10 2001
+++ gnue/geas/src/datamonitor/Makefile.am Wed May 16 08:55:16 2001
@@ -1,14 +1,7 @@
+## $Id: Makefile.am,v 1.2 2001/05/16 15:55:16 reinhard Exp $
-lib_LIBRARIES = libdatamonitor.a
+noinst_LIBRARIES = libdatamonitor.a
-INCLUDES = \
- $(GLIB_CFLAGS) \
- $(DMALLOC_CFLAGS) \
- -I$(top_srcdir)/lib/classdefs \
- -I..
+INCLUDES = $(GLIB_CFLAGS)
-libdatamonitor_a_SOURCES = \
- datamonitor.c
-
-MAINTAINERCLEANFILES = \
- Makefile.in
+libdatamonitor_a_SOURCES = datamonitor.c datamonitor.h
Index: gnue/geas/src/methods/Makefile.am
diff -u gnue/geas/src/methods/Makefile.am:1.6
gnue/geas/src/methods/Makefile.am:1.7
--- gnue/geas/src/methods/Makefile.am:1.6 Wed Apr 4 12:38:29 2001
+++ gnue/geas/src/methods/Makefile.am Wed May 16 08:55:16 2001
@@ -1,29 +1,12 @@
+## $Id: Makefile.am,v 1.7 2001/05/16 15:55:16 reinhard Exp $
-lib_LIBRARIES = libmethods.a
+noinst_LIBRARIES = libmethods.a
-INCLUDES = \
- $(METHOD_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(ORBIT_CFLAGS) \
- $(DMALLOC_CFLAGS) \
- -I$(top_srcdir)/lib/classdefs \
- -I..
+INCLUDES = $(METHOD_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(ORBIT_CFLAGS) \
+ -I$(top_srcdir)/lib/classdefs \
+ -I$(top_srcdir)/src
-EXTRA_DIST = \
- methods_oaf.h
-
-libmethods_a_SOURCES = \
- methods.c
-
-LDADD = \
- methods.o \
- $(METHOD_LIBS) \
- $(GLIB_LIBS) \
- $(DB_LIBS) \
- $(ORBIT_LIBS) \
- $(DMALLOC_LIBS)
-
-EXTRA_DIST =
-
-MAINTAINERCLEANFILES = \
- Makefile.in
+libmethods_a_SOURCES = methods.c methods.h \
+ methods_glibmodule.h methods_oaf.h methods_unstable.h
Index: gnue/geas/src/objectcache/Makefile.am
diff -u gnue/geas/src/objectcache/Makefile.am:1.2
gnue/geas/src/objectcache/Makefile.am:1.3
--- gnue/geas/src/objectcache/Makefile.am:1.2 Wed Apr 4 12:38:29 2001
+++ gnue/geas/src/objectcache/Makefile.am Wed May 16 08:55:17 2001
@@ -1,20 +1,12 @@
+## $Id: Makefile.am,v 1.3 2001/05/16 15:55:17 reinhard Exp $
-lib_LIBRARIES = libobjectcache.a
+noinst_LIBRARIES = libobjectcache.a
-INCLUDES = \
- $(GLIB_CFLAGS) \
- $(ORBIT_CFLAGS) \
- $(DMALLOC_CFLAGS) \
- -I../config \
- -I../objectstore \
- -I$(top_srcdir)/lib/classdefs \
- -I..
+INCLUDES = $(GLIB_CFLAGS) \
+ $(ORBIT_CFLAGS) \
+ -I$(top_srcdir)/lib/classdefs \
+ -I$(top_srcdir)/src/config \
+ -I$(top_srcdir)/src/objectstore \
+ -I$(top_srcdir)/src
-libobjectcache_headers = \
- objectcache.h
-
-libobjectcache_a_SOURCES = \
- objectcache.c
-
-MAINTAINERCLEANFILES = \
- Makefile.in
+libobjectcache_a_SOURCES = objectcache.c objectcache.h objectcache_internal.h
Index: gnue/geas/src/objectstore/Makefile.am
diff -u gnue/geas/src/objectstore/Makefile.am:1.4
gnue/geas/src/objectstore/Makefile.am:1.5
--- gnue/geas/src/objectstore/Makefile.am:1.4 Tue May 15 23:47:16 2001
+++ gnue/geas/src/objectstore/Makefile.am Wed May 16 08:55:17 2001
@@ -1,15 +1,15 @@
-lib_LIBRARIES = libobjectstore.a
+## $Id: Makefile.am,v 1.5 2001/05/16 15:55:17 reinhard Exp $
-INCLUDES = \
- $(GLIB_CFLAGS) \
- $(DB_CFLAGS) \
- $(ORBIT_CFLAGS) \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/oql/ \
- -I$(top_srcdir)/src/config/ \
- -I$(top_srcdir)/src/objectcache/ \
- -I$(top_srcdir)/lib/classdefs
+noinst_LIBRARIES = libobjectstore.a
-libobjectstore_a_SOURCES = objectstore.c objectstore.h
+INCLUDES = $(GLIB_CFLAGS) \
+ $(DB_CFLAGS) \
+ $(ORBIT_CFLAGS) \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/oql/ \
+ -I$(top_srcdir)/src/config/ \
+ -I$(top_srcdir)/src/objectcache/ \
+ -I$(top_srcdir)/lib/classdefs
-MAINTAINERCLEANFILES = Makefile.in
+libobjectstore_a_SOURCES = objectstore.c objectstore.h \
+ mysql_access.h postgresql_access.h
Index: gnue/geas/src/oql/Makefile.am
diff -u gnue/geas/src/oql/Makefile.am:1.2 gnue/geas/src/oql/Makefile.am:1.3
--- gnue/geas/src/oql/Makefile.am:1.2 Wed Apr 4 12:38:29 2001
+++ gnue/geas/src/oql/Makefile.am Wed May 16 08:55:17 2001
@@ -1,21 +1,13 @@
+## $Id: Makefile.am,v 1.3 2001/05/16 15:55:17 reinhard Exp $
-lib_LIBRARIES = liboql.a
+noinst_LIBRARIES = liboql.a
-INCLUDES = \
- $(GLIB_CFLAGS) \
- $(ORBIT_CFLAGS) \
- $(DMALLOC_CFLAGS) \
- -I../config \
- -I../objectstore \
- -I../objectcache \
- -I$(top_srcdir)/lib/classdefs \
- -I..
+INCLUDES = $(GLIB_CFLAGS) \
+ $(ORBIT_CFLAGS) \
+ -I$(top_srcdir)/src/config \
+ -I$(top_srcdir)/src/objectstore \
+ -I$(top_srcdir)/src/objectcache \
+ -I$(top_srcdir)/lib/classdefs \
+ -I$(top_srcdir)/src
-liboql_headers = \
- oql.h
-
-liboql_a_SOURCES = \
- oql.c
-
-MAINTAINERCLEANFILES = \
- Makefile.in
+liboql_a_SOURCES = oql.c oql.h oql_internal.h
Index: gnue/geas/tools/Makefile.am
diff -u gnue/geas/tools/Makefile.am:1.4 gnue/geas/tools/Makefile.am:1.5
--- gnue/geas/tools/Makefile.am:1.4 Thu Mar 8 15:04:47 2001
+++ gnue/geas/tools/Makefile.am Wed May 16 08:55:17 2001
@@ -1,33 +1,9 @@
-## Process this file with automake to produce Makefile.in
+## $Id: Makefile.am,v 1.5 2001/05/16 15:55:17 reinhard Exp $
-bin_PROGRAMS = gcdverifier
+bin_PROGRAMS = gcdverifier
-INCLUDES = \
- -I$(top_srcdir)/lib/classdefs \
- -I$(top_srcdir) \
- $(GLIB_CFLAGS) \
- $(DMALLOC_CFLAGS) \
- $(MEMORY_DEBUG_CFLAGS)
+INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)/lib/classdefs
-LDADD = \
- $(GLIB_LIBS) \
- $(DMALLOC_LIBS) \
- ../lib/classdefs/libclassdefs.a
+LDADD = $(GLIB_LIBS) ../lib/classdefs/libclassdefs.a
-gcdverifier_headers =
-
-gcdverifier_SOURCES = \
- $(gcdverifier_headers) \
- gcdverifier.c
-
-EXTRA_DIST =
-
-CLEANFILES =
-
-DISTCLEANFILES =
-
-MAINTAINERCLEANFILES = \
- Makefile.in
-
-dist-hook:
- cd $(distdir); rm -f $(BUILT_SOURCES)
+gcdverifier_SOURCES = gcdverifier.c
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/geas Makefile.am examples/Makefile.am exam...,
Reinhard Mueller <=