projects / packages / avifile.git / blame
| Commit | Line | Data |
|---|---|---|
| 424a9e84 AF |
1 | --- avifile-0.6.0/samples/artsplug/Makefile.am.wiget Fri Jan 26 17:45:19 2001 |
| 2 | +++ avifile-0.6.0/samples/artsplug/Makefile.am Fri Jan 26 17:32:27 2001 | |
| 3 | @@ -1,5 +1,6 @@ | |
| 4 | # This file you have to edit. Change the name here | |
| 5 | ||
| 6 | +LDFLAGS=@LDFLAGS@ | |
| 7 | #this is probably wrong. | |
| 8 | #mcopclassdir variable should point somewhere inside KDE installation, | |
| 9 | #I am not sure that .mcopclass will be found by aRts here. | |
| 10 | --- avifile-0.6.0/samples/Makefile.am.wiget Fri Jan 26 17:18:31 2001 | |
| 11 | +++ avifile-0.6.0/samples/Makefile.am Fri Jan 26 17:24:14 2001 | |
| 12 | @@ -2,9 +2,9 @@ | |
| 13 | ||
| 14 | EXTRA_SUBDIRS= | |
| 15 | if AM_USE_JPEGLIB | |
| 16 | -SUBDIRS_JPEG=mjpeg_plugin | |
| 17 | + SUBDIRS_JPEG=mjpeg_plugin | |
| 18 | else | |
| 19 | -SUBDIRS_JPEG= | |
| 20 | + SUBDIRS_JPEG= | |
| 21 | endif | |
| 22 | if AM_USE_VIDCAP | |
| 23 | if AM_USE_QTRECOMP | |
| 24 | @@ -20,14 +20,16 @@ | |
| 25 | endif | |
| 26 | endif | |
| 27 | if AM_USE_QT | |
| 28 | - EXTRA_SUBDIRS=$(SUBDIRS_NO_QT) $(SUBDIRS_QT) $(SUBDIRS_JPEG) | |
| 29 | + EXTRA_SUBDIRS=$(SUBDIRS_QT) $(SUBDIRS_JPEG) | |
| 30 | else | |
| 31 | - EXTRA_SUBDIRS=$(SUBDIRS_NO_QT) $(SUBDIRS_JPEG) | |
| 32 | + EXTRA_SUBDIRS=$(SUBDIRS_JPEG) | |
| 33 | endif | |
| 34 | SUBDIRS_ARTS= | |
| 35 | if AM_USE_ARTS | |
| 36 | - SUBDIRS_ARTS=artsplug | |
| 37 | + SUBDIRS_ARTS=artsplug | |
| 38 | +else | |
| 39 | + SUBDIRS_ARTS= | |
| 40 | endif | |
| 41 | SUBDIRS=$(SUBDIRS_ARTS) $(BASE_SUBDIRS) $(EXTRA_SUBDIRS) | |
| 42 | ||
| 43 | -DIST_SUBDIRS=misc artsplug qtvidcap qtrecompress mjpeg_plugin | |
| 44 | \ No newline at end of file | |
| 45 | +DIST_SUBDIRS=misc artsplug qtvidcap qtrecompress mjpeg_plugin | |
| 256e37d6 JR |
46 | --- avifile-0.6.0/samples/Makefile.am~ Thu Feb 15 22:28:59 2001 |
| 47 | +++ avifile-0.6.0/samples/Makefile.am Thu Feb 15 22:29:14 2001 | |
| 48 | @@ -1,10 +1,9 @@ | |
| 49 | BASE_SUBDIRS=misc | |
| 50 | ||
| 51 | -EXTRA_SUBDIRS= | |
| 52 | if AM_USE_JPEGLIB | |
| 53 | - SUBDIRS_JPEG=mjpeg_plugin | |
| 54 | +SUBDIRS_JPEG=mjpeg_plugin | |
| 55 | else | |
| 56 | - SUBDIRS_JPEG= | |
| 57 | +SUBDIRS_JPEG= | |
| 58 | endif | |
| 59 | if AM_USE_VIDCAP | |
| 60 | if AM_USE_QTRECOMP | |
| 61 | @@ -20,15 +19,14 @@ | |
| 62 | endif | |
| 63 | endif | |
| 64 | if AM_USE_QT | |
| 65 | - EXTRA_SUBDIRS=$(SUBDIRS_QT) $(SUBDIRS_JPEG) | |
| 66 | +EXTRA_SUBDIRS=$(SUBDIRS_QT) $(SUBDIRS_JPEG) | |
| 67 | else | |
| 68 | - EXTRA_SUBDIRS=$(SUBDIRS_JPEG) | |
| 69 | +EXTRA_SUBDIRS=$(SUBDIRS_JPEG) | |
| 70 | endif | |
| 71 | -SUBDIRS_ARTS= | |
| 72 | if AM_USE_ARTS | |
| 73 | - SUBDIRS_ARTS=artsplug | |
| 74 | +SUBDIRS_ARTS=artsplug | |
| 75 | else | |
| 76 | - SUBDIRS_ARTS= | |
| 77 | +SUBDIRS_ARTS= | |
| 78 | endif | |
| 79 | SUBDIRS=$(SUBDIRS_ARTS) $(BASE_SUBDIRS) $(EXTRA_SUBDIRS) | |
| 80 |