diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-21 15:50:23 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-04-22 07:04:11 +0000 |
| commit | 1ea1818dd15bcfc1605764b237e6f71e8fcb5635 (patch) | |
| tree | f856f4670c1fcb7c3511993a915ec8bfdb2f8c3d /odk/CustomTarget_unowinreg.mk | |
| parent | 5c7f6ca7e15bbac390730eeb30a864763756447c (diff) | |
use Package for unowinreg
Change-Id: I7546e8938ba41e1462e704bd0405c5a887151d7b
Reviewed-on: https://gerrit.libreoffice.org/3531
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'odk/CustomTarget_unowinreg.mk')
| -rw-r--r-- | odk/CustomTarget_unowinreg.mk | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/odk/CustomTarget_unowinreg.mk b/odk/CustomTarget_unowinreg.mk index 76fe2f99f8b0..3a46ddfd6860 100644 --- a/odk/CustomTarget_unowinreg.mk +++ b/odk/CustomTarget_unowinreg.mk @@ -11,11 +11,6 @@ $(eval $(call gb_CustomTarget_CustomTarget,odk/unowinreg)) $(eval $(call gb_CustomTarget_register_target,odk/unowinreg,unowinreg.dll)) -ifeq ($(BUILD_UNOWINREG),YES) -ifeq ($(COM),MSC) -$(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll: $(call gb_Library_get_target,unowinreg) - cp $< $@ -else # COM=GCC $(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll : \ $(SRCDIR)/odk/source/unowinreg/win/unowinreg.cxx $(MINGWCXX) -Wall -D_JNI_IMPLEMENTATION_ \ @@ -25,12 +20,7 @@ $(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll : \ -I$(JAVA_HOME)/include/bsd -I$(JAVA_HOME)/include/linux,\ $(if $(filter NETBSD,$(OS)),-I$(JAVA_HOME)/include/netbsd))) \ -shared -o $@ $< \ - -Wl,--kill-at -lkernel32 -ladvapi32 + -Wl,--kill-at -lkernel32 -ladvapi32 && \ $(MINGWSTRIP) $@ -endif -else # BUILD_UNOWINREG=NO -$(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll: $(TARFILE_LOCATION)/$(UNOWINREG_DLL) - cp $< $@ -endif # vim: set noet sw=4 ts=4: |