[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/geas Makefile.am configure.in examples/Mak...
|
From: |
Reinhard Mueller |
|
Subject: |
gnue/geas Makefile.am configure.in examples/Mak... |
|
Date: |
Sat, 09 Jun 2001 16:35:38 -0700 |
CVSROOT: /cvs
Module name: gnue
Changes by: Reinhard Mueller <address@hidden> 01/06/09 16:35:38
Modified files:
geas : Makefile.am configure.in
geas/examples : Makefile.am
geas/examples/businessobjects/methods: Makefile.am
geas/lib/classdefs: Makefile.am
geas/src : Makefile.am
Log message:
fixed some makefile issues for make dist and make install. still have
to fix dist and install for geas.conf/shadowpw and *.reserved.lst
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/Makefile.am.diff?cvsroot=OldCVS&tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/configure.in.diff?cvsroot=OldCVS&tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/examples/Makefile.am.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/examples/businessobjects/methods/Makefile.am.diff?cvsroot=OldCVS&tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/lib/classdefs/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/Makefile.am.diff?cvsroot=OldCVS&tr1=1.35&tr2=1.36&r1=text&r2=text
Patches:
Index: gnue/geas/Makefile.am
diff -u gnue/geas/Makefile.am:1.9 gnue/geas/Makefile.am:1.10
--- gnue/geas/Makefile.am:1.9 Wed May 16 08:57:58 2001
+++ gnue/geas/Makefile.am Sat Jun 9 16:35:38 2001
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.9 2001/05/16 15:57:58 reinhard Exp $
+## $Id: Makefile.am,v 1.10 2001/06/09 23:35:38 reinhard Exp $
SUBDIRS = lib src tools examples idl
@@ -7,3 +7,4 @@
dist-hook: geas.spec
cp geas.spec $(distdir)
+ cp -R doc $(distdir)/doc
Index: gnue/geas/configure.in
diff -u gnue/geas/configure.in:1.32 gnue/geas/configure.in:1.33
--- gnue/geas/configure.in:1.32 Sat Jun 9 14:36:36 2001
+++ gnue/geas/configure.in Sat Jun 9 16:35:38 2001
@@ -370,10 +370,11 @@
examples/Makefile \
examples/businessobjects/Makefile \
examples/businessobjects/methods/Makefile \
+ examples/python/Makefile \
idl/Makefile \
- src/Makefile \
lib/Makefile \
lib/classdefs/Makefile \
+ src/Makefile \
src/config/Makefile \
src/datamonitor/Makefile \
src/objectcache/Makefile \
Index: gnue/geas/examples/Makefile.am
diff -u gnue/geas/examples/Makefile.am:1.2 gnue/geas/examples/Makefile.am:1.3
--- gnue/geas/examples/Makefile.am:1.2 Wed May 16 08:55:16 2001
+++ gnue/geas/examples/Makefile.am Sat Jun 9 16:35:38 2001
@@ -1,4 +1,3 @@
-## $Id: Makefile.am,v 1.2 2001/05/16 15:55:16 reinhard Exp $
+## $Id: Makefile.am,v 1.3 2001/06/09 23:35:38 reinhard Exp $
-SUBDIRS = businessobjects
-
+SUBDIRS = businessobjects python
Index: gnue/geas/examples/businessobjects/methods/Makefile.am
diff -u gnue/geas/examples/businessobjects/methods/Makefile.am:1.11
gnue/geas/examples/businessobjects/methods/Makefile.am:1.12
--- gnue/geas/examples/businessobjects/methods/Makefile.am:1.11 Wed May 16
08:55:16 2001
+++ gnue/geas/examples/businessobjects/methods/Makefile.am Sat Jun 9
16:35:38 2001
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.11 2001/05/16 15:55:16 reinhard Exp $
+## $Id: Makefile.am,v 1.12 2001/06/09 23:35:38 reinhard Exp $
INCLUDES = -I$(top_srcdir) `glib-config gmodule glib --cflags` `orbit-config
client --cflags`
@@ -7,3 +7,5 @@
libtest_la_SOURCES = test.c
libtest_la_LDFLAGS = -rdynamic -avoid-version -module
libtest_la_LIBADD = -ldl
+
+EXTRA_DIST = test.py
Index: gnue/geas/lib/classdefs/Makefile.am
diff -u gnue/geas/lib/classdefs/Makefile.am:1.6
gnue/geas/lib/classdefs/Makefile.am:1.7
--- gnue/geas/lib/classdefs/Makefile.am:1.6 Wed May 16 08:55:16 2001
+++ gnue/geas/lib/classdefs/Makefile.am Sat Jun 9 16:35:38 2001
@@ -1,23 +1,15 @@
+## $Id: Makefile.am,v 1.7 2001/06/09 23:35:38 reinhard Exp $
+
noinst_LIBRARIES = libclassdefs.a
-INCLUDES = $(GLIB_CFLAGS) -ggdb
+INCLUDES = $(GLIB_CFLAGS)
AM_LFLAGS = -i
AM_YFLAGS = -d -v
-
-libclassdefs_headers = \
- classdata.h \
- gcdparser.h \
- classdata_database.h \
- lparser.h
-libclassdefs_a_SOURCES = \
- $(libclassdefs_headers) \
- gcdparser.c \
- classdata.c \
- classdata_database.c \
- yparser.y \
- lparser.l
+libclassdefs_a_SOURCES = gcdparser.c gcdparser.h classdata.c classdata.h \
+ classdata_database.c classdata_database.h \
+ yparser.y lparser.l lparser.h
CLEANFILES = y.output
Index: gnue/geas/src/Makefile.am
diff -u gnue/geas/src/Makefile.am:1.35 gnue/geas/src/Makefile.am:1.36
--- gnue/geas/src/Makefile.am:1.35 Sat Jun 9 14:36:36 2001
+++ gnue/geas/src/Makefile.am Sat Jun 9 16:35:38 2001
@@ -1,67 +1,43 @@
-## $Id: Makefile.am,v 1.35 2001/06/09 21:36:36 reinhard Exp $
+## $Id: Makefile.am,v 1.36 2001/06/09 23:35:38 reinhard Exp $
SUBDIRS = config objectstore oql objectcache methods datamonitor
-bin_PROGRAMS = geas-server
+## ----------------------------------------------------------------------------
+bin_PROGRAMS = geas-server
+
# temporary, really - just while the python interpreter is in GEAS
# PYTHON_CFLAGS= $(PYTHON_INCLUDES)
-# PYTHON_LFLAGS= -lpython1.5
+# PYTHON_LIBS= -lpython1.5
PYTHON_CFLAGS= -DNO_USE_PYTHON
-PYTHON_LFLAGS=
-
-MODULES = \
- $(top_builddir)/src/config/libconfig.a \
- $(top_builddir)/src/oql/oql.o \
- $(top_builddir)/src/objectcache/objectcache.o \
- $(top_builddir)/src/objectstore/libobjectstore.a \
- $(top_builddir)/src/methods/methods.o \
- $(top_builddir)/src/datamonitor/datamonitor.o
-
-INCLUDES = \
- -DUSE_SERVANT_MANAGER \
- -DGEAS_SYSRC=\"$(sysconfdir)/geas.conf\" \
- -DGEAS_DATA_DIR=\"$(localstatedir)/lib/geas\" \
- -DGEAS_PID_DIR=\"$(localstatedir)/run\" \
- -DGEAS_IOR_DIR=\"$(localstatedir)/run\" \
- -I$(topdir)/src/config/ \
- -I$(topdir)/src/objectstore/ \
- -I$(top_srcdir)/lib/classdefs \
- -I$(top_srcdir) \
- $(GLIB_CFLAGS) \
- $(DB_CFLAGS) \
- $(ORBIT_CFLAGS) \
- $(PYTHON_CFLAGS)
-
-LDADD = \
- $(GLIB_LIBS) \
- $(DB_LIBS) \
- $(ORBIT_LIBS) \
- $(NAMESERVICE_LIBS) \
- $(MODULES) \
- $(PYTHON_LFLAGS) \
- -luuid \
- ../lib/classdefs/libclassdefs.a
-
-IDL_FILES = \
- $(top_srcdir)/idl/geas.idl \
- $(top_srcdir)/idl/schema.idl \
- $(top_srcdir)/idl/typedefs.idl \
- $(top_srcdir)/idl/exceptions.idl \
- $(top_srcdir)/idl/admin.idl \
- $(top_srcdir)/idl/connection.idl \
- $(top_srcdir)/idl/dataobject.idl \
- $(top_srcdir)/idl/objectlist.idl \
- $(top_srcdir)/idl/transaction.idl \
- $(top_srcdir)/idl/factory.idl \
- $(top_srcdir)/idl/query.idl \
- $(top_srcdir)/idl/treshna.idl \
- $(top_srcdir)/idl/methodprovider.idl
+PYTHON_LIBS=
-IDLOUT = \
- geas-skels.c \
- geas-common.c \
- geas-stubs.c
+MODULES = $(top_builddir)/src/config/libconfig.a \
+ $(top_builddir)/src/oql/liboql.a \
+ $(top_builddir)/src/objectcache/libobjectcache.a \
+ $(top_builddir)/src/objectstore/libobjectstore.a \
+ $(top_builddir)/src/methods/libmethods.a \
+ $(top_builddir)/src/datamonitor/libdatamonitor.a
+
+INCLUDES = -DUSE_SERVANT_MANAGER \
+ -DGEAS_SYSRC=\"$(sysconfdir)/geas.conf\" \
+ -DGEAS_PID_DIR=\"$(localstatedir)/run\" \
+ -DGEAS_IOR_DIR=\"$(localstatedir)/run\" \
+ $(GLIB_CFLAGS) \
+ $(DB_CFLAGS) \
+ $(ORBIT_CFLAGS) \
+ $(PYTHON_CFLAGS) \
+ -I$(top_srcdir)/src/ \
+ -I$(top_srcdir)/lib/classdefs
+
+LDADD = $(GLIB_LIBS) \
+ $(DB_LIBS) \
+ $(ORBIT_LIBS) \
+ $(NAMESERVICE_LIBS) \
+ $(MODULES) \
+ $(PYTHON_LIBS) \
+ -luuid \
+ ../lib/classdefs/libclassdefs.a
geas_srvr_headers = geas.h \
geas-server.h \
@@ -79,11 +55,12 @@
schema.h \
geas-skeleton.h \
servantlocator.h \
- event_log_code.h
+ event_log_code.h \
+ globals.h
+
+IDLOUT = geas-skels.c geas-common.c geas-stubs.c
-BUILT_SOURCES = \
- $(IDLOUT) \
- geas-skelimpl.h
+BUILT_SOURCES = $(IDLOUT) geas-skelimpl.h
geas_server_SOURCES = \
$(geas_srvr_headers) \
@@ -101,19 +78,32 @@
collectiondata.c \
security.c \
schema.c
+
+## ----------------------------------------------------------------------------
+
+EXTRA_DIST = geas.conf-dist shadowpw-dist
-sysconf_DATA = \
- geas.conf-dist \
- shadowpw-dist
-
-EXTRA_DIST = $(sysconf_DATA) $(SUBDIRS) geas.conf-dist
-
-CLEANFILES = \
- $(IDLOUT) \
- $(BUILT_SOURCES) \
- *.ior \
- *.pid
+## ----------------------------------------------------------------------------
+CLEANFILES = *.ior *.pid
+
+## ----------------------------------------------------------------------------
+
+IDL_FILES = \
+ $(top_srcdir)/idl/geas.idl \
+ $(top_srcdir)/idl/schema.idl \
+ $(top_srcdir)/idl/typedefs.idl \
+ $(top_srcdir)/idl/exceptions.idl \
+ $(top_srcdir)/idl/admin.idl \
+ $(top_srcdir)/idl/connection.idl \
+ $(top_srcdir)/idl/dataobject.idl \
+ $(top_srcdir)/idl/objectlist.idl \
+ $(top_srcdir)/idl/transaction.idl \
+ $(top_srcdir)/idl/factory.idl \
+ $(top_srcdir)/idl/query.idl \
+ $(top_srcdir)/idl/treshna.idl \
+ $(top_srcdir)/idl/methodprovider.idl
+
$(IDLOUT) : $(IDL_FILES)
$(ORBIT_IDL) $(top_srcdir)/idl/geas.idl
@@ -127,8 +117,7 @@
# remove the unneeded file
rm geas-skelimpl.c
-dist-hook:
- cd $(distdir); rm -f $(BUILT_SOURCES)
+## ----------------------------------------------------------------------------
install-exec-hook:
-if test ! -e $(sysconfdir)/geas.conf; then cd $(sysconfdir); cp
geas.conf-dist geas.conf; fi
@@ -136,10 +125,8 @@
sysconf_DATA = geas.conf
geas.conf: geas.conf-dist
- sed "s,address@hidden@,${pkgdatadir},g" geas.conf-dist >
geas.conf-dist.tmp
+ sed "s,address@hidden@,${pkgdatadir},g" ${srcdir}/geas.conf-dist >
geas.conf-dist.tmp
sed "s,address@hidden@,${localstatedir},g" geas.conf-dist.tmp >
geas.conf-dist.tmp2
sed "s,address@hidden@,${datadir},g" geas.conf-dist.tmp2 >
geas.conf-dist.tmp3
mv geas.conf-dist.tmp3 geas.conf
rm geas.conf-dist.tmp geas.conf-dist.tmp2
-
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/geas Makefile.am configure.in examples/Mak...,
Reinhard Mueller <=