diff options
author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2011-03-07 00:04:03 +0100 |
---|---|---|
committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2011-03-07 20:57:51 +0100 |
commit | 03efcf3d1ee80d500d14345cec0fd9e3e59cb6ea (patch) | |
tree | bea03102833fe2e84cb296b7844ef338d8903f43 /insertutils/Makefile-files | |
parent | 386eb3da03dc953c4228147bdea3da9ab4398ad0 (diff) | |
download | rasdaman-upstream-03efcf3d1ee80d500d14345cec0fd9e3e59cb6ea.tar.gz rasdaman-upstream-03efcf3d1ee80d500d14345cec0fd9e3e59cb6ea.tar.xz rasdaman-upstream-03efcf3d1ee80d500d14345cec0fd9e3e59cb6ea.zip |
nonrecbuild: Main work for building
Renames a few programs which are called the same as a directory.
We need to change the directories later, and rename them back.
Lacks qlparser and rasdl stuff, as those use flex and bison and
thus need special handling.
Diffstat (limited to 'insertutils/Makefile-files')
-rw-r--r-- | insertutils/Makefile-files | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/insertutils/Makefile-files b/insertutils/Makefile-files index 1378c94..250c59c 100644 --- a/insertutils/Makefile-files +++ b/insertutils/Makefile-files @@ -31,25 +31,34 @@ bin_PROGRAMS += insertppm -rdmexecbin_SCRIPTS += insertdemo.sh +rdmexecbin_SCRIPTS += insertutils/insertdemo.sh -insertppm_SOURCES=insertppm.cc ../mymalloc/mymalloc_cln.cc -insertppm_LDADD=../rasodmg/librasodmg.la ../clientcomm/libclientcomm.la \ - ../compression/libcompression.la ../conversion/libconversion.la \ - ../raslib/libraslib.la \ - ../network/libnetwork.la +insertppm_SOURCES = insertutils/insertppm.cc +insertppm_SOURCES += mymalloc/mymalloc_cln.cc + +insertppm_libs = +insertppm_libs += librasodmg.la +insertppm_libs += libclientcomm.la +insertppm_libs += libcompression.la +insertppm_libs += libconversion.la +insertppm_libs += libraslib.la +insertppm_libs += libnetwork.la + +insertppm_LDADD = $(insertppm_libs) +insertppm_DEPENDENCIES = $(insertppm_libs) insertppm_CPPFLAGS = $(AM_CPPFLAGS) insertppm_CPPFLAGS += $(COMM_CPPFLAGS) insertppm_LDADD += $(COMM_LIBS) -CLEANFILES += insertdemo.sh -EXTRA_DIST += insertdemo.sh.in +CLEANFILES += insertutils/insertdemo.sh +EXTRA_DIST += insertutils/insertdemo.sh.in -insertdemo.sh: insertdemo.sh.in Makefile - rm -f insertdemo.sh +insertutils/insertdemo.sh: insertutils/insertdemo.sh.in Makefile + $(MKDIR_P) insertutils + rm -f insertutils/insertdemo.sh sed -e 's|@bindir[@]|$(bindir)/|g' \ -e 's|@pkgdatadir[@]|$(pkgdatadir)/|g'\ - < $(srcdir)/insertdemo.sh.in > insertdemo.sh - chmod +x insertdemo.sh - chmod a-w insertdemo.sh + < $(srcdir)/insertutils/insertdemo.sh.in > insertutils/insertdemo.sh + chmod +x insertutils/insertdemo.sh + chmod a-w insertutils/insertdemo.sh |