Skip to content

Instantly share code, notes, and snippets.

@twinsant
Last active December 18, 2015 21:49
Show Gist options
  • Select an option

  • Save twinsant/5849826 to your computer and use it in GitHub Desktop.

Select an option

Save twinsant/5849826 to your computer and use it in GitHub Desktop.
Hacking ZBar Makefile.am
diff -r 38e78368283d Makefile.am
--- a/Makefile.am Sun Oct 14 23:02:08 2012 -0700
+++ b/Makefile.am Mon Jun 24 20:52:55 2013 +0800
@@ -27,24 +27,24 @@
if HAVE_PYTHON
include $(srcdir)/python/Makefile.am.inc
endif
-if HAVE_GTK
-include $(srcdir)/gtk/Makefile.am.inc
-pkgconfig_DATA += zbar-gtk.pc
-if HAVE_PYTHON
-include $(srcdir)/pygtk/Makefile.am.inc
-endif
-endif
-if HAVE_QT
-include $(srcdir)/qt/Makefile.am.inc
-pkgconfig_DATA += zbar-qt.pc
-endif
+#if HAVE_GTK
+#include $(srcdir)/gtk/Makefile.am.inc
+#pkgconfig_DATA += zbar-gtk.pc
+#if HAVE_PYTHON
+#include $(srcdir)/pygtk/Makefile.am.inc
+#endif
+#endif
+#if HAVE_QT
+#include $(srcdir)/qt/Makefile.am.inc
+#pkgconfig_DATA += zbar-qt.pc
+#endif
if HAVE_JAVA
SUBDIRS += java
endif
if HAVE_NPAPI
include $(srcdir)/plugin/Makefile.am.inc
endif
-include $(srcdir)/test/Makefile.am.inc
+#include $(srcdir)/test/Makefile.am.inc
include $(srcdir)/doc/Makefile.am.inc
EXTRA_DIST += zbar.ico zbar.nsi
@@ -61,29 +61,29 @@
perl/t/barcode.png perl/t/ZBar.t perl/t/Decoder.t perl/t/Image.t \
perl/t/Processor.t perl/t/Scanner.t perl/t/pod.t perl/t/pod-coverage.t
-if WIN32
-dist_doc_DATA += README.windows
-pkgdata_DATA = $(srcdir)/examples/barcode.png \
- $(srcdir)/examples/scan_image.cpp $(srcdir)/examples/scan_image.vcproj
-
-%-rc.o: %.rc
- $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) -o $@ $<
-%-rc.lo: %.rc
- $(LIBTOOL) --tag=RC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) -o $@ $<
-
-# install to tmp dest and run NSIS to generate installer
-dist-nsis: html-local
- test ! -e _nsis || test -d _nsis && rm -rf _nsis
- mkdir _nsis
- tmpinst=`cd _nsis && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR=$$tmpinst prefix=/ install
- cp zbar/.libs/libzbar-0.dll.def _nsis/lib/libzbar-0.def
- cp -r doc/html _nsis/share/doc/zbar/
- $(WINEXEC) lib.exe /machine:x86 /def:_nsis/lib/libzbar-0.def /out:_nsis/lib/libzbar-0.lib
- cd _nsis && \
- makensis -NOCD -V2 -DVERSION=$(VERSION) $(abs_srcdir)/zbar.nsi
- @ls -l _nsis/zbar-$(VERSION)-setup.exe
-endif
+#if WIN32
+#dist_doc_DATA += README.windows
+#pkgdata_DATA = $(srcdir)/examples/barcode.png \
+# $(srcdir)/examples/scan_image.cpp $(srcdir)/examples/scan_image.vcproj
+#
+#%-rc.o: %.rc
+# $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+# $(AM_CPPFLAGS) $(CPPFLAGS) -o $@ $<
+#%-rc.lo: %.rc
+# $(LIBTOOL) --tag=RC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+# --mode=compile $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+# $(AM_CPPFLAGS) $(CPPFLAGS) -o $@ $<
+#
+## install to tmp dest and run NSIS to generate installer
+#dist-nsis: html-local
+# test ! -e _nsis || test -d _nsis && rm -rf _nsis
+# mkdir _nsis
+# tmpinst=`cd _nsis && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+# && $(MAKE) $(AM_MAKEFLAGS) DESTDIR=$$tmpinst prefix=/ install
+# cp zbar/.libs/libzbar-0.dll.def _nsis/lib/libzbar-0.def
+# cp -r doc/html _nsis/share/doc/zbar/
+# $(WINEXEC) lib.exe /machine:x86 /def:_nsis/lib/libzbar-0.def /out:_nsis/lib/libzbar-0.lib
+# cd _nsis && \
+# makensis -NOCD -V2 -DVERSION=$(VERSION) $(abs_srcdir)/zbar.nsi
+# @ls -l _nsis/zbar-$(VERSION)-setup.exe
+#endif
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment