Author: akv
Date: 2010-08-21 18:29:58 +0200 (Sat, 21 Aug 2010)
New Revision: 3505
Added:
branches/remove_version_info_and_use_package_name_instead_of_hardcoded_values/librawstudio/rawstudio.pc.in
Removed:
branches/remove_version_info_and_use_package_name_instead_of_hardcoded_values/librawstudio/rawstudio-1.1.pc.in
Modified:
branches/remove_version_info_and_use_package_name_instead_of_hardcoded_values/configure.in
branches/remove_version_info_and_use_package_name_instead_of_hardcoded_values/librawstudio/Makefile.am
branches/remove_version_info_and_use_package_name_instead_of_hardcoded_values/src/Makefile.am
Log:
Removed hardcoded version id many places.
Modified:
branches/remove_version_info_and_use_package_name_instead_of_hardcoded_values/configure.in
===================================================================
---
branches/remove_version_info_and_use_package_name_instead_of_hardcoded_values/configure.in
2010-08-21 16:24:53 UTC (rev 3504)
+++
branches/remove_version_info_and_use_package_name_instead_of_hardcoded_values/configure.in
2010-08-21 16:29:58 UTC (rev 3505)
@@ -106,7 +106,7 @@
AC_OUTPUT([
Makefile
librawstudio/Makefile
-librawstudio/rawstudio-1.1.pc
+librawstudio/rawstudio.pc
plugins/Makefile
plugins/cache/Makefile
plugins/colorspace-adobergb/Makefile
Modified:
branches/remove_version_info_and_use_package_name_instead_of_hardcoded_values/librawstudio/Makefile.am
===================================================================
---
branches/remove_version_info_and_use_package_name_instead_of_hardcoded_values/librawstudio/Makefile.am
2010-08-21 16:24:53 UTC (rev 3504)
+++
branches/remove_version_info_and_use_package_name_instead_of_hardcoded_values/librawstudio/Makefile.am
2010-08-21 16:29:58 UTC (rev 3505)
@@ -10,7 +10,7 @@
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@PACKAGE_CFLAGS@
-library_includedir=$(includedir)/@pack...@-@VERSION@/
+library_includedir=$(includedir)/@PACKAGE@/
library_include_HEADERS = rawstudio.h rs-types.h rs-macros.h \
rs-io-job.h \
rs-io-job-checksum.h \
@@ -56,8 +56,8 @@
rs-profile-camera.h \
x86-cpu.h
-lib_LTLIBRARIES = librawstudio-1.1.la
-librawstudio_1_1_la_SOURCES = \
+lib_LTLIBRARIES = librawstudio.la
+librawstudio_la_SOURCES = \
rs-io-job.c rs-io-job.h \
rs-io-job-checksum.c rs-io-job-checksum.h \
rs-io-job-metadata.c rs-io-job-metadata.h \
@@ -102,7 +102,7 @@
conf_interface.c conf_interface.h \
rs-stock.c rs-stock.h
-librawstudio_1_1_la_LIBADD = @PACKAGE_LIBS@ @LIBJPEG@ @LIBTIFF@ $(INTLLIBS)
+librawstudio_la_LIBADD = @PACKAGE_LIBS@ @LIBJPEG@ @LIBTIFF@ $(INTLLIBS)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = rawstudio-1.1.pc
+pkgconfig_DATA = rawstudio.pc
Deleted:
branches/remove_version_info_and_use_package_name_instead_of_hardcoded_values/librawstudio/rawstudio-1.1.pc.in
===================================================================
---
branches/remove_version_info_and_use_package_name_instead_of_hardcoded_values/librawstudio/rawstudio-1.1.pc.in
2010-08-21 16:24:53 UTC (rev 3504)
+++
branches/remove_version_info_and_use_package_name_instead_of_hardcoded_values/librawstudio/rawstudio-1.1.pc.in
2010-08-21 16:29:58 UTC (rev 3505)
@@ -1,12 +0,0 @@
-pref...@prefix@
-exec_prefix=${prefix}
-libd...@libdir@
-includedir=${prefix}/include
-plugind...@prefix@/share/rawstudio/plugins
-
-Name: @PACKAGE@
-Description: Rawstudio backend library
-Version: @VERSION@
-Libs: -L${libdir} -...@package@-...@version@
-Cflags: -I${includedir}/@pack...@-@VERSION@
-I${libdir}/@pack...@-@VERSION@/include
-Requires: gtk+-2.0
Copied:
branches/remove_version_info_and_use_package_name_instead_of_hardcoded_values/librawstudio/rawstudio.pc.in
(from rev 3503, trunk/librawstudio/rawstudio-1.1.pc.in)
===================================================================
---
branches/remove_version_info_and_use_package_name_instead_of_hardcoded_values/librawstudio/rawstudio.pc.in
(rev 0)
+++
branches/remove_version_info_and_use_package_name_instead_of_hardcoded_values/librawstudio/rawstudio.pc.in
2010-08-21 16:29:58 UTC (rev 3505)
@@ -0,0 +1,12 @@
+pref...@prefix@
+exec_prefix=${prefix}
+libd...@libdir@
+includedir=${prefix}/include
+plugind...@prefix@/share/rawstudio/plugins
+
+Name: @PACKAGE@
+Description: Rawstudio backend library
+Version: @VERSION@
+Libs: -L${libdir} -...@package@
+Cflags: -I${includedir}/@PACKAGE@ -I${libdir}/@PACKAGE@/include
+Requires: gtk+-2.0
Modified:
branches/remove_version_info_and_use_package_name_instead_of_hardcoded_values/src/Makefile.am
===================================================================
---
branches/remove_version_info_and_use_package_name_instead_of_hardcoded_values/src/Makefile.am
2010-08-21 16:24:53 UTC (rev 3504)
+++
branches/remove_version_info_and_use_package_name_instead_of_hardcoded_values/src/Makefile.am
2010-08-21 16:29:58 UTC (rev 3505)
@@ -47,5 +47,5 @@
rs-dir-selector.c rs-dir-selector.h \
rs-library.c rs-library.h
-rawstudio_LDADD = ../librawstudio/librawstud...@[email protected] @PACKAGE_LIBS@
@LIBJPEG@ @LIBTIFF@ $(INTLLIBS)
+rawstudio_LDADD = ../librawstudio/librawstudio.la @PACKAGE_LIBS@ @LIBJPEG@
@LIBTIFF@ $(INTLLIBS)
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
