Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of ssh://msporny@yuna/home/dbgit/librdfa

  • Loading branch information...
commit 4450ae4b6edebf60c48d4c94b83b4b56cfb59c32 2 parents bb4b73b + 1a2b6c7
@msporny msporny authored
Showing with 14 additions and 5 deletions.
  1. +1 −1  configure.ac
  2. +13 −4 setup/Makefile.base.in
View
2  configure.ac
@@ -72,7 +72,7 @@ fi
#AC_CHECK_HEADERS(iostream)
# Make sure the proper libraries exist
-AC_CHECK_LIB(expat, main, [], AC_MSG_ERROR(could not find expat library), -L/usr/lib)
+AC_CHECK_LIB(expat, main, [], AC_MSG_ERROR(could not find expat library), -L/usr/lib -L/sw/lib)
# Set the OS so that we can do certain build modifications if needed
OS="$build_os"
View
17 setup/Makefile.base.in
@@ -2,7 +2,7 @@
# instructions for all binaries and packages.
AR_FLAGS = cr
RDFA = @RDFADIR@
-INCLUDES = -I$/usr/include -I$(RDFA)/c -I$(RDFA)/tests
+INCLUDES = -I/usr/include -I/sw/include -I$(RDFA)/c -I$(RDFA)/tests
CURRENT_DIR = $(shell pwd)
@@ -20,7 +20,7 @@ CC_FLAGS = -Wall -fPIC -g
endif
LIB_DIR = $(RDFA)/libs
-LDFLAGS = -L$(LIB_DIR) -L/usr/lib
+LDFLAGS = -L$(LIB_DIR) -L/usr/lib -L/sw/lib
AR = @AR@
OS = @OS@
DLLWRAP = @DLLWRAP@
@@ -38,11 +38,14 @@ ALL_SOURCES += $(patsubst %,$(BUILD_DIR)/%.c, $(EXECUTABLES))
ALL_DEPENDENCIES += $(DEPENDENCIES)
ALL_OBJECTS += $(OBJECTS)
+ALL_LIBRARIES := $(patsubst %,$(DIST_DIR)/%.so, $(LIBRARIES))
+ALL_LIBRARIES += $(patsubst %,$(DIST_DIR)/%.a, $(LIBRARIES))
ifeq ($(OS),mingw32)
ALL_LIBRARIES := $(patsubst %,$(DIST_DIR)/%.lib, $(LIBRARIES))
ALL_LIBRARIES += $(patsubst %,$(DIST_DIR)/%.dll, $(LIBRARIES))
-else
-ALL_LIBRARIES := $(patsubst %,$(DIST_DIR)/lib%.so, $(LIBRARIES))
+endif
+ifeq ($(OS),darwin8.9.1)
+ALL_LIBRARIES := $(patsubst %,$(DIST_DIR)/lib%.dylib, $(LIBRARIES))
ALL_LIBRARIES += $(patsubst %,$(DIST_DIR)/lib%.a, $(LIBRARIES))
endif
@@ -79,6 +82,12 @@ $(ALL_SOURCES):
@mkdir -p $(LIB_DIR)
@ln -sf $(CURRENT_DIR)/$@ $(LIB_DIR)/$(@F)
+%.dylib: $(OBJECTS)
+ @echo "Building $@..."
+ $(CC) $(LDFLAGS) -dynamiclib -o $@ $(OBJECTS) $(DYNAMIC_LINK_LIBRARIES:%=-l%)
+ @mkdir -p $(LIB_DIR)
+ @ln -sf $(CURRENT_DIR)/$@ $(LIB_DIR)/$(@F)
+
%.dll: $(OBJECTS)
@echo "Building $@..."
@$(DLLWRAP) $(DLLWRAP_FLAGS) $(LDFLAGS) --output-def $(@:.dll=.def) --implib $(@:.dll=.lib) -o $@ $^ $(DYNAMIC_LINK_LIBRARIES:%=-l%) --exclude-symbols $(EXCLUDE_DLL_SYMBOLS)
Please sign in to comment.
Something went wrong with that request. Please try again.