diff options
author | Tor Lillqvist <tlillqvist@suse.com> | 2012-03-01 20:20:24 +0200 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-03-01 20:20:24 +0200 |
commit | ebbef3a92d968bc82bbb86109ed604434a071e1f (patch) | |
tree | 900c2efb76310c476617013c0b328432b0c8baf9 /redland | |
parent | e8dbf6840ca118222ad95856dc7ea06eaffc3b66 (diff) |
Move MinGW-specific magic inside MinGW-specific .IF branch
Diffstat (limited to 'redland')
-rw-r--r-- | redland/raptor/makefile.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index d898f94793de..c90c1754228b 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -96,11 +96,6 @@ CONFIGURE_FLAGS=--disable-static --enable-shared --disable-gtk-doc --with-openss BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) -.ELSE -# there is no wntmsci build environment in the tarball; we use custom dmakefile -BUILD_ACTION=dmake -BUILD_DIR=$(CONFIGURE_DIR)$/src -.ENDIF # Hack to get librdf.dll linked on mingw. I am already wearied of # fighting libtool's pseudo-intelligence, so I am just going to go with @@ -110,6 +105,14 @@ ALL : $(OUT)/lib/libraptor.la $(OUT)/lib/libraptor.la : $(MISC)/build/so_built_so_raptor $(SED) "/^dlname/s@='@='../bin/@" $(MISC)/build/$(TARFILE_NAME)/src/libraptor.la > $@ +.ELSE + +# there is no wntmsci build environment in the tarball; we use custom dmakefile +BUILD_ACTION=dmake +BUILD_DIR=$(CONFIGURE_DIR)$/src + +.ENDIF + .ELSE # "WNT" .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" |