From 3a9c8f63d6142ed2e7139c132364bc1904436677 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Mon, 10 May 2004 22:49:01 +0000 Subject: [PATCH] (from Steve Lhomme) Original commit message from CVS: (from Steve Lhomme) * win32/Makefile: When using make clean the MS Visual Studio makefiles are deleted. Fix. * win32/Makefile.inspect: * win32/Makefile.launch: * win32/Makefile.register: --- ChangeLog | 9 +++++++++ win32/Makefile | 2 +- win32/Makefile.inspect | 2 +- win32/Makefile.launch | 2 +- win32/Makefile.register | 2 +- win32/vs7/Makefile | 2 +- win32/vs7/Makefile.inspect | 2 +- win32/vs7/Makefile.launch | 2 +- win32/vs7/Makefile.register | 2 +- 9 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8bbd4b112a..01a5289321 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-05-10 David Schleef + + (from Steve Lhomme) + * win32/Makefile: When using make clean the MS Visual Studio makefiles + are deleted. Fix. + * win32/Makefile.inspect: + * win32/Makefile.launch: + * win32/Makefile.register: + 2004-05-10 David Schleef * gst/gstinfo.h: Add missing inline function. diff --git a/win32/Makefile b/win32/Makefile index d419da9f50..236d1085af 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -79,7 +79,7 @@ clean: make -f Makefile.inspect clean make -f Makefile.launch clean make -f Makefile.register clean - $(RM) $(OBJ) $(HEADERS) gstreamer-0.8.lib libgstreamer-0.8.dll gstreamer.map gstreamer-0.8.exp + $(RM) $(OBJ) $(HEADERS) gstreamer-0.8.lib libgstreamer-0.8.dll gstreamer.map gstreamer-0.8.exp lex._gst_parse_yy.c libgstreamer-0.8.dll: $(HEADERS) $(OBJ) link $(LDFLAGS) /OUT:$@ $(OBJ) /DEF:gstreamer.def glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib libpopt.lib wsock32.lib diff --git a/win32/Makefile.inspect b/win32/Makefile.inspect index 9b75ef9b91..de7611e11a 100644 --- a/win32/Makefile.inspect +++ b/win32/Makefile.inspect @@ -60,7 +60,7 @@ endif all: gst-inspect.exe clean: - $(RM) gst-inspect.* + $(RM) gst-inspect.exe gst-inspect.obj gst-inspect.exe: $(CC) $(SRC_DIR)\gst-inspect.c $(CXXFLAGS) gstreamer-0.8.lib $(GLIB_DIR)/glib/glib-2.0.lib $(GLIB_DIR)/gobject/gobject-2.0.lib diff --git a/win32/Makefile.launch b/win32/Makefile.launch index f861739d72..f97ed014f4 100644 --- a/win32/Makefile.launch +++ b/win32/Makefile.launch @@ -60,7 +60,7 @@ endif all: gst-launch.exe clean: - $(RM) gst-launch.* + $(RM) gst-launch.exe gst-launch.obj gst-launch.exe: $(CC) $(SRC_DIR)\gst-launch.c $(CXXFLAGS) gstreamer-0.8.lib $(GLIB_DIR)/glib/glib-2.0.lib $(GLIB_DIR)/gobject/gobject-2.0.lib diff --git a/win32/Makefile.register b/win32/Makefile.register index 8266a546e8..c38b85646f 100644 --- a/win32/Makefile.register +++ b/win32/Makefile.register @@ -60,7 +60,7 @@ endif all: gst-register.exe clean: - $(RM) gst-register.* + $(RM) gst-register.exe gst-register.obj gst-register.exe: $(CC) $(SRC_DIR)\gst-register.c $(CXXFLAGS) gstreamer-0.8.lib $(GLIB_DIR)/glib/glib-2.0.lib $(GLIB_DIR)/gobject/gobject-2.0.lib diff --git a/win32/vs7/Makefile b/win32/vs7/Makefile index d419da9f50..236d1085af 100644 --- a/win32/vs7/Makefile +++ b/win32/vs7/Makefile @@ -79,7 +79,7 @@ clean: make -f Makefile.inspect clean make -f Makefile.launch clean make -f Makefile.register clean - $(RM) $(OBJ) $(HEADERS) gstreamer-0.8.lib libgstreamer-0.8.dll gstreamer.map gstreamer-0.8.exp + $(RM) $(OBJ) $(HEADERS) gstreamer-0.8.lib libgstreamer-0.8.dll gstreamer.map gstreamer-0.8.exp lex._gst_parse_yy.c libgstreamer-0.8.dll: $(HEADERS) $(OBJ) link $(LDFLAGS) /OUT:$@ $(OBJ) /DEF:gstreamer.def glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib libpopt.lib wsock32.lib diff --git a/win32/vs7/Makefile.inspect b/win32/vs7/Makefile.inspect index 9b75ef9b91..de7611e11a 100644 --- a/win32/vs7/Makefile.inspect +++ b/win32/vs7/Makefile.inspect @@ -60,7 +60,7 @@ endif all: gst-inspect.exe clean: - $(RM) gst-inspect.* + $(RM) gst-inspect.exe gst-inspect.obj gst-inspect.exe: $(CC) $(SRC_DIR)\gst-inspect.c $(CXXFLAGS) gstreamer-0.8.lib $(GLIB_DIR)/glib/glib-2.0.lib $(GLIB_DIR)/gobject/gobject-2.0.lib diff --git a/win32/vs7/Makefile.launch b/win32/vs7/Makefile.launch index f861739d72..f97ed014f4 100644 --- a/win32/vs7/Makefile.launch +++ b/win32/vs7/Makefile.launch @@ -60,7 +60,7 @@ endif all: gst-launch.exe clean: - $(RM) gst-launch.* + $(RM) gst-launch.exe gst-launch.obj gst-launch.exe: $(CC) $(SRC_DIR)\gst-launch.c $(CXXFLAGS) gstreamer-0.8.lib $(GLIB_DIR)/glib/glib-2.0.lib $(GLIB_DIR)/gobject/gobject-2.0.lib diff --git a/win32/vs7/Makefile.register b/win32/vs7/Makefile.register index 8266a546e8..c38b85646f 100644 --- a/win32/vs7/Makefile.register +++ b/win32/vs7/Makefile.register @@ -60,7 +60,7 @@ endif all: gst-register.exe clean: - $(RM) gst-register.* + $(RM) gst-register.exe gst-register.obj gst-register.exe: $(CC) $(SRC_DIR)\gst-register.c $(CXXFLAGS) gstreamer-0.8.lib $(GLIB_DIR)/glib/glib-2.0.lib $(GLIB_DIR)/gobject/gobject-2.0.lib