diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-09-02 06:39:43 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-09-02 06:39:43 +0000 |
| commit | 93ce482790a9f6637d93933d44a37d9cb2e4b6ba (patch) | |
| tree | 833928513cb31527c5bd1c334f234af05cef8dd6 /Makefile.nmake | |
| parent | 08c807f7fece7bacf7f90bf620c8c111cbbc11bc (diff) | |
Move the codecs into a top-level "codecs" subdirectory; there's no
guarantee that all programs using the codecs will necessarily be using
GTK+.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19117 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 1848a7d5d2..e828023aeb 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -152,20 +152,20 @@ wiretap\wiretap-$(WTAP_VERSION).lib: wiretap !IFNDEF GTK1_DIR wireshark.exe : !ELSE -wireshark.exe : config.h svnversion.h $(wireshark_OBJECTS) $(command_line_OBJECTS) epan gtk image\wireshark.res wiretap\wiretap-$(WTAP_VERSION).lib gtk\libui.lib plugins +wireshark.exe : config.h svnversion.h $(wireshark_OBJECTS) $(command_line_OBJECTS) epan gtk image\wireshark.res wiretap\wiretap-$(WTAP_VERSION).lib codecs\libcodec.lib gtk\libui.lib plugins @echo Linking $@ $(LINK) @<< - /OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK1_LIBS) gtk\libui.lib $(wireshark_OBJECTS) image\wireshark.res + /OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK1_LIBS) codecs\libcodec.lib gtk\libui.lib $(wireshark_OBJECTS) image\wireshark.res << !ENDIF !IFNDEF GTK2_DIR wireshark-gtk2.exe : !ELSE -wireshark-gtk2.exe : config.h svnversion.h $(wireshark_OBJECTS) $(command_line_OBJECTS) epan gtk2 image\wireshark.res wiretap\wiretap-$(WTAP_VERSION).lib gtk2.tmp\libui.lib plugins +wireshark-gtk2.exe : config.h svnversion.h $(wireshark_OBJECTS) $(command_line_OBJECTS) codecs epan gtk2 image\wireshark.res wiretap\wiretap-$(WTAP_VERSION).lib codecs\libcodec.lib gtk2.tmp\libui.lib plugins @echo Linking $@ $(LINK) @<< - /OUT:wireshark-gtk2.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK2_LIBS) gtk2.tmp\libui.lib $(wireshark_OBJECTS) image\wireshark.res + /OUT:wireshark-gtk2.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK2_LIBS) codecs\libcodec.lib gtk2.tmp\libui.lib $(wireshark_OBJECTS) image\wireshark.res << !ENDIF @@ -304,6 +304,8 @@ clean: gtk2_distclean cd .. cd wiretap $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean + cd ../codecs + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../gtk $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../epan @@ -328,6 +330,8 @@ distclean: clean gtk2_distclean rm -f config.h $(BUILT_SOURCES) cd wiretap $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean + cd ../codecs + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../gtk $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../epan @@ -353,6 +357,8 @@ maintainer-clean: distclean rm -f $(GENERATED_FILES) cd wiretap $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean + cd ../codecs + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd ../gtk $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd ../epan @@ -386,6 +392,11 @@ wiretap:: $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd .. +codecs:: help config.h svnversion.h AUTHORS-SHORT doxygen + cd codecs + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake + cd .. + gtk:: help config.h svnversion.h AUTHORS-SHORT doxygen cd gtk $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake GTK_CFLAGS="$(GTK1_CFLAGS)" GTK_LIBS="$(GTK1_LIBS)" libui.lib |