BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: Enable uninstall of Java bindings 

This is needed for make distcheck to work.
This commit is contained in:
Daniel Elstner 2015-11-07 22:20:19 +01:00
parent 9448951db5
commit 7252a09e8f
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@ -536,6 +536,7 @@ tests_main_LDADD = libsigrok.la $(SR_EXTRA_LIBS) $(TESTS_LIBS)
BUILD_EXTRA = BUILD_EXTRA =
INSTALL_EXTRA = INSTALL_EXTRA =
UNINSTALL_EXTRA =
CLEAN_EXTRA = CLEAN_EXTRA =
if BINDINGS_CXX if BINDINGS_CXX
@ -691,6 +692,10 @@ java-install:
$(INSTALL) -d $(DESTDIR)$(datadir)/java $(INSTALL) -d $(DESTDIR)$(datadir)/java
$(INSTALL) $(JJAR) $(DESTDIR)$(datadir)/java $(INSTALL) $(JJAR) $(DESTDIR)$(datadir)/java
java-uninstall:
-rm -f $(DESTDIR)$(datadir)/java/sigrok-core.jar
-rm -f $(DESTDIR)$(libdir)/jni/libsigrok_java_core_classes.so
java-clean: java-clean:
-$(AM_V_at)rm -f $(java_cleanfiles) -$(AM_V_at)rm -f $(java_cleanfiles)
-$(AM_V_at)rm -fr $(JDIR)/doxy -$(AM_V_at)rm -fr $(JDIR)/doxy
@ -700,12 +705,14 @@ java-doc:
BUILD_EXTRA += java-build BUILD_EXTRA += java-build
INSTALL_EXTRA += java-install INSTALL_EXTRA += java-install
UNINSTALL_EXTRA += java-uninstall
CLEAN_EXTRA += java-clean CLEAN_EXTRA += java-clean
endif endif
all-local: $(BUILD_EXTRA) all-local: $(BUILD_EXTRA)
install-exec-local: $(INSTALL_EXTRA) install-exec-local: $(INSTALL_EXTRA)
uninstall-local: $(UNINSTALL_EXTRA)
clean-local: $(CLEAN_EXTRA) clean-local: $(CLEAN_EXTRA)
.PHONY: dist-changelog .PHONY: dist-changelog