diff options
Diffstat (limited to 'libglusterfs')
| -rw-r--r-- | libglusterfs/src/Makefile.am | 24 | ||||
| -rw-r--r-- | libglusterfs/src/gfdb/Makefile.am | 24 |
2 files changed, 20 insertions, 28 deletions
diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am index e086ecec89f..20163da769c 100644 --- a/libglusterfs/src/Makefile.am +++ b/libglusterfs/src/Makefile.am @@ -6,10 +6,10 @@ libglusterfs_la_CFLAGS = $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS) \ libglusterfs_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 \ -DXLATORDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator\" \ -DXLATORPARENTDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)\" \ - -I$(top_srcdir)/rpc/xdr/src/ -I$(top_srcdir)/rpc/rpc-lib/src/ \ - -I$(CONTRIBDIR)/rbtree -I$(CONTRIBDIR)/libexecinfo \ - ${ARGP_STANDALONE_CPPFLAGS} -DSBIN_DIR=\"$(sbindir)\" \ - -I$(CONTRIBDIR)/timer-wheel + -I$(top_srcdir)/rpc/xdr/src/ -I$(top_builddir)/rpc/xdr/src/ \ + -I$(top_srcdir)/rpc/rpc-lib/src/ -I$(CONTRIBDIR)/rbtree \ + -I$(CONTRIBDIR)/libexecinfo ${ARGP_STANDALONE_CPPFLAGS} \ + -DSBIN_DIR=\"$(sbindir)\" -I$(CONTRIBDIR)/timer-wheel libglusterfs_la_LIBADD = @LEXLIB@ $(ZLIB_LIBS) $(MATH_LIB) $(UUID_LIBS) libglusterfs_la_LDFLAGS = -version-info $(LIBGLUSTERFS_LT_VERSION) @@ -36,9 +36,9 @@ libglusterfs_la_SOURCES = dict.c xlator.c logging.c \ compound-fop-utils.c throttle-tbf.c nodist_libglusterfs_la_SOURCES = y.tab.c graph.lex.c defaults.c -nodist_libglusterfs_la_HEADERS = y.tab.h glusterfs-fops.h cli1-xdr.h +nodist_libglusterfs_la_HEADERS = y.tab.h -BUILT_SOURCES = graph.lex.c defaults.c glusterfs-fops.h eventtypes.h cli1-xdr.h +BUILT_SOURCES = graph.lex.c defaults.c eventtypes.h libglusterfs_la_HEADERS = common-utils.h defaults.h default-args.h \ dict.h glusterfs.h hashfn.h timespec.h logging.h xlator.h \ @@ -95,18 +95,6 @@ y.tab.h: graph.y defaults.c: defaults-tmpl.c generator.py gen-defaults.py $(PYTHON) $(srcdir)/gen-defaults.py $(srcdir)/defaults-tmpl.c > $@ -$(top_srcdir)/rpc/xdr/src/glusterfs-fops.h: $(top_srcdir)/rpc/xdr/src/glusterfs-fops.x - $(MAKE) -C $(top_builddir)/rpc/xdr/src/ `basename $@` - -glusterfs-fops.h: $(top_srcdir)/rpc/xdr/src/glusterfs-fops.h - cp $(top_srcdir)/rpc/xdr/src/glusterfs-fops.h . - -$(top_srcdir)/rpc/xdr/src/cli1-xdr.h: $(top_srcdir)/rpc/xdr/src/cli1-xdr.x - $(MAKE) -C $(top_builddir)/rpc/xdr/src/ `basename $@` - -cli1-xdr.h: $(top_srcdir)/rpc/xdr/src/cli1-xdr.h - cp $(top_srcdir)/rpc/xdr/src/cli1-xdr.h . - CLEANFILES = $(nodist_libglusterfs_la_SOURCES) $(nodist_libglusterfs_la_HEADERS) if UNITTEST diff --git a/libglusterfs/src/gfdb/Makefile.am b/libglusterfs/src/gfdb/Makefile.am index 50cf3402787..3931e694c24 100644 --- a/libglusterfs/src/gfdb/Makefile.am +++ b/libglusterfs/src/gfdb/Makefile.am @@ -1,12 +1,14 @@ libgfdb_la_CFLAGS = -Wall $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS) \ - $(SQLITE_CFLAGS) -DDATADIR=\"$(localstatedir)\" + $(SQLITE_CFLAGS) -DDATADIR=\"$(localstatedir)\" libgfdb_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 -fpic \ - -I$(top_srcdir)/libglusterfs/src \ - -DDATADIR=\"$(localstatedir)\" + -I$(top_srcdir)/libglusterfs/src \ + -I$(top_srcdir)/rpc/xdr/src \ + -I$(top_builddir)/rpc/xdr/src \ + -DDATADIR=\"$(localstatedir)\" libgfdb_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ - $(SQLITE_LIBS) $(UUID_LIBS) + $(SQLITE_LIBS) $(UUID_LIBS) libgfdb_la_LDFLAGS = $(GF_LDFLAGS) -version-info $(LIBGLUSTERFS_LT_VERSION) @@ -18,14 +20,16 @@ endif CONTRIB_BUILDDIR = $(top_builddir)/contrib -libgfdb_la_SOURCES = gfdb_data_store.c gfdb_data_store_helper.c gfdb_sqlite3_helper.c\ - gfdb_sqlite3.c +libgfdb_la_SOURCES = gfdb_data_store.c gfdb_data_store_helper.c \ + gfdb_sqlite3_helper.c gfdb_sqlite3.c -noinst_HEADERS = gfdb_data_store.h gfdb_data_store_types.h gfdb_sqlite3_helper.h\ - gfdb_sqlite3.h gfdb_mem-types.h gfdb_data_store_helper.h +noinst_HEADERS = gfdb_data_store.h gfdb_data_store_types.h \ + gfdb_sqlite3_helper.h gfdb_sqlite3.h gfdb_mem-types.h \ + gfdb_data_store_helper.h -libgfdb_HEADERS = gfdb_data_store.h gfdb_data_store_types.h gfdb_data_store_helper.h\ - gfdb_sqlite3.h gfdb_mem-types.h gfdb_sqlite3_helper.h +libgfdb_HEADERS = gfdb_data_store.h gfdb_data_store_types.h \ + gfdb_data_store_helper.h gfdb_sqlite3.h gfdb_mem-types.h \ + gfdb_sqlite3_helper.h CLEANFILES = |