aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk/Makefile.nmake
AgeCommit message (Collapse)AuthorFilesLines
2015-11-27Fix ISO C forbids an empty translation unit [-Wpedantic] (airpcap)João Valverde1-1/+4
Autotools only warning. Change-Id: I30f33d2f8611d662dbc62326862707bf05ad3f60 Reviewed-on: https://code.wireshark.org/review/12150 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-11-12[GTK] Replace deprecated gdk_pixbuf_new_from_inline()João Valverde1-19/+2
Use GResource instead, if available. Add autotools and cmake compile time checks for build requirements (GIO >= 2.32 and GDK-Pixbuf >= 2.26). Merge all the various static pixbuf csource header files into a single pixbuf-csource.h header with external linkage through use of the tools/make-pixbuf-csource.pl script. Fix inline pixbuf build target for some image paths (broken for GTK in gb4a4de7). Add missing 'expert_ok.png' file to distribution (GTK only). Minor improvements to style/structure of ui/gtk/Makefile.am. Bug: 10750 Change-Id: I031296b666ee8b92730400dfa6f71f9ee4304863 Reviewed-on: https://code.wireshark.org/review/10992 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-25Add Makefile_common.common to wireshark-tap-register.c dependencies (windows)Bill Meier1-1/+1
Change-Id: I22d60e10554e419acda945732faa192fbc21aee6 Reviewed-on: https://code.wireshark.org/review/9163 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-23Regenerate *-tap-register.c when associated Makefile.common is updatedBill Meier1-3/+3
Change-Id: Id9a83aeb285466f409a0e5ee651ef0c9f26ddda8 Reviewed-on: https://code.wireshark.org/review/9055 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-02Add '*.nativecodeanalysis.xml' to 'clean' targetsBill Meier1-1/+1
Change-Id: I90dbf0b31fc737150a01533763a7869b34c68cb6 Reviewed-on: https://code.wireshark.org/review/6220 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-09Now that Python is mandatory on Windows, remove checks for it from nmakefilesРоман Донченко1-12/+1
Change-Id: I2ca6abb372ec4bda0af1aa40089082533a61df3a Reviewed-on: https://code.wireshark.org/review/3392 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-24Include ZLIB_CFLAGS so we file zlib.h.Guy Harris1-1/+2
Change-Id: I9026f99397b1dfbc550af550d0c71597b3c87950 Reviewed-on: https://code.wireshark.org/review/2592 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-1/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2013-10-10Revert the changes made to resolve ↵Chris Maynard1-1/+1
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 (When following an HTTP tcp stream decode gzip data automatically), as they caused a bigger problem reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 ("Follow TCP Stream" shows only first HTTP req+res). #BACKPORT(1.10) svn path=/trunk/; revision=52506
2013-03-26More icon updates. Gerald Combs1-0/+10
Use the PNG versions of the new application icons. Remove the XPM versions of the Wireshark application and capture icons. To paraphrase Zoidberg, XPMs are bad and we should feel bad. Remove xpm_to_widget_from_parent (which we weren't using and likely won't use in the future). Replace wiki_24.xpm (which was a GNOME or GTK+ stock icon IIRC) with the 16x16 and 24x24 versions emblem-web.png from GNOME icon theme 2.30.3. This version was used specifically because it's GPLv2 and later versions are GPLv3. Update image/README. svn path=/trunk/; revision=48565
2013-03-01Export libwireshark symbols using WS_DLL_PUBLIC defineBalint Reczey1-1/+1
Also remove old WS_VAR_IMPORT define and related Makefile magic everywhere in the project. svn path=/trunk/; revision=47992
2013-01-19Add a rule to create layouts.h (using gdk-pixbuf-csourceBill Meier1-0/+8
in a similar manner as done in Makefile.am) (On my Windows 7 system gdk-pixbuf-csource gives an error message about "...Couldn't recognize the image file format...". Let's see what happens in the Windows buildbots). svn path=/trunk/; revision=47165
2012-12-13Bug 3528 - When following an HTTP tcp stream decode gzip data automatically ↵Michael Mann1-1/+1
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528) includes patch from bug (with actual functionality) + changes to makefiles to make it compile/link on Windows svn path=/trunk/; revision=46530
2012-09-18Add python cache and temporary files to the list of files to clean up.Jeff Morriss1-1/+2
svn path=/trunk/; revision=44974
2012-09-15text_import_scanner_lex.h and text_import_scanner.c are now part ofGuy Harris1-7/+0
libui, not libgtkui. svn path=/trunk/; revision=44913
2012-09-15DIRTY_GENERATED_C_FILES is empty, and isn't used by ui/gtk/Makefile.am,Guy Harris1-2/+1
so get rid of it, and stop using it in ui/gtk/Makefile.make; we don't want to encourage people to create source files that get warnings. svn path=/trunk/; revision=44910
2012-06-13Add '*.sbr' to 'clean'Bill Meier1-1/+2
svn path=/trunk/; revision=43233
2012-05-05Cosmetic change....Bill Meier1-1/+1
svn path=/trunk/; revision=42440
2012-04-04Add a "-build" argument to checkAPIs.pl. Use that argument when buildingJeff Morriss1-2/+2
from makefiles (and thus from the buildbot). The intention is to be able to tell when a human is running the tool so we can provide more code-review guidance. As a starter, enable the "too many proto_tree_add_text() calls" check when a human is running the tool. svn path=/trunk/; revision=41943
2012-02-24CVARSDLL hasn't been used (is undefined) for a while....Bill Meier1-2/+2
svn path=/trunk/; revision=41180
2012-02-19Don't run Flex-generated files through checkapi - they use forbiddenGuy Harris1-11/+13
APIs such as malloc and free. svn path=/trunk/; revision=41079
2012-02-19We already have GENERATED_HEADER_FILES; use that instead ofGuy Harris1-4/+3
GENERATED_H_FILES. If we have DIRTY_GENERATED_C_FILES, use it the same way we use GENERATED_C_FILES. GENERATED_FILES is "everything to nuke on a "make maintainer-clean"", not "everything to put into the distribution". svn path=/trunk/; revision=41075
2012-02-18Rename the (static) library built from stuff in ui/gtk to "libgtkui" inGuy Harris1-3/+3
automake/autoconf and nmake builds, to match the name in CMake builds. svn path=/trunk/; revision=41058
2012-01-15More .. -> ../.. changes after gtk/ moveJörg Mayer1-12/+12
svn path=/trunk/; revision=40522
2012-01-15Move gtk to ui/gtk.Jörg Mayer1-0/+187
This looses the last checkin to gtk, will add this manually back. svn path=/trunk/; revision=40518