Author: akv
Date: 2010-01-23 03:25:00 +0100 (Sat, 23 Jan 2010)
New Revision: 3054
Modified:
branches/rawstudio-ng-color/plugins/basic-render/Makefile.am
branches/rawstudio-ng-color/plugins/cache/Makefile.am
branches/rawstudio-ng-color/plugins/colorspace-adobergb/Makefile.am
branches/rawstudio-ng-color/plugins/colorspace-prophoto/Makefile.am
branches/rawstudio-ng-color/plugins/colorspace-srgb/Makefile.am
branches/rawstudio-ng-color/plugins/colorspace-transform/Makefile.am
branches/rawstudio-ng-color/plugins/crop/Makefile.am
branches/rawstudio-ng-color/plugins/dcp/Makefile.am
branches/rawstudio-ng-color/plugins/demosaic/Makefile.am
branches/rawstudio-ng-color/plugins/denoise/Makefile.am
branches/rawstudio-ng-color/plugins/exposure-mask/Makefile.am
branches/rawstudio-ng-color/plugins/input-file/Makefile.am
branches/rawstudio-ng-color/plugins/input-image16/Makefile.am
branches/rawstudio-ng-color/plugins/lensfun/Makefile.am
branches/rawstudio-ng-color/plugins/load-dcraw/Makefile.am
branches/rawstudio-ng-color/plugins/load-gdk/Makefile.am
branches/rawstudio-ng-color/plugins/meta-ciff/Makefile.am
branches/rawstudio-ng-color/plugins/meta-mrw/Makefile.am
branches/rawstudio-ng-color/plugins/meta-raf/Makefile.am
branches/rawstudio-ng-color/plugins/meta-tiff/Makefile.am
branches/rawstudio-ng-color/plugins/meta-x3f/Makefile.am
branches/rawstudio-ng-color/plugins/output-facebook/Makefile.am
branches/rawstudio-ng-color/plugins/output-flickr/Makefile.am
branches/rawstudio-ng-color/plugins/output-jpegfile/Makefile.am
branches/rawstudio-ng-color/plugins/output-pngfile/Makefile.am
branches/rawstudio-ng-color/plugins/output-tifffile/Makefile.am
branches/rawstudio-ng-color/plugins/resample/Makefile.am
branches/rawstudio-ng-color/plugins/rotate/Makefile.am
branches/rawstudio-ng-color/src/Makefile.am
Log:
Fixing hardcoded paths in Makefile.am files in /src/ and /plugins/*/
Modified: branches/rawstudio-ng-color/plugins/basic-render/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/basic-render/Makefile.am
2010-01-23 02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/basic-render/Makefile.am
2010-01-23 02:25:00 UTC (rev 3054)
@@ -10,7 +10,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = basic_render.la
Modified: branches/rawstudio-ng-color/plugins/cache/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/cache/Makefile.am 2010-01-23
02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/cache/Makefile.am 2010-01-23
02:25:00 UTC (rev 3054)
@@ -10,7 +10,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = cache.la
Modified: branches/rawstudio-ng-color/plugins/colorspace-adobergb/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/colorspace-adobergb/Makefile.am
2010-01-23 02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/colorspace-adobergb/Makefile.am
2010-01-23 02:25:00 UTC (rev 3054)
@@ -8,7 +8,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = colorspace_adobergb.la
Modified: branches/rawstudio-ng-color/plugins/colorspace-prophoto/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/colorspace-prophoto/Makefile.am
2010-01-23 02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/colorspace-prophoto/Makefile.am
2010-01-23 02:25:00 UTC (rev 3054)
@@ -8,7 +8,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = colorspace_prophoto.la
Modified: branches/rawstudio-ng-color/plugins/colorspace-srgb/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/colorspace-srgb/Makefile.am
2010-01-23 02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/colorspace-srgb/Makefile.am
2010-01-23 02:25:00 UTC (rev 3054)
@@ -4,7 +4,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = colorspace_srgb.la
Modified: branches/rawstudio-ng-color/plugins/colorspace-transform/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/colorspace-transform/Makefile.am
2010-01-23 02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/colorspace-transform/Makefile.am
2010-01-23 02:25:00 UTC (rev 3054)
@@ -10,7 +10,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = colorspace_transform.la
Modified: branches/rawstudio-ng-color/plugins/crop/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/crop/Makefile.am 2010-01-23
02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/crop/Makefile.am 2010-01-23
02:25:00 UTC (rev 3054)
@@ -10,7 +10,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = crop.la
Modified: branches/rawstudio-ng-color/plugins/dcp/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/dcp/Makefile.am 2010-01-23 02:24:14 UTC
(rev 3053)
+++ branches/rawstudio-ng-color/plugins/dcp/Makefile.am 2010-01-23 02:25:00 UTC
(rev 3054)
@@ -6,7 +6,9 @@
AM_CXXFLAGS = $(AM_CFLAGS)
INCLUDES = -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-I../../librawstudio/ @PACKAGE_CFLAGS@
+ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/ @PACKAGE_CFLAGS@ \
+ -I$(top_srcdir)/plugins/dcp/
lib_LTLIBRARIES = dcp.la
@@ -17,10 +19,10 @@
EXTRA_DIST = dcp.h dcp-sse2.c dcp-sse4.c adobe-camera-raw-tone.c
adobe-camera-raw-tone.h
adobe-camera-raw-tone.lo: adobe-camera-raw-tone.c adobe-camera-raw-tone.h
- $(LTCOMPILE) -c adobe-camera-raw-tone.c
+ $(LTCOMPILE) -c $(top_srcdir)/plugins/dcp/adobe-camera-raw-tone.c
dcp.lo: dcp.c adobe-camera-raw-tone.h
- $(LTCOMPILE) -DEXIT_CODE=0 -c dcp.c
+ $(LTCOMPILE) -DEXIT_CODE=0 -c $(top_srcdir)/plugins/dcp/dcp.c
if CAN_COMPILE_SSE4_1
SSE4_FLAG=-msse4.1
@@ -35,7 +37,7 @@
endif
dcp-sse2.lo: dcp-sse2.c
- $(LTCOMPILE) $(SSE2_FLAG) -DEXIT_CODE=1 -c dcp-sse2.c
+ $(LTCOMPILE) $(SSE2_FLAG) -DEXIT_CODE=1 -c
$(top_srcdir)/plugins/dcp/dcp-sse2.c
dcp-sse4.lo: dcp-sse4.c
- $(LTCOMPILE) $(SSE4_FLAG) -DEXIT_CODE=1 -c dcp-sse4.c
+ $(LTCOMPILE) $(SSE4_FLAG) -DEXIT_CODE=1 -c
$(top_srcdir)/plugins/dcp/dcp-sse4.c
Modified: branches/rawstudio-ng-color/plugins/demosaic/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/demosaic/Makefile.am 2010-01-23
02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/demosaic/Makefile.am 2010-01-23
02:25:00 UTC (rev 3054)
@@ -10,7 +10,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = demosaic.la
Modified: branches/rawstudio-ng-color/plugins/denoise/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/denoise/Makefile.am 2010-01-23
02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/denoise/Makefile.am 2010-01-23
02:25:00 UTC (rev 3054)
@@ -11,7 +11,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ -ffast-math \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = denoise.la
Modified: branches/rawstudio-ng-color/plugins/exposure-mask/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/exposure-mask/Makefile.am
2010-01-23 02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/exposure-mask/Makefile.am
2010-01-23 02:25:00 UTC (rev 3054)
@@ -10,7 +10,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = exposure_mask.la
Modified: branches/rawstudio-ng-color/plugins/input-file/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/input-file/Makefile.am 2010-01-23
02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/input-file/Makefile.am 2010-01-23
02:25:00 UTC (rev 3054)
@@ -10,7 +10,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = input_file.la
Modified: branches/rawstudio-ng-color/plugins/input-image16/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/input-image16/Makefile.am
2010-01-23 02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/input-image16/Makefile.am
2010-01-23 02:25:00 UTC (rev 3054)
@@ -10,7 +10,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = input_image16.la
Modified: branches/rawstudio-ng-color/plugins/lensfun/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/lensfun/Makefile.am 2010-01-23
02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/lensfun/Makefile.am 2010-01-23
02:25:00 UTC (rev 3054)
@@ -11,7 +11,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = lensfun.la
@@ -22,7 +23,7 @@
EXTRA_DIST = lensfun-sse2.c
lensfun.lo: lensfun.c
- $(LTCOMPILE) -DEXIT_CODE=0 -c lensfun.c
+ $(LTCOMPILE) -DEXIT_CODE=0 -c $(top_srcdir)/plugins/lensfun/lensfun.c
lensfun-sse2.lo: lensfun-sse2.c
if CAN_COMPILE_SSE2
@@ -30,5 +31,5 @@
else
SSE_FLAG=
endif
- $(LTCOMPILE) $(SSE_FLAG) -DEXIT_CODE=1 -c lensfun-sse2.c
+ $(LTCOMPILE) $(SSE_FLAG) -DEXIT_CODE=1 -c
$(top_srcdir)/plugins/lensfun/lensfun-sse2.c
Modified: branches/rawstudio-ng-color/plugins/load-dcraw/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/load-dcraw/Makefile.am 2010-01-23
02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/load-dcraw/Makefile.am 2010-01-23
02:25:00 UTC (rev 3054)
@@ -14,7 +14,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = load_dcraw.la
Modified: branches/rawstudio-ng-color/plugins/load-gdk/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/load-gdk/Makefile.am 2010-01-23
02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/load-gdk/Makefile.am 2010-01-23
02:25:00 UTC (rev 3054)
@@ -10,7 +10,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = load_gdk.la
Modified: branches/rawstudio-ng-color/plugins/meta-ciff/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/meta-ciff/Makefile.am 2010-01-23
02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/meta-ciff/Makefile.am 2010-01-23
02:25:00 UTC (rev 3054)
@@ -10,7 +10,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = meta_ciff.la
Modified: branches/rawstudio-ng-color/plugins/meta-mrw/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/meta-mrw/Makefile.am 2010-01-23
02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/meta-mrw/Makefile.am 2010-01-23
02:25:00 UTC (rev 3054)
@@ -10,7 +10,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = meta_mrw.la
Modified: branches/rawstudio-ng-color/plugins/meta-raf/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/meta-raf/Makefile.am 2010-01-23
02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/meta-raf/Makefile.am 2010-01-23
02:25:00 UTC (rev 3054)
@@ -10,7 +10,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = meta_raf.la
Modified: branches/rawstudio-ng-color/plugins/meta-tiff/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/meta-tiff/Makefile.am 2010-01-23
02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/meta-tiff/Makefile.am 2010-01-23
02:25:00 UTC (rev 3054)
@@ -10,7 +10,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = meta_tiff.la
Modified: branches/rawstudio-ng-color/plugins/meta-x3f/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/meta-x3f/Makefile.am 2010-01-23
02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/meta-x3f/Makefile.am 2010-01-23
02:25:00 UTC (rev 3054)
@@ -10,7 +10,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = meta_x3f.la
Modified: branches/rawstudio-ng-color/plugins/output-facebook/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/output-facebook/Makefile.am
2010-01-23 02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/output-facebook/Makefile.am
2010-01-23 02:25:00 UTC (rev 3054)
@@ -11,7 +11,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = output_facebook.la
Modified: branches/rawstudio-ng-color/plugins/output-flickr/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/output-flickr/Makefile.am
2010-01-23 02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/output-flickr/Makefile.am
2010-01-23 02:25:00 UTC (rev 3054)
@@ -10,7 +10,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = output_flickr.la
Modified: branches/rawstudio-ng-color/plugins/output-jpegfile/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/output-jpegfile/Makefile.am
2010-01-23 02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/output-jpegfile/Makefile.am
2010-01-23 02:25:00 UTC (rev 3054)
@@ -10,7 +10,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = output_jpegfile.la
Modified: branches/rawstudio-ng-color/plugins/output-pngfile/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/output-pngfile/Makefile.am
2010-01-23 02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/output-pngfile/Makefile.am
2010-01-23 02:25:00 UTC (rev 3054)
@@ -10,7 +10,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = output_pngfile.la
Modified: branches/rawstudio-ng-color/plugins/output-tifffile/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/output-tifffile/Makefile.am
2010-01-23 02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/output-tifffile/Makefile.am
2010-01-23 02:25:00 UTC (rev 3054)
@@ -10,7 +10,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = output_tifffile.la
Modified: branches/rawstudio-ng-color/plugins/resample/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/resample/Makefile.am 2010-01-23
02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/resample/Makefile.am 2010-01-23
02:25:00 UTC (rev 3054)
@@ -10,7 +10,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = resample.la
@@ -21,7 +22,7 @@
EXTRA_DIST = resample-sse2.c
resample.lo: resample.c
- $(LTCOMPILE) -DEXIT_CODE=0 -c resample.c
+ $(LTCOMPILE) -DEXIT_CODE=0 -c $(top_srcdir)/plugins/resample/resample.c
resample-sse2.lo: resample-sse2.c
if CAN_COMPILE_SSE2
@@ -29,5 +30,5 @@
else
SSE_FLAG=
endif
- $(LTCOMPILE) $(SSE_FLAG) -DEXIT_CODE=1 -c resample-sse2.c
+ $(LTCOMPILE) $(SSE_FLAG) -DEXIT_CODE=1 -c
$(top_srcdir)/plugins/resample/resample-sse2.c
Modified: branches/rawstudio-ng-color/plugins/rotate/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/plugins/rotate/Makefile.am 2010-01-23
02:24:14 UTC (rev 3053)
+++ branches/rawstudio-ng-color/plugins/rotate/Makefile.am 2010-01-23
02:25:00 UTC (rev 3054)
@@ -10,7 +10,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
lib_LTLIBRARIES = rotate.la
Modified: branches/rawstudio-ng-color/src/Makefile.am
===================================================================
--- branches/rawstudio-ng-color/src/Makefile.am 2010-01-23 02:24:14 UTC (rev
3053)
+++ branches/rawstudio-ng-color/src/Makefile.am 2010-01-23 02:25:00 UTC (rev
3054)
@@ -4,7 +4,8 @@
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@ \
- -I../librawstudio/
+ -I$(top_srcdir)/librawstudio/ \
+ -I$(top_srcdir)/
AM_CFLAGS =\
-Wall -fno-strict-aliasing\
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
