summaryrefslogtreecommitdiff
blob: ba2bcc437242ddac3379f257e29f72bef7027928 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
Index: mount-0.0.2/Makefile
===================================================================
--- mount-0.0.2.orig/Makefile
+++ mount-0.0.2/Makefile
@@ -59,12 +59,12 @@ OBJS = $(subst .C,.o, $(shell ls *.C 2>/
 
 ### Targets:
 
-all: medialist libvdr-$(PLUGIN).so
+all: libvdr-$(PLUGIN).so
 
 medialist:
-	cd MediaList; make
+	$(MAKE) -C MediaList
 
-libvdr-$(PLUGIN).so: $(OBJS)
+libvdr-$(PLUGIN).so: $(OBJS) medialist
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -L MediaList/src -l MediaList -o $@
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
@@ -77,7 +77,7 @@ dist: clean
 	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
-	cd MediaList; make clean
+	$(MAKE) -C MediaList clean
 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ *.d
 
 -include *.d
Index: mount-0.0.2/MediaList/Makefile
===================================================================
--- mount-0.0.2.orig/MediaList/Makefile
+++ mount-0.0.2/MediaList/Makefile
@@ -6,18 +6,18 @@ $(subst .cxx,, $(shell cd prog; ls *.cxx
 
 
 all: 
-	export MYLIBNAME=$(LIBNAME);cd src; make
-	export PROGS=$(PROGRAMMS);cd prog; make
-	export MYLIBNAME=$(LIBNAME);export PROGS=$(PROGRAMMS);cd bin; make
+	$(MAKE) -C src MYLIBNAME=$(LIBNAME)
+	$(MAKE) -C prog PROGS=$(PROGRAMMS)
+	$(MAKE) -C bin MYLIBNAME=$(LIBNAME) PROGS=$(PROGRAMMS)
 	
 depend:
 	@echo target depend is obsolete --- just make
 
 
 clean:
-	cd src; make clean
-	cd prog; make clean
-	export PROGS=$(PROGRAMMS);cd bin; make clean
+	$(MAKE) -C src clean
+	$(MAKE) -C prog clean
+	$(MAKE) -C bin clean PROGS=$(PROGRAMMS)
 	
 
 install: