diff options
| author | Maarten Bosmans <mkbosmans@mkb-netbook.(none)> | 2009-12-05 10:14:17 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-12-06 11:16:01 +0100 |
| commit | 593a106149e6abfc17f562773659fa3884efd5ba (patch) | |
| tree | 142db0827f6d8916685583f55ded8868f142e219 | |
| parent | f8d66073dba4e10b4cda94f25f4f314356c472d7 (diff) | |
Some Makefile.am tweaks
Executables on Windows have a .exe extension, so don't hardcode gsts-xmlinspect in TARGETS, but let automake figure it out.
Add Makefile.in to MAINTAINERCLEANFILES.
Fix typo in glue/Makefile.am.
| -rw-r--r-- | elementgen/Makefile.am | 4 | ||||
| -rw-r--r-- | generator/Makefile.am | 1 | ||||
| -rw-r--r-- | gstreamer-sharp/baseplugins/Makefile.am | 1 | ||||
| -rw-r--r-- | gstreamer-sharp/coreplugins/Makefile.am | 1 | ||||
| -rw-r--r-- | gstreamer-sharp/glue/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
6 files changed, 8 insertions, 6 deletions
diff --git a/elementgen/Makefile.am b/elementgen/Makefile.am index 18d86c7..838247c 100644 --- a/elementgen/Makefile.am +++ b/elementgen/Makefile.am @@ -1,8 +1,6 @@ -TARGETS = element-gen.exe gsts-xmlinspect +TARGETS = $(noinst_SCRIPTS) DEBUGS = $(addsuffix .mdb, $(TARGETS)) -all: $(TARGETS) - element-gen.exe: $(srcdir)/elementgen.cs $(CSC) -out:$@ -debug $(srcdir)/elementgen.cs diff --git a/generator/Makefile.am b/generator/Makefile.am index 7c4dc72..21b9bc2 100644 --- a/generator/Makefile.am +++ b/generator/Makefile.am @@ -64,6 +64,7 @@ EXTRA_DIST = \ $(dist_sources) CLEANFILES = gst-gapi_codegen.exe gst-gapi_codegen.exe.mdb +MAINTAINERCLEANFILES = Makefile.in gst-gapi_codegen.exe: $(build_sources) $(CSC) -debug -out:gst-gapi_codegen.exe $(WIN64DEFINES) $(OFF_T_FLAGS) $(references) $(build_sources) diff --git a/gstreamer-sharp/baseplugins/Makefile.am b/gstreamer-sharp/baseplugins/Makefile.am index c4cb6aa..054c1fe 100644 --- a/gstreamer-sharp/baseplugins/Makefile.am +++ b/gstreamer-sharp/baseplugins/Makefile.am @@ -8,6 +8,7 @@ XML_FILES = $(patsubst %,$(builddir)/%.xml,$(ELEMENTS)) EXTRA_DIST = $(METADATA_FILES) $(INSPECT_FILES) CLEANFILES = $(XML_FILES) $(CS_FILES) +MAINTAINERCLEANFILES = Makefile.in plugins-update: $(patsubst $(srcdir)/inspect/%.raw, inspect-%, $(INSPECT_FILES)) inspect-%: diff --git a/gstreamer-sharp/coreplugins/Makefile.am b/gstreamer-sharp/coreplugins/Makefile.am index 3b26131..d27d0a5 100644 --- a/gstreamer-sharp/coreplugins/Makefile.am +++ b/gstreamer-sharp/coreplugins/Makefile.am @@ -14,6 +14,7 @@ XML_FILES = $(patsubst %,$(builddir)/%.xml,$(ELEMENTS)) EXTRA_DIST = $(METADATA_FILES) $(CUSTOM_FILES) $(INSPECT_FILES) $(OTHER_CS_FILES) CLEANFILES = $(XML_FILES) $(CS_FILES) +MAINTAINERCLEANFILES = Makefile.in plugins-update: $(patsubst $(srcdir)/inspect/%.raw, inspect-%, $(INSPECT_FILES)) inspect-%: diff --git a/gstreamer-sharp/glue/Makefile.am b/gstreamer-sharp/glue/Makefile.am index 71212b1..254007e 100644 --- a/gstreamer-sharp/glue/Makefile.am +++ b/gstreamer-sharp/glue/Makefile.am @@ -28,8 +28,9 @@ nodist_libgstreamersharpglue_0_10_la_SOURCES = generated.c libgstreamersharpglue_0_10_la_LIBADD = $(GST_LIBS) libgstreamersharpglue_0_10_la_LDFLAGS = -module -avoid-version -no-undefined -libstreamersharpglue.dll: $(libstreamersharpglue_0_10_la_OBJECTS) libstreamersharpglue.rc libstreamersharpglue.def - ./build-dll libstreamersharpglue-0.10 $(VERSION) + +libgstreamersharpglue.dll: $(libgstreamersharpglue_0_10_la_OBJECTS) libgstreamersharpglue.rc libgstreamersharpglue.def + ./build-dll libgstreamersharpglue-0.10 $(VERSION) INCLUDES = -Wall $(GST_CFLAGS) -I$(top_srcdir) diff --git a/tests/Makefile.am b/tests/Makefile.am index c65335d..518775e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -12,7 +12,7 @@ run-test: $(ASSEMBLY) EXTRA_DIST = $(ASSEMBLY_CSFILES) CLEANFILES = $(ASSEMBLY) *.mdb *.pdb TestResult.xml -DISTCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = Makefile.in clean-local: rm -rf %temp% |