Permalink
Browse files

Remove USE_PGXS option.

  • Loading branch information...
1 parent b6868e9 commit 83022a1675f4c8700a96618076fa9c26a6a7a27a @umitanuki committed Mar 28, 2012
Showing with 7 additions and 9 deletions.
  1. +1 −1 META.json
  2. +0 −7 Makefile
  3. +0 −1 README.md
  4. +6 −0 libjson-0.8/Makefile
View
@@ -2,7 +2,7 @@
"name": "twitter_fdw",
"abstract": "a foreign data wrapper to Twitter Search",
"description": "This provides an access to Twitter Search API, returning the result as a table",
- "version": "1.0.0",
+ "version": "1.0.1",
"maintainer": "Hitoshi Harada <umi.tanuki@gmail.com>",
"license": "postgresql",
"resources": {
View
@@ -19,13 +19,6 @@ clean: clean-libjson
clean-libjson:
$(MAKE) -C $(LIBJSON) clean
-ifdef USE_PGXS
PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs)
include $(PGXS)
-else
-subdir = contrib/twitter_fdw
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-include $(top_srcdir)/contrib/contrib-global.mk
-endif
View
@@ -8,7 +8,6 @@ Twitter over the Internet and returns as a table.
Installation
------------
- $ export USE_PGXS=1
$ make && make install
$ psql -c "CREATE EXTENSION twitter_fdw" db
View
@@ -27,6 +27,8 @@ INSTALLDIR ?= $(DESTDIR)$(PREFIX)
TARGETS = $(A_TARGETS) $(SO_FILE) $(SO_LINKS) $(BIN_TARGETS) $(PC_TARGET)
+UNAME := $(shell uname)
+
all: $(TARGETS)
lib$(NAME).a: $(NAME).o
@@ -42,7 +44,11 @@ lib$(NAME).so.$(MAJOR).$(MINOR): lib$(NAME).so.$(MAJOR).$(MINOR).$(MICRO)
ln -sf $< $@
lib$(NAME).so.$(MAJOR).$(MINOR).$(MICRO): $(NAME).o
+ifeq ($(UNAME), Darwin)
+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^
+else
$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,lib$(NAME).so.$(MAJOR).$(MINOR).$(MICRO) $(SHLIB_CFLAGS) -o $@ $^
+endif
$(NAME)lint: $(NAME)lint.o $(NAME).o
$(CC) $(CFLAGS) -o $@ $+

0 comments on commit 83022a1

Please sign in to comment.