gimp r26506 - in trunk: . modules

[mitch svn gnome org]

Author: mitch
Date: Mon Aug 11 18:28:01 2008
New Revision: 26506
URL: http://svn.gnome.org/viewvc/gimp?rev=26506&view=rev

Log:
2008-08-11  Michael Natterer  <mitch gimp org>

	* modules/Makefile.am
	* modules/*.c: renamed all modules to color-selector-foo.c,
	display-filter-foo.c and controller-foo.c



Added:
   trunk/modules/color-selector-cmyk-lcms.c   (props changed)
      - copied unchanged from r26505, /trunk/modules/colorsel_cmyk_lcms.c
   trunk/modules/color-selector-cmyk.c   (props changed)
      - copied unchanged from r26505, /trunk/modules/colorsel_cmyk.c
   trunk/modules/color-selector-water.c   (props changed)
      - copied unchanged from r26505, /trunk/modules/colorsel_water.c
   trunk/modules/color-selector-wheel.c   (props changed)
      - copied unchanged from r26505, /trunk/modules/colorsel_wheel.c
   trunk/modules/controller-dx-dinput.c   (props changed)
      - copied unchanged from r26505, /trunk/modules/controller_dx_dinput.c
   trunk/modules/controller-linux-input.c   (props changed)
      - copied unchanged from r26505, /trunk/modules/controller_linux_input.c
   trunk/modules/controller-midi.c   (props changed)
      - copied unchanged from r26505, /trunk/modules/controller_midi.c
   trunk/modules/display-filter-color-blind.c   (props changed)
      - copied unchanged from r26505, /trunk/modules/cdisplay_colorblind.c
   trunk/modules/display-filter-gamma.c   (props changed)
      - copied unchanged from r26505, /trunk/modules/cdisplay_gamma.c
   trunk/modules/display-filter-high-contrast.c   (props changed)
      - copied unchanged from r26505, /trunk/modules/cdisplay_highcontrast.c
   trunk/modules/display-filter-lcms.c   (props changed)
      - copied unchanged from r26505, /trunk/modules/cdisplay_lcms.c
   trunk/modules/display-filter-proof.c   (props changed)
      - copied unchanged from r26505, /trunk/modules/cdisplay_proof.c
Removed:
   trunk/modules/cdisplay_colorblind.c
   trunk/modules/cdisplay_gamma.c
   trunk/modules/cdisplay_highcontrast.c
   trunk/modules/cdisplay_lcms.c
   trunk/modules/cdisplay_proof.c
   trunk/modules/colorsel_cmyk.c
   trunk/modules/colorsel_cmyk_lcms.c
   trunk/modules/colorsel_water.c
   trunk/modules/colorsel_wheel.c
   trunk/modules/controller_dx_dinput.c
   trunk/modules/controller_linux_input.c
   trunk/modules/controller_midi.c
Modified:
   trunk/ChangeLog
   trunk/modules/Makefile.am

Modified: trunk/modules/Makefile.am
==============================================================================
--- trunk/modules/Makefile.am	(original)
+++ trunk/modules/Makefile.am	Mon Aug 11 18:28:01 2008
@@ -21,92 +21,92 @@
 	makefile.msc
 
 if HAVE_LCMS
-cdisplay_lcms_module = libcdisplay_lcms.la
-cdisplay_proof_module = libcdisplay_proof.la
+display_filter_lcms_module = libdisplay-filter-lcms.la
+display_filter_proof_module = libdisplay-filter-proof.la
 endif
 
 if PLATFORM_WIN32
 else
-controller_midi_module = libcontroller_midi.la
+controller_midi_module = libcontroller-midi.la
 endif
 
 if HAVE_LINUX_INPUT
-controller_linux_input_module = libcontroller_linux_input.la
+controller_linux_input_module = libcontroller-linux-input.la
 endif
 
 if HAVE_DX_DINPUT
-controller_dx_dinput_module = libcontroller_dx_dinput.la
+controller_dx_dinput_module = libcontroller-dx-dinput.la
 endif
 
 lib_LTLIBRARIES = \
-	libcolorsel_cmyk.la		\
-	libcolorsel_water.la		\
-	libcolorsel_wheel.la		\
-	libcdisplay_colorblind.la	\
-	libcdisplay_gamma.la		\
-	libcdisplay_highcontrast.la	\
-	$(cdisplay_lcms_module)		\
-	$(cdisplay_proof_module)	\
-	$(controller_midi_module)	\
-	$(controller_linux_input_module)\
+	libcolor-selector-cmyk.la		\
+	libcolor-selector-water.la		\
+	libcolor-selector-wheel.la		\
+	libdisplay-filter-color-blind.la	\
+	libdisplay-filter-gamma.la		\
+	libdisplay-filter-high-contrast.la	\
+	$(display_filter_lcms_module)		\
+	$(display_filter_proof_module)		\
+	$(controller_midi_module)		\
+	$(controller_linux_input_module)	\
 	$(controller_dx_dinput_module)
 
 
 modules_libadd = $(libgimpmodule) $(libgimpwidgets) $(GTK_LIBS)
 
-colorsel_libadd = $(libgimpcolor) $(modules_libadd)
-cdisplay_libadd = $(libgimpbase) $(libgimpconfig) $(libgimpcolor) $(modules_libadd)
+color_selector_libadd = $(libgimpcolor) $(modules_libadd)
+display_filter_libadd = $(libgimpbase) $(libgimpconfig) $(libgimpcolor) $(modules_libadd)
 controller_libadd = $(modules_libadd)
 
 if HAVE_LCMS
-libcolorsel_cmyk_la_SOURCES = colorsel_cmyk_lcms.c
-libcolorsel_cmyk_la_CFLAGS = $(LCMS_CFLAGS)
-libcolorsel_cmyk_la_LIBADD = $(libgimpconfig) $(colorsel_libadd) $(LCMS_LIBS)
+libcolor_selector_cmyk_la_SOURCES = color-selector-cmyk-lcms.c
+libcolor_selector_cmyk_la_CFLAGS = $(LCMS_CFLAGS)
+libcolor_selector_cmyk_la_LIBADD = $(libgimpconfig) $(color_selector_libadd) $(LCMS_LIBS)
 else
-libcolorsel_cmyk_la_SOURCES = colorsel_cmyk.c
-libcolorsel_cmyk_la_LIBADD = $(colorsel_libadd)
+libcolor_selector_cmyk_la_SOURCES = color-selector-cmyk.c
+libcolor_selector_cmyk_la_LIBADD = $(color_selector_libadd)
 endif
 
-libcolorsel_cmyk_la_LDFLAGS = -avoid-version -module $(no_undefined)
+libcolor_selector_cmyk_la_LDFLAGS = -avoid-version -module $(no_undefined)
 
-libcolorsel_water_la_SOURCES = colorsel_water.c
-libcolorsel_water_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libcolorsel_water_la_LIBADD = $(colorsel_libadd)
+libcolor_selector_water_la_SOURCES = color-selector-water.c
+libcolor_selector_water_la_LDFLAGS = -avoid-version -module $(no_undefined)
+libcolor_selector_water_la_LIBADD = $(colorsel_libadd)
 
-libcolorsel_wheel_la_SOURCES = colorsel_wheel.c
-libcolorsel_wheel_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libcolorsel_wheel_la_LIBADD = $(colorsel_libadd)
+libcolor_selector_wheel_la_SOURCES = color-selector-wheel.c
+libcolor_selector_wheel_la_LDFLAGS = -avoid-version -module $(no_undefined)
+libcolor_selector_wheel_la_LIBADD = $(colorsel_libadd)
 
-libcdisplay_colorblind_la_SOURCES = cdisplay_colorblind.c
-libcdisplay_colorblind_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libcdisplay_colorblind_la_LIBADD = $(cdisplay_libadd)
+libdisplay_filter_color_blind_la_SOURCES = display-filter-color-blind.c
+libdisplay_filter_color_blind_la_LDFLAGS = -avoid-version -module $(no_undefined)
+libdisplay_filter_color_blind_la_LIBADD = $(display_filter_libadd)
 
-libcdisplay_gamma_la_SOURCES = cdisplay_gamma.c
-libcdisplay_gamma_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libcdisplay_gamma_la_LIBADD = $(cdisplay_libadd)
+libdisplay_filter_gamma_la_SOURCES = display-filter-gamma.c
+libdisplay_filter_gamma_la_LDFLAGS = -avoid-version -module $(no_undefined)
+libdisplay_filter_gamma_la_LIBADD = $(display_filter_libadd)
 
-libcdisplay_highcontrast_la_SOURCES = cdisplay_highcontrast.c
-libcdisplay_highcontrast_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libcdisplay_highcontrast_la_LIBADD = $(cdisplay_libadd)
+libdisplay_filter_high_contrast_la_SOURCES = display-filter-high-contrast.c
+libdisplay_filter_high_contrast_la_LDFLAGS = -avoid-version -module $(no_undefined)
+libdisplay_filter_high_contrast_la_LIBADD = $(display_filter_libadd)
 
-libcdisplay_lcms_la_SOURCES = cdisplay_lcms.c
-libcdisplay_lcms_la_CFLAGS = $(LCMS_CFLAGS)
-libcdisplay_lcms_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libcdisplay_lcms_la_LIBADD = $(cdisplay_libadd) $(LCMS_LIBS)
+libdisplay_filter_lcms_la_SOURCES = display-filter-lcms.c
+libdisplay_filter_lcms_la_CFLAGS = $(LCMS_CFLAGS)
+libdisplay_filter_lcms_la_LDFLAGS = -avoid-version -module $(no_undefined)
+libdisplay_filter_lcms_la_LIBADD = $(display_filter_libadd) $(LCMS_LIBS)
 
 if PLATFORM_WIN32
-libcdisplay_lcms_la_LIBADD += -lgdi32
+libdisplay_filter_lcms_la_LIBADD += -lgdi32
 endif
 
-libcdisplay_proof_la_SOURCES = cdisplay_proof.c
-libcdisplay_proof_la_CFLAGS = $(LCMS_CFLAGS)
-libcdisplay_proof_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libcdisplay_proof_la_LIBADD = $(cdisplay_libadd) $(LCMS_LIBS)
+libdisplay_filter_proof_la_SOURCES = display-filter-proof.c
+libdisplay_filter_proof_la_CFLAGS = $(LCMS_CFLAGS)
+libdisplay_filter_proof_la_LDFLAGS = -avoid-version -module $(no_undefined)
+libdisplay_filter_proof_la_LIBADD = $(display_filter_libadd) $(LCMS_LIBS)
 
 libcontroller_linux_input_la_SOURCES = \
 	gimpinputdevicestore-hal.c	\
 	gimpinputdevicestore.h		\
-	controller_linux_input.c
+	controller-linux-input.c
 libcontroller_linux_input_la_CFLAGS = $(DBUS_GLIB_CFLAGS) $(HAL_CFLAGS)
 libcontroller_linux_input_la_LDFLAGS = -avoid-version -module $(no_undefined)
 libcontroller_linux_input_la_LIBADD = \
@@ -115,13 +115,13 @@
 libcontroller_dx_dinput_la_SOURCES = \
 	gimpinputdevicestore-dx.c	\
 	gimpinputdevicestore.h		\
-	controller_dx_dinput.c
+	controller-dx-dinput.c
 # Use -Wl to avoid libtool lossage
 libcontroller_dx_dinput_la_LDFLAGS = -avoid-version -module $(no_undefined) -Wl,-ldinput8 -Wl,-ldxguid
 libcontroller_dx_dinput_la_LIBADD = \
 	$(controller_libadd) -lrpcrt4
 
-libcontroller_midi_la_SOURCES = controller_midi.c
+libcontroller_midi_la_SOURCES = controller-midi.c
 libcontroller_midi_la_CFLAGS = $(ALSA_CFLAGS)
 libcontroller_midi_la_LDFLAGS = -avoid-version -module $(no_undefined)
 libcontroller_midi_la_LIBADD = $(controller_libadd) $(ALSA_LIBS)