From 260123716172d33f44bdc0e4e5422554d139215c Mon Sep 17 00:00:00 2001 From: Jonathan McCrohan Date: Wed, 9 May 2012 00:47:30 +0100 Subject: Imported Upstream version 2.1.8.20120507 --- Makefile.in | 158 +++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 102 insertions(+), 56 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 486ed1a..7945472 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,6 +16,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -39,7 +40,9 @@ host_triplet = @host@ @ZEROCONF_FALSE@am__append_2 = -DNO_ZEROCONF @INTERNAL_UNICONV_TRUE@am__append_3 = utils/cvtutf.c utils/cvtutf.h @INTERNAL_UNICONV_TRUE@am__append_4 = -DUSE_INTERNAL_UNICONV -@ZEROCONF_AVAHI_TRUE@am__append_5 = linux/zeroconf_avahi.c \ +@NEW_LIBUSB_TRUE@am__append_5 = linux/cusblinux-1.0.c +@NEW_LIBUSB_FALSE@am__append_6 = linux/cusblinux.c +@ZEROCONF_AVAHI_TRUE@am__append_7 = linux/zeroconf_avahi.c \ @ZEROCONF_AVAHI_TRUE@ linux/avahi-client/client.h \ @ZEROCONF_AVAHI_TRUE@ linux/avahi-client/lookup.h \ @ZEROCONF_AVAHI_TRUE@ linux/avahi-client/publish.h \ @@ -59,21 +62,21 @@ host_triplet = @host@ @ZEROCONF_AVAHI_TRUE@ linux/avahi-common/timeval.h \ @ZEROCONF_AVAHI_TRUE@ linux/avahi-common/watch.h -@ZEROCONF_BONJOUR_TRUE@am__append_6 = zeroconf.c \ +@ZEROCONF_BONJOUR_TRUE@am__append_8 = zeroconf.c \ @ZEROCONF_BONJOUR_TRUE@ include/dns_sd.h -@ZEROCONF_LOOKUP_TRUE@am__append_7 = zeroconf_lookup.c -@ZEROCONF_LOOKUP_TRUE@am__append_8 = -DZEROCONF_LOOKUP -@LABVIEW_TRUE@am__append_9 = labview/phidget_labview.c \ +@ZEROCONF_LOOKUP_TRUE@am__append_9 = zeroconf_lookup.c +@ZEROCONF_LOOKUP_TRUE@am__append_10 = -DZEROCONF_LOOKUP +@LABVIEW_TRUE@am__append_11 = labview/phidget_labview.c \ @LABVIEW_TRUE@ labview/phidget_labview.h -@LABVIEW_TRUE@am__append_10 = -DCOMPILE_PHIDGETS_LABVIEW \ +@LABVIEW_TRUE@am__append_12 = -DCOMPILE_PHIDGETS_LABVIEW \ @LABVIEW_TRUE@ -I$(LABVIEW_CINTOOLS_PATH) \ @LABVIEW_TRUE@ -L$(LABVIEW_CINTOOLS_PATH) \ @LABVIEW_TRUE@ -Wl,-rpath,$(LABVIEW_CINTOOLS_PATH) -llv -@DEBUG_TRUE@am__append_11 = -D_DEBUG -DDEBUG -@JNI_TRUE@am__append_12 = -I$(top_srcdir)/include/jni -I$(top_srcdir)/include/jni/linux -@JNI_TRUE@am__append_13 = Java/com_phidgets_Phidget.c \ +@DEBUG_TRUE@am__append_13 = -D_DEBUG -DDEBUG +@JNI_TRUE@am__append_14 = -I$(top_srcdir)/include/jni -I$(top_srcdir)/include/jni/linux +@JNI_TRUE@am__append_15 = Java/com_phidgets_Phidget.c \ @JNI_TRUE@ Java/com_phidgets_Phidget.h \ @JNI_TRUE@ Java/com_phidgets_AccelerometerPhidget.c \ @JNI_TRUE@ Java/com_phidgets_AccelerometerPhidget.h \ @@ -133,8 +136,9 @@ host_triplet = @host@ subdir = . DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - config.guess config.sub depcomp install-sh ltmain.sh missing + $(srcdir)/libphidget21.pc.in $(top_srcdir)/configure AUTHORS \ + COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \ + install-sh ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -142,7 +146,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = libphidget21.pc CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -165,7 +169,8 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \ + "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) libphidget21_la_LIBADD = am__libphidget21_la_SOURCES_DIST = cphidget.c cphidget.h \ @@ -191,12 +196,12 @@ am__libphidget21_la_SOURCES_DIST = cphidget.c cphidget.h \ cphidgetsbc.c cphidgetsbc.h clog.c clog.h csocketevents.c \ csocketevents.h csocketopen.c csocket.h cphidgetconstants.c \ cphidgetconstants.h cphidgetlist.c cphidgetlist.h cthread.c \ - cthread.h phidget21.c phidget21int.h linux/cusblinux.c \ - dict/pdict.c dict/pdict.h dict/pdictclient.c \ - dict/pdictclient.h dict/pdict-impl.h utils/md5.c utils/md5.h \ - utils/utils.c utils/utils.h utils/ptree.c utils/ptree.h \ - utils/plist.c utils/plist.h cppheader cppfooter zeroconf.h \ - utils/cvtutf.c utils/cvtutf.h linux/zeroconf_avahi.c \ + cthread.h phidget21.c phidget21int.h dict/pdict.c dict/pdict.h \ + dict/pdictclient.c dict/pdictclient.h dict/pdict-impl.h \ + utils/md5.c utils/md5.h utils/utils.c utils/utils.h \ + utils/ptree.c utils/ptree.h utils/plist.c utils/plist.h \ + cppheader cppfooter zeroconf.h utils/cvtutf.c utils/cvtutf.h \ + linux/cusblinux-1.0.c linux/cusblinux.c linux/zeroconf_avahi.c \ linux/avahi-client/client.h linux/avahi-client/lookup.h \ linux/avahi-client/publish.h linux/avahi-common/address.h \ linux/avahi-common/alternative.h linux/avahi-common/cdecl.h \ @@ -255,11 +260,13 @@ am__libphidget21_la_SOURCES_DIST = cphidget.c cphidget.h \ include/jni/linux/jawt_md.h include/jni/linux/jni_md.h am__objects_1 = @INTERNAL_UNICONV_TRUE@am__objects_2 = cvtutf.lo -@ZEROCONF_AVAHI_TRUE@am__objects_3 = zeroconf_avahi.lo -@ZEROCONF_BONJOUR_TRUE@am__objects_4 = zeroconf.lo -@ZEROCONF_LOOKUP_TRUE@am__objects_5 = zeroconf_lookup.lo -@LABVIEW_TRUE@am__objects_6 = phidget_labview.lo -@JNI_TRUE@am__objects_7 = com_phidgets_Phidget.lo \ +@NEW_LIBUSB_TRUE@am__objects_3 = cusblinux-1.0.lo +@NEW_LIBUSB_FALSE@am__objects_4 = cusblinux.lo +@ZEROCONF_AVAHI_TRUE@am__objects_5 = zeroconf_avahi.lo +@ZEROCONF_BONJOUR_TRUE@am__objects_6 = zeroconf.lo +@ZEROCONF_LOOKUP_TRUE@am__objects_7 = zeroconf_lookup.lo +@LABVIEW_TRUE@am__objects_8 = phidget_labview.lo +@JNI_TRUE@am__objects_9 = com_phidgets_Phidget.lo \ @JNI_TRUE@ com_phidgets_AccelerometerPhidget.lo \ @JNI_TRUE@ com_phidgets_AdvancedServoPhidget.lo \ @JNI_TRUE@ com_phidgets_AnalogPhidget.lo \ @@ -291,11 +298,11 @@ am_libphidget21_la_OBJECTS = cphidget.lo cphidgetaccelerometer.lo \ cphidgettextled.lo cphidgetweightsensor.lo cphidgetmanager.lo \ cphidgetdictionary.lo cphidgetgeneric.lo cphidgetsbc.lo \ clog.lo csocketevents.lo csocketopen.lo cphidgetconstants.lo \ - cphidgetlist.lo cthread.lo phidget21.lo cusblinux.lo pdict.lo \ + cphidgetlist.lo cthread.lo phidget21.lo pdict.lo \ pdictclient.lo md5.lo utils.lo ptree.lo plist.lo \ $(am__objects_1) $(am__objects_2) $(am__objects_3) \ $(am__objects_4) $(am__objects_5) $(am__objects_6) \ - $(am__objects_7) + $(am__objects_7) $(am__objects_8) $(am__objects_9) libphidget21_la_OBJECTS = $(am_libphidget21_la_OBJECTS) AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) @@ -332,6 +339,7 @@ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libphidget21_la_SOURCES) DIST_SOURCES = $(am__libphidget21_la_SOURCES_DIST) +DATA = $(pkgconfig_DATA) HEADERS = $(include_HEADERS) ETAGS = etags CTAGS = ctags @@ -461,8 +469,10 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils -I$(top_srcdir)/dict \ -I$(top_srcdir)/linux -I$(top_srcdir)/include -D_LINUX \ - $(am__append_2) $(am__append_4) $(am__append_8) \ - $(am__append_10) $(am__append_11) $(am__append_12) + $(am__append_2) $(am__append_4) $(am__append_10) \ + $(am__append_12) $(am__append_13) $(am__append_14) +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libphidget21.pc lib_LTLIBRARIES = libphidget21.la # Rules for unpdating the libtool version: @@ -498,14 +508,14 @@ libphidget21_la_SOURCES = cphidget.c cphidget.h cphidgetmacros.h \ cphidgetsbc.c cphidgetsbc.h clog.c clog.h csocketevents.c \ csocketevents.h csocketopen.c csocket.h cphidgetconstants.c \ cphidgetconstants.h cphidgetlist.c cphidgetlist.h cthread.c \ - cthread.h phidget21.c phidget21int.h linux/cusblinux.c \ - dict/pdict.c dict/pdict.h dict/pdictclient.c \ - dict/pdictclient.h dict/pdict-impl.h utils/md5.c utils/md5.h \ - utils/utils.c utils/utils.h utils/ptree.c utils/ptree.h \ - utils/plist.c utils/plist.h cppheader cppfooter \ - $(am__append_1) $(am__append_3) $(am__append_5) \ - $(am__append_6) $(am__append_7) $(am__append_9) \ - $(am__append_13) + cthread.h phidget21.c phidget21int.h dict/pdict.c dict/pdict.h \ + dict/pdictclient.c dict/pdictclient.h dict/pdict-impl.h \ + utils/md5.c utils/md5.h utils/utils.c utils/utils.h \ + utils/ptree.c utils/ptree.h utils/plist.c utils/plist.h \ + cppheader cppfooter $(am__append_1) $(am__append_3) \ + $(am__append_5) $(am__append_6) $(am__append_7) \ + $(am__append_8) $(am__append_9) $(am__append_11) \ + $(am__append_15) include_HEADERS = phidget21.h CLEANFILES = phidget21.h phidget21matlab.h phidget21.jar Java/com/phidgets/*.class Java/com/phidgets/event/*.class EXTRA_DIST = examples/ifkit.c \ @@ -518,6 +528,7 @@ EXTRA_DIST = examples/ifkit.c \ hotplug/phidgets.usermap \ hotplug/phidgets \ version.sh \ + libphidget21.pc.in \ Java/com/phidgets/DictionaryKeyListener.java \ Java/com/phidgets/TextLCDPhidget.java \ Java/com/phidgets/SpatialEventData.java \ @@ -657,6 +668,8 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): +libphidget21.pc: $(top_builddir)/config.status $(srcdir)/libphidget21.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @@ -752,6 +765,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csocketevents.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csocketopen.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cthread.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cusblinux-1.0.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cusblinux.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cvtutf.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Plo@am__quote@ @@ -791,14 +805,6 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -cusblinux.lo: linux/cusblinux.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cusblinux.lo -MD -MP -MF $(DEPDIR)/cusblinux.Tpo -c -o cusblinux.lo `test -f 'linux/cusblinux.c' || echo '$(srcdir)/'`linux/cusblinux.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cusblinux.Tpo $(DEPDIR)/cusblinux.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='linux/cusblinux.c' object='cusblinux.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cusblinux.lo `test -f 'linux/cusblinux.c' || echo '$(srcdir)/'`linux/cusblinux.c - pdict.lo: dict/pdict.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdict.lo -MD -MP -MF $(DEPDIR)/pdict.Tpo -c -o pdict.lo `test -f 'dict/pdict.c' || echo '$(srcdir)/'`dict/pdict.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pdict.Tpo $(DEPDIR)/pdict.Plo @@ -855,6 +861,22 @@ cvtutf.lo: utils/cvtutf.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cvtutf.lo `test -f 'utils/cvtutf.c' || echo '$(srcdir)/'`utils/cvtutf.c +cusblinux-1.0.lo: linux/cusblinux-1.0.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cusblinux-1.0.lo -MD -MP -MF $(DEPDIR)/cusblinux-1.0.Tpo -c -o cusblinux-1.0.lo `test -f 'linux/cusblinux-1.0.c' || echo '$(srcdir)/'`linux/cusblinux-1.0.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cusblinux-1.0.Tpo $(DEPDIR)/cusblinux-1.0.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='linux/cusblinux-1.0.c' object='cusblinux-1.0.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cusblinux-1.0.lo `test -f 'linux/cusblinux-1.0.c' || echo '$(srcdir)/'`linux/cusblinux-1.0.c + +cusblinux.lo: linux/cusblinux.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cusblinux.lo -MD -MP -MF $(DEPDIR)/cusblinux.Tpo -c -o cusblinux.lo `test -f 'linux/cusblinux.c' || echo '$(srcdir)/'`linux/cusblinux.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cusblinux.Tpo $(DEPDIR)/cusblinux.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='linux/cusblinux.c' object='cusblinux.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cusblinux.lo `test -f 'linux/cusblinux.c' || echo '$(srcdir)/'`linux/cusblinux.c + zeroconf_avahi.lo: linux/zeroconf_avahi.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zeroconf_avahi.lo -MD -MP -MF $(DEPDIR)/zeroconf_avahi.Tpo -c -o zeroconf_avahi.lo `test -f 'linux/zeroconf_avahi.c' || echo '$(srcdir)/'`linux/zeroconf_avahi.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/zeroconf_avahi.Tpo $(DEPDIR)/zeroconf_avahi.Plo @@ -1079,6 +1101,26 @@ clean-libtool: distclean-libtool: -rm -f libtool config.lt +install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ + done + +uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files install-includeHEADERS: $(include_HEADERS) @$(NORMAL_INSTALL) test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" @@ -1300,9 +1342,9 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-am -all-am: Makefile $(LTLIBRARIES) $(HEADERS) +all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1356,7 +1398,7 @@ info: info-am info-am: -install-data-am: install-includeHEADERS +install-data-am: install-includeHEADERS install-pkgconfigDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-am @@ -1406,7 +1448,8 @@ ps: ps-am ps-am: -uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES +uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \ + uninstall-pkgconfigDATA .MAKE: install-am install-data-am install-exec-am install-strip @@ -1421,12 +1464,13 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES install-dvi-am install-exec install-exec-am install-exec-hook \ install-html install-html-am install-includeHEADERS \ install-info install-info-am install-libLTLIBRARIES \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-includeHEADERS uninstall-libLTLIBRARIES + install-man install-pdf install-pdf-am install-pkgconfigDATA \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-includeHEADERS \ + uninstall-libLTLIBRARIES uninstall-pkgconfigDATA distclean-local: @@ -1450,11 +1494,13 @@ phidget21matlab.h: @echo "Making $@" @echo "/*" > $@ @echo " * Phidget21 Header for Matlab" >> $@ - @echo " * -All pointers to structs have been changed to long, as Matlab seems" >> $@ + @echo " * -All pointers to structs have been changed to void *, as Matlab seems" >> $@ @echo " * to be unhappy with either the undefined stucts or the double pointers." >> $@ @echo " */" >> $@ - @$(CC) -g -E -P -D_LINUX -DEXTERNALPROTO -DREMOVE_DEPRECATED phidget21int.h | sed -e "s/extern \"C\" //g" | sed -e "s/struct [a-zA-Z_]* \*/long /" >> $@ + @cat cppheader >> $@ + @$(CC) -g -E -P -D_LINUX -DEXTERNALPROTO -DREMOVE_DEPRECATED phidget21int.h | sed -e "s/extern \"C\" //g" | sed -e "s/struct [a-zA-Z_]* \*/void * /" >> $@ @cat cphidgetconstants.h >> $@ + @cat cppfooter >> $@ phidget21.jar: @echo "Making $@" -- cgit v1.2.3