Reorganized source files

Makefile

@@ -1,24 +1,29 @@
-#The build configuration
+# The build configuration (debug or release)
 CONFIG := release
 
+# Extension packaging options
 EXTENSION := pg_libphonenumber
-version := 1.0
+version := 0.1.0
 extension_script := $(EXTENSION)--$(version).sql
 DATA_built := $(extension_script)
 REGRESS := regression
 
 # Build options
-cpp_files := $(wildcard *.cpp)
+cpp_files := $(wildcard src/*.cpp)
 
+# The native module to build
 MODULE_big := pg_libphonenumber
-
+# The object files that go into the module
 OBJS := $(patsubst %.cpp,%.o,$(cpp_files))
-PG_CPPFLAGS := -fPIC -std=c++11
+
+# C flags
+PG_CPPFLAGS := -fPIC -std=c++11 -Isrc/
 ifeq ($(CONFIG),debug)
 	PG_CPPFLAGS += -g -Og
 else
 	PG_CPPFLAGS += -O3
 endif
+# Extra libraries to link
 SHLIB_LINK := -lphonenumber -lstdc++
 
 # Clean options
@@ -29,10 +34,10 @@ PG_CONFIG := pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 
-#How to build the extension script:
+# Build the extension script:
 $(extension_script): $(EXTENSION).sql.template tools/get_sizeof_phone_number
 	sed "s/SIZEOF_PHONE_NUMBER/$(shell tools/get_sizeof_phone_number)/" $< > $@
 
-tools/get_sizeof_phone_number: tools/get_sizeof_phone_number.cpp short_phone_number.h
+# Gets the size of a ShortPhoneNumber (which corresponds to the phone_number type in SQL)
-	$(CXX) -std=c++11 $< -o $@
+tools/get_sizeof_phone_number: tools/get_sizeof_phone_number.cpp src/short_phone_number.h
-
+	$(CXX) $(PG_CPPFLAGS) $< -o $@

README.md

@@ -1,13 +1,16 @@
 # pg-libphonenumber
-A (partially implemented!) PostgreSQL extension that provides access to [Google's libphonenumber](https://github.com/googlei18n/libphonenumber)
+
+A (partially implemented!) PostgreSQL extension that provides access to
+[Google's `libphonenumber`](https://github.com/googlei18n/libphonenumber)
 
 ## Project status
 
-This extension is in an <strong>ALPHA</strong> state. Do not use it in production environments.
+This extension is in an <strong>alpha</strong> state. It's not complete or
+tested enough for critical production deployments, but with a little help, we
+should be able to get it there.
 
 ## Synopsis
 
-
     CREATE EXTENSION pg_libphonenumber;
     SELECT parse_phone_number('03 7010 1234', 'AU');
     SELECT parse_phone_number('2819010011', 'US');

pg_libphonenumber.control

@@ -1,3 +1,3 @@
 encoding = 'utf-8'
 relocatable = true
-default_version = '1.0'
+default_version = '0.1.0'

tools/get_sizeof_phone_number.cpp

@@ -1,6 +1,6 @@
 #include <iostream>
 
-#include "../short_phone_number.h"
+#include "short_phone_number.h"
 
 int main(int argc, const char** argv) {
     std::cout << sizeof(ShortPhoneNumber) << std::endl;