From efd85bc528b2e80cf7d3ba7a46afee168f9467bf Mon Sep 17 00:00:00 2001 From: Paul Ramsey Date: Mon, 4 Feb 2013 15:36:13 -0800 Subject: [PATCH] Rename libpc to lib for hobu --- Makefile | 4 ++-- configure.ac | 4 ++-- {libpc => lib}/Makefile | 2 +- {libpc => lib}/cunit/.gitignore | 0 {libpc => lib}/cunit/Makefile | 0 {libpc => lib}/cunit/cu_pc_patch.c | 0 {libpc => lib}/cunit/cu_pc_point.c | 0 {libpc => lib}/cunit/cu_pc_schema.c | 0 {libpc => lib}/cunit/cu_tester.c | 0 {libpc => lib}/cunit/cu_tester.h | 0 {libpc => lib}/cunit/data/pdal-schema.xml | 0 {libpc => lib}/cunit/data/simple-schema.xml | 0 {libpc => lib}/hashtable.c | 0 {libpc => lib}/hashtable.h | 0 {libpc => lib}/pc_api.h | 0 {libpc => lib}/pc_api_internal.h | 0 {libpc => lib}/pc_dimensional.c | 0 {libpc => lib}/pc_mem.c | 0 {libpc => lib}/pc_patch.c | 0 {libpc => lib}/pc_point.c | 0 {libpc => lib}/pc_pointlist.c | 0 {libpc => lib}/pc_schema.c | 0 {libpc => lib}/pc_util.c | 0 {libpc => lib}/pc_val.c | 0 {libpc => lib}/stringbuffer.c | 0 {libpc => lib}/stringbuffer.h | 0 pgsql/Makefile | 6 +++--- 27 files changed, 8 insertions(+), 8 deletions(-) rename {libpc => lib}/Makefile (91%) rename {libpc => lib}/cunit/.gitignore (100%) rename {libpc => lib}/cunit/Makefile (100%) rename {libpc => lib}/cunit/cu_pc_patch.c (100%) rename {libpc => lib}/cunit/cu_pc_point.c (100%) rename {libpc => lib}/cunit/cu_pc_schema.c (100%) rename {libpc => lib}/cunit/cu_tester.c (100%) rename {libpc => lib}/cunit/cu_tester.h (100%) rename {libpc => lib}/cunit/data/pdal-schema.xml (100%) rename {libpc => lib}/cunit/data/simple-schema.xml (100%) rename {libpc => lib}/hashtable.c (100%) rename {libpc => lib}/hashtable.h (100%) rename {libpc => lib}/pc_api.h (100%) rename {libpc => lib}/pc_api_internal.h (100%) rename {libpc => lib}/pc_dimensional.c (100%) rename {libpc => lib}/pc_mem.c (100%) rename {libpc => lib}/pc_patch.c (100%) rename {libpc => lib}/pc_point.c (100%) rename {libpc => lib}/pc_pointlist.c (100%) rename {libpc => lib}/pc_schema.c (100%) rename {libpc => lib}/pc_util.c (100%) rename {libpc => lib}/pc_val.c (100%) rename {libpc => lib}/stringbuffer.c (100%) rename {libpc => lib}/stringbuffer.h (100%) diff --git a/Makefile b/Makefile index 3ddf46e..7e9902b 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ all install uninstall noop clean distclean: - $(MAKE) -C libpc $@ + $(MAKE) -C lib $@ $(MAKE) -C pgsql $@ check: - $(MAKE) -C libpc $@ + $(MAKE) -C lib $@ astyle: find . \ diff --git a/configure.ac b/configure.ac index 8182b17..7d34a05 100644 --- a/configure.ac +++ b/configure.ac @@ -253,8 +253,8 @@ dnl Output the relevant files dnl =========================================================================== AC_OUTPUT([ - libpc/Makefile - libpc/cunit/Makefile + lib/Makefile + lib/cunit/Makefile ]) dnl =========================================================================== diff --git a/libpc/Makefile b/lib/Makefile similarity index 91% rename from libpc/Makefile rename to lib/Makefile index c9af445..a10c20f 100644 --- a/libpc/Makefile +++ b/lib/Makefile @@ -27,7 +27,7 @@ clean: $(MAKE) -C cunit $@ install: - @echo "No install target in libpc" + @echo "No install target in lib" check: $(MAKE) -C cunit $@ diff --git a/libpc/cunit/.gitignore b/lib/cunit/.gitignore similarity index 100% rename from libpc/cunit/.gitignore rename to lib/cunit/.gitignore diff --git a/libpc/cunit/Makefile b/lib/cunit/Makefile similarity index 100% rename from libpc/cunit/Makefile rename to lib/cunit/Makefile diff --git a/libpc/cunit/cu_pc_patch.c b/lib/cunit/cu_pc_patch.c similarity index 100% rename from libpc/cunit/cu_pc_patch.c rename to lib/cunit/cu_pc_patch.c diff --git a/libpc/cunit/cu_pc_point.c b/lib/cunit/cu_pc_point.c similarity index 100% rename from libpc/cunit/cu_pc_point.c rename to lib/cunit/cu_pc_point.c diff --git a/libpc/cunit/cu_pc_schema.c b/lib/cunit/cu_pc_schema.c similarity index 100% rename from libpc/cunit/cu_pc_schema.c rename to lib/cunit/cu_pc_schema.c diff --git a/libpc/cunit/cu_tester.c b/lib/cunit/cu_tester.c similarity index 100% rename from libpc/cunit/cu_tester.c rename to lib/cunit/cu_tester.c diff --git a/libpc/cunit/cu_tester.h b/lib/cunit/cu_tester.h similarity index 100% rename from libpc/cunit/cu_tester.h rename to lib/cunit/cu_tester.h diff --git a/libpc/cunit/data/pdal-schema.xml b/lib/cunit/data/pdal-schema.xml similarity index 100% rename from libpc/cunit/data/pdal-schema.xml rename to lib/cunit/data/pdal-schema.xml diff --git a/libpc/cunit/data/simple-schema.xml b/lib/cunit/data/simple-schema.xml similarity index 100% rename from libpc/cunit/data/simple-schema.xml rename to lib/cunit/data/simple-schema.xml diff --git a/libpc/hashtable.c b/lib/hashtable.c similarity index 100% rename from libpc/hashtable.c rename to lib/hashtable.c diff --git a/libpc/hashtable.h b/lib/hashtable.h similarity index 100% rename from libpc/hashtable.h rename to lib/hashtable.h diff --git a/libpc/pc_api.h b/lib/pc_api.h similarity index 100% rename from libpc/pc_api.h rename to lib/pc_api.h diff --git a/libpc/pc_api_internal.h b/lib/pc_api_internal.h similarity index 100% rename from libpc/pc_api_internal.h rename to lib/pc_api_internal.h diff --git a/libpc/pc_dimensional.c b/lib/pc_dimensional.c similarity index 100% rename from libpc/pc_dimensional.c rename to lib/pc_dimensional.c diff --git a/libpc/pc_mem.c b/lib/pc_mem.c similarity index 100% rename from libpc/pc_mem.c rename to lib/pc_mem.c diff --git a/libpc/pc_patch.c b/lib/pc_patch.c similarity index 100% rename from libpc/pc_patch.c rename to lib/pc_patch.c diff --git a/libpc/pc_point.c b/lib/pc_point.c similarity index 100% rename from libpc/pc_point.c rename to lib/pc_point.c diff --git a/libpc/pc_pointlist.c b/lib/pc_pointlist.c similarity index 100% rename from libpc/pc_pointlist.c rename to lib/pc_pointlist.c diff --git a/libpc/pc_schema.c b/lib/pc_schema.c similarity index 100% rename from libpc/pc_schema.c rename to lib/pc_schema.c diff --git a/libpc/pc_util.c b/lib/pc_util.c similarity index 100% rename from libpc/pc_util.c rename to lib/pc_util.c diff --git a/libpc/pc_val.c b/lib/pc_val.c similarity index 100% rename from libpc/pc_val.c rename to lib/pc_val.c diff --git a/libpc/stringbuffer.c b/lib/stringbuffer.c similarity index 100% rename from libpc/stringbuffer.c rename to lib/stringbuffer.c diff --git a/libpc/stringbuffer.h b/lib/stringbuffer.h similarity index 100% rename from libpc/stringbuffer.h rename to lib/stringbuffer.h diff --git a/pgsql/Makefile b/pgsql/Makefile index f096565..b3a0b48 100644 --- a/pgsql/Makefile +++ b/pgsql/Makefile @@ -13,9 +13,9 @@ DATA = pointcloud--1.0.sql REGRESS = pointcloud -# Add in build/link flags for libpc -PG_CPPFLAGS += -I../libpc -SHLIB_LINK += $(filter -lm, $(LIBS)) $(XML2_LDFLAGS) ../libpc/$(LIBPC_A) +# Add in build/link flags for lib +PG_CPPFLAGS += -I../lib +SHLIB_LINK += $(filter -lm, $(LIBS)) $(XML2_LDFLAGS) ../lib/$(LIBPC_A) # We are going to use PGXS for sure PG_CONFIG = pg_config