diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-08 15:57:00 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-06-15 19:21:57 +0000 |
| commit | 6baa1b544c84a766d9f9d356e9940eccaf0a128f (patch) | |
| tree | fc5431419180335703edcbf01e6b260d2c0dcbfd /codecs | |
| parent | 88bd50c592b0d24a12dd178ae2858444400a012f (diff) | |
| download | wireshark-6baa1b544c84a766d9f9d356e9940eccaf0a128f.tar.gz | |
Remove Nmake build system
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61
Reviewed-on: https://code.wireshark.org/review/15777
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Diffstat (limited to 'codecs')
| -rw-r--r-- | codecs/Makefile.am | 1 | ||||
| -rw-r--r-- | codecs/Makefile.nmake | 87 |
2 files changed, 0 insertions, 88 deletions
diff --git a/codecs/Makefile.am b/codecs/Makefile.am index 35d92d32a7..591b75dd48 100644 --- a/codecs/Makefile.am +++ b/codecs/Makefile.am @@ -62,7 +62,6 @@ noinst_HEADERS = \ EXTRA_DIST = \ CMakeLists.txt \ Makefile.common \ - Makefile.nmake \ speex/README.txt CLEANFILES = \ diff --git a/codecs/Makefile.nmake b/codecs/Makefile.nmake deleted file mode 100644 index cb59f32b50..0000000000 --- a/codecs/Makefile.nmake +++ /dev/null @@ -1,87 +0,0 @@ -## Makefile for building libwscodecs.dll with Microsoft C and nmake -## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake -# - -include ..\config.nmake -include <win32.mak> -include ..\Makefile.nmake.inc - -############### no need to modify below this line ######### - -CFLAGS=/I.. $(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ - $(GLIB_CFLAGS) -DWS_BUILD_DLL - -DIRTY_CFLAGS=/I.. $(STANDARD_CFLAGS) \ - $(GLIB_CFLAGS) -DWS_BUILD_DLL - -.c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< - -include Makefile.common - -# if you add files here, be sure to include them also in Makefile.am EXTRA_DIST -# XXX - if the codec files weren't in subdirectories, we could just do -# LIBWSCODECS_OBJECTS = $(LIBWSCODECS_SRC:.c=.obj), and wouldn't need rules -# for each of the codecs below -# -LIBWSCODECS_OBJECTS= \ - codecs.obj \ - G711udecode.obj \ - G711adecode.obj \ - G722decode.obj \ - G726decode.obj \ - resample.obj \ - sbc.obj - -libwscodecs_LIBS = \ - $(GLIB_LIBS) \ - ..\wsutil\libwsutil.lib - -libwscodecs.lib: libwscodecs.dll -libwscodecs.exp: libwscodecs.dll - -libwscodecs.dll : $(LIBWSCODECS_OBJECTS) ..\image\libwscodecs.res - @echo Linking libwscodecs.dll - $(link) $(dlllflags) $(conlibsdll) \ - $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ - /OUT:libwscodecs.dll \ - /IMPLIB:libwscodecs.lib \ - ..\image\libwscodecs.res \ - $(LIBWSCODECS_OBJECTS) $(libwscodecs_LIBS) - -codecs.obj: codecs.c codecs.h - $(CC) $(CFLAGS) -Fd.\ -c codecs.c /Fo%|fF.obj - -G711adecode.obj: G711a\G711adecode.c G711a\G711adecode.h G711a\G711atable.h - $(CC) $(CFLAGS) -Fd.\ -c G711a\G711adecode.c /Fo%|fF.obj - -G711udecode.obj: G711u\G711udecode.c G711u\G711udecode.h G711u\G711utable.h - $(CC) $(CFLAGS) -Fd.\ -c G711u\G711udecode.c /Fo%|fF.obj - -G722decode.obj: G722\G722decode.c G722\G722decode.h - $(CC) $(CFLAGS) -Fd.\ -c G722\G722decode.c /Fo%|fF.obj - -G726decode.obj: G726\G726decode.c G726\G726decode.h - $(CC) $(CFLAGS) -Fd.\ -c G726\G726decode.c /Fo%|fF.obj - -resample.obj: speex\resample.c speex\arch.h speex\speex_resampler.h speex\stack_alloc.h - $(CC) $(DIRTY_CFLAGS) -Fd.\ -c speex\resample.c /Fo%|fF.obj - -sbc.obj: sbc\sbc.c sbc\sbc_private.h - $(CC) $(CFLAGS) -Fd.\ -c sbc\sbc.c /Fo%|fF.obj - -clean: - rm -f $(LIBWSCODECS_OBJECTS) \ - libwscodecs.lib \ - libwscodecs.exp \ - libwscodecs.dll \ - libwscodecs.dll.manifest \ - *.nativecodeanalysis.xml *.pdb *.sbr - -distclean: clean - -maintainer-clean: distclean - -checkapi: - $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput -build \ - $(LIBWSCODECS_SRC) sbc/sbc.c |