summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>1998-12-06 14:59:14 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>1998-12-06 14:59:14 +0000
commit16252e5fafbf77588f445054a026055e7fdd5b4d (patch)
tree3e811a0262b39bb4963cd69683a4ef56ea85908e
parent17a80e000c7b6cbc804298782497b74b8e7db920 (diff)
Changes for .C == .cxx and .H == .h.
git-svn-id: file:///fltk/svn/fltk/trunk@128 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--fluid/Makefile44
-rw-r--r--fluid/alignment_panel.cxx2
-rw-r--r--fluid/fluid.cxx14
-rw-r--r--src/Makefile232
-rw-r--r--test/Makefile72
5 files changed, 182 insertions, 182 deletions
diff --git a/fluid/Makefile b/fluid/Makefile
index ea5c099c7..46762e262 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -1,5 +1,5 @@
#
-# "$Id: Makefile,v 1.5 1998/10/21 17:24:50 mike Exp $"
+# "$Id: Makefile,v 1.6 1998/12/06 14:59:12 mike Exp $"
#
# Fluid makefile for the Fast Light Tool Kit (FLTK).
#
@@ -26,38 +26,38 @@
PROGRAM = fluid
CPPFILES = \
- Fl_Function_Type.C \
- Fl_Menu_Type.C \
- Fl_Group_Type.C \
- Fl_Widget_Type.C \
- Fl_Type.C \
- Fl_Window_Type.C \
- Fluid_Image.C \
- code.C \
- factory.C \
- file.C \
- fluid.C \
- about_panel.C \
- widget_panel.C \
- alignment_panel.C \
- function_panel.C \
- gif.C
+ Fl_Function_Type.cxx \
+ Fl_Menu_Type.cxx \
+ Fl_Group_Type.cxx \
+ Fl_Widget_Type.cxx \
+ Fl_Type.cxx \
+ Fl_Window_Type.cxx \
+ Fluid_Image.cxx \
+ code.cxx \
+ factory.cxx \
+ file.cxx \
+ fluid.cxx \
+ about_panel.cxx \
+ widget_panel.cxx \
+ alignment_panel.cxx \
+ function_panel.cxx \
+ gif.cxx
################################################################
-OBJECTS = $(CPPFILES:.C=.o)
+OBJECTS = $(CPPFILES:.cxx=.o)
include ../makeinclude
-.SUFFIXES : .C .c .o
+.SUFFIXES : .cxx .c .o
-.C.o :
+.cxx.o :
@echo $<:
@$(CXX) -I.. $(CXXFLAGS) -c $<
.c.o :
@echo $<:
@$(CC) -I.. $(CFLAGS) -c $<
-.C :
+.cxx :
@echo $@:
@$(CXX) -I.. $(CXXFLAGS) -o $@ $< -L../lib -lfltk $(LDLIBS)
@@ -94,5 +94,5 @@ rebuild:
./fluid -c widget_panel.fl
#
-# End of "$Id: Makefile,v 1.5 1998/10/21 17:24:50 mike Exp $".
+# End of "$Id: Makefile,v 1.6 1998/12/06 14:59:12 mike Exp $".
#
diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx
index 218c8b80d..d01b012f4 100644
--- a/fluid/alignment_panel.cxx
+++ b/fluid/alignment_panel.cxx
@@ -68,7 +68,7 @@ Fl_Window* make_alignment_window() {
o->callback((Fl_Callback*)code_input_cb, (void*)(1));
o->when(1);
}
- { Fl_Light_Button* o = include_H_from_C_button = new Fl_Light_Button(60, 250, 140, 20, "Include .H from .C");
+ { Fl_Light_Button* o = include_H_from_C_button = new Fl_Light_Button(60, 250, 140, 20, "Include .h from .cxx");
o->value(1);
o->callback((Fl_Callback*)include_H_from_C_button_cb);
}
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index 948d9a061..beed2a503 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: fluid.cxx,v 1.6 1998/11/05 16:04:44 mike Exp $"
+// "$Id: fluid.cxx,v 1.7 1998/12/06 14:59:13 mike Exp $"
//
// FLUID main entry for the Fast Light Tool Kit (FLTK).
//
@@ -150,8 +150,8 @@ void new_cb(Fl_Widget *, void *v) {
static int compile_only;
-const char* header_file_name = ".H";
-const char* code_file_name = ".C";
+const char* header_file_name = ".h";
+const char* code_file_name = ".cxx";
void write_cb(Fl_Widget *, void *) {
if (!filename) {
@@ -377,9 +377,9 @@ int main(int argc,char **argv) {
int i = 1;
if (!Fl::args(argc,argv,i,arg) || i < argc-1) {
fprintf(stderr,"usage: %s <switches> name.fl\n"
-" -c : write .C and .H and exit\n"
-" -o <name> : .C output filename, or extension if <name> starts with '.'\n"
-" -h <name> : .H output filename, or extension if <name> starts with '.'\n"
+" -c : write .cxx and .h and exit\n"
+" -o <name> : .cxx output filename, or extension if <name> starts with '.'\n"
+" -h <name> : .h output filename, or extension if <name> starts with '.'\n"
"%s\n", argv[0], Fl::help);
return 1;
}
@@ -407,5 +407,5 @@ int main(int argc,char **argv) {
}
//
-// End of "$Id: fluid.cxx,v 1.6 1998/11/05 16:04:44 mike Exp $".
+// End of "$Id: fluid.cxx,v 1.7 1998/12/06 14:59:13 mike Exp $".
//
diff --git a/src/Makefile b/src/Makefile
index 56ad86e9b..a79bd1d78 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,5 @@
#
-# "$Id: Makefile,v 1.6 1998/11/05 16:04:50 mike Exp $"
+# "$Id: Makefile,v 1.7 1998/12/06 14:59:14 mike Exp $"
#
# Library makefile for the Fast Light Tool Kit (FLTK).
#
@@ -24,118 +24,118 @@
#
CPPFILES = \
- Fl.C \
- Fl_Adjuster.C \
- Fl_Bitmap.C \
- Fl_Browser.C \
- Fl_Browser_.C \
- Fl_Browser_load.C \
- Fl_Box.C \
- Fl_Button.C \
- Fl_Chart.C \
- Fl_Check_Button.C \
- Fl_Choice.C \
- Fl_Clock.C \
- Fl_Color_Chooser.C \
- Fl_Counter.C \
- Fl_Dial.C \
- Fl_Double_Window.C \
- Fl_Gl_Choice.C \
- Fl_Gl_Overlay.C \
- Fl_Gl_Window.C \
- Fl_Group.C \
- Fl_Image.C \
- Fl_Input.C \
- Fl_Input_.C \
- Fl_Light_Button.C \
- Fl_Menu.C \
- Fl_Menu_.C \
- Fl_Menu_Bar.C \
- Fl_Menu_Button.C \
- Fl_Menu_Window.C \
- Fl_Menu_add.C \
- Fl_Menu_global.C \
- Fl_Multi_Label.C \
- Fl_Output.C \
- Fl_Overlay_Window.C \
- Fl_Pack.C \
- Fl_Pixmap.C \
- Fl_Positioner.C \
- Fl_Repeat_Button.C \
- Fl_Return_Button.C \
- Fl_Roller.C \
- Fl_Round_Button.C \
- Fl_Scroll.C \
- Fl_Scrollbar.C \
- Fl_Single_Window.C \
- Fl_Slider.C \
- Fl_Tabs.C \
- Fl_Tile.C \
- Fl_Valuator.C \
- Fl_Value_Input.C \
- Fl_Value_Output.C \
- Fl_Value_Slider.C \
- Fl_Widget.C \
- Fl_Window.C \
- Fl_Window_fullscreen.C \
- Fl_Window_hotspot.C \
- Fl_Window_iconize.C \
- Fl_abort.C \
- Fl_add_idle.C \
- Fl_arg.C \
- Fl_cutpaste.C \
- Fl_display.C \
- Fl_get_key.C \
- Fl_get_system_colors.C \
- Fl_own_colormap.C \
- Fl_visual.C \
- Fl_x.C \
- filename_absolute.C \
- filename_expand.C \
- filename_ext.C \
- filename_isdir.C \
- filename_list.C \
- filename_match.C \
- filename_setext.C \
- fl_arc.C \
- fl_arci.C \
- fl_ask.C \
- fl_boxtype.C \
- fl_color.C \
- fl_cursor.C \
- fl_curve.C \
- fl_diamond_box.C \
- fl_draw.C \
- fl_draw_image.C \
- fl_draw_pixmap.C \
- fl_engraved_label.C \
- fl_file_chooser.C \
- fl_font.C \
- fl_labeltype.C \
- fl_oval_box.C \
- fl_overlay.C \
- fl_overlay_visual.C \
- fl_rect.C \
- fl_round_box.C \
- fl_rounded_box.C \
- fl_set_font.C \
- fl_set_fonts.C \
- fl_scroll_area.C \
- fl_shadow_box.C \
- fl_shortcut.C \
- fl_show_colormap.C \
- fl_symbols.C \
- fl_vertex.C \
- forms_compatability.C \
- forms_bitmap.C \
- forms_free.C \
- forms_fselect.C \
- forms_pixmap.C \
- forms_timer.C \
- gl_draw.C \
- gl_start.C \
- glut_compatability.C \
- glut_font.C
+ Fl.cxx \
+ Fl_Adjuster.cxx \
+ Fl_Bitmap.cxx \
+ Fl_Browser.cxx \
+ Fl_Browser_.cxx \
+ Fl_Browser_load.cxx \
+ Fl_Box.cxx \
+ Fl_Button.cxx \
+ Fl_Chart.cxx \
+ Fl_Check_Button.cxx \
+ Fl_Choice.cxx \
+ Fl_Clock.cxx \
+ Fl_Color_Chooser.cxx \
+ Fl_Counter.cxx \
+ Fl_Dial.cxx \
+ Fl_Double_Window.cxx \
+ Fl_Gl_Choice.cxx \
+ Fl_Gl_Overlay.cxx \
+ Fl_Gl_Window.cxx \
+ Fl_Group.cxx \
+ Fl_Image.cxx \
+ Fl_Input.cxx \
+ Fl_Input_.cxx \
+ Fl_Light_Button.cxx \
+ Fl_Menu.cxx \
+ Fl_Menu_.cxx \
+ Fl_Menu_Bar.cxx \
+ Fl_Menu_Button.cxx \
+ Fl_Menu_Window.cxx \
+ Fl_Menu_add.cxx \
+ Fl_Menu_global.cxx \
+ Fl_Multi_Label.cxx \
+ Fl_Output.cxx \
+ Fl_Overlay_Window.cxx \
+ Fl_Pack.cxx \
+ Fl_Pixmap.cxx \
+ Fl_Positioner.cxx \
+ Fl_Repeat_Button.cxx \
+ Fl_Return_Button.cxx \
+ Fl_Roller.cxx \
+ Fl_Round_Button.cxx \
+ Fl_Scroll.cxx \
+ Fl_Scrollbar.cxx \
+ Fl_Single_Window.cxx \
+ Fl_Slider.cxx \
+ Fl_Tabs.cxx \
+ Fl_Tile.cxx \
+ Fl_Valuator.cxx \
+ Fl_Value_Input.cxx \
+ Fl_Value_Output.cxx \
+ Fl_Value_Slider.cxx \
+ Fl_Widget.cxx \
+ Fl_Window.cxx \
+ Fl_Window_fullscreen.cxx \
+ Fl_Window_hotspot.cxx \
+ Fl_Window_iconize.cxx \
+ Fl_abort.cxx \
+ Fl_add_idle.cxx \
+ Fl_arg.cxx \
+ Fl_cutpaste.cxx \
+ Fl_display.cxx \
+ Fl_get_key.cxx \
+ Fl_get_system_colors.cxx \
+ Fl_own_colormap.cxx \
+ Fl_visual.cxx \
+ Fl_x.cxx \
+ filename_absolute.cxx \
+ filename_expand.cxx \
+ filename_ext.cxx \
+ filename_isdir.cxx \
+ filename_list.cxx \
+ filename_match.cxx \
+ filename_setext.cxx \
+ fl_arc.cxx \
+ fl_arci.cxx \
+ fl_ask.cxx \
+ fl_boxtype.cxx \
+ fl_color.cxx \
+ fl_cursor.cxx \
+ fl_curve.cxx \
+ fl_diamond_box.cxx \
+ fl_draw.cxx \
+ fl_draw_image.cxx \
+ fl_draw_pixmap.cxx \
+ fl_engraved_label.cxx \
+ fl_file_chooser.cxx \
+ fl_font.cxx \
+ fl_labeltype.cxx \
+ fl_oval_box.cxx \
+ fl_overlay.cxx \
+ fl_overlay_visual.cxx \
+ fl_rect.cxx \
+ fl_round_box.cxx \
+ fl_rounded_box.cxx \
+ fl_set_font.cxx \
+ fl_set_fonts.cxx \
+ fl_scroll_area.cxx \
+ fl_shadow_box.cxx \
+ fl_shortcut.cxx \
+ fl_show_colormap.cxx \
+ fl_symbols.cxx \
+ fl_vertex.cxx \
+ forms_compatability.cxx \
+ forms_bitmap.cxx \
+ forms_free.cxx \
+ forms_fselect.cxx \
+ forms_pixmap.cxx \
+ forms_timer.cxx \
+ gl_draw.cxx \
+ gl_start.cxx \
+ glut_compatability.cxx \
+ glut_font.cxx
CFILES = scandir.c numericsort.c vsnprintf.c
@@ -147,14 +147,14 @@ include ../makeinclude
LIBRARY = ../lib/$(LIBNAME)
-OBJECTS = $(CPPFILES:.C=.o) $(CFILES:.c=.o)
+OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o)
$(LIBRARY) : $(OBJECTS)
@echo Building $(LIBRARY)
@$(LIBCOMMAND) $(LIBRARY) $(OBJECTS)
@$(RANLIB) $(LIBRARY)
-.C.o :
+.cxx.o :
@echo $<:
@$(CXX) -I.. $(CXXFLAGS) -c $<
.c.o :
@@ -182,5 +182,5 @@ install: ../lib/$(LIBNAME)
@chmod -R a+r,u+w,g-w,o-w $(includedir)/FL
#
-# End of "$Id: Makefile,v 1.6 1998/11/05 16:04:50 mike Exp $".
+# End of "$Id: Makefile,v 1.7 1998/12/06 14:59:14 mike Exp $".
#
diff --git a/test/Makefile b/test/Makefile
index 0057258c6..870d82f19 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
#
-# "$Id: Makefile,v 1.12 1998/12/02 15:39:38 mike Exp $"
+# "$Id: Makefile,v 1.13 1998/12/06 14:59:14 mike Exp $"
#
# Test/example program makefile for the Fast Light Tool Kit (FLTK).
#
@@ -24,16 +24,16 @@
#
CPPFILES =\
- adjuster.C arc.C ask.C bitmap.C boxtype.C browser.C button.C \
- buttons.C checkers.C clock.C colbrowser.C color_chooser.C \
- cube.C cursor.C curve.C demo.C doublebuffer.C file_chooser.C \
- fonts.C forms.C fractals.C fullscreen.C gl_overlay.C \
- glpuzzle.C hello.C iconize.C image.C input.C keyboard.C \
- label.C list_visuals.C mandelbrot.C menubar.C message.C \
- minimum.C navigation.C output.C overlay.C pixmap.C \
- pixmap_browser.C radio.C resizebox.C scroll.C shape.C shiny.C \
- subwindow.C symbols.C tabs.C tile.C valuators.C fast_slow.C \
- resize.C pack.C inactive.C
+ adjuster.cxx arc.cxx ask.cxx bitmap.cxx boxtype.cxx browser.cxx button.cxx \
+ buttons.cxx checkers.cxx clock.cxx colbrowser.cxx color_chooser.cxx \
+ cube.cxx cursor.cxx curve.cxx demo.cxx doublebuffer.cxx file_chooser.cxx \
+ fonts.cxx forms.cxx fractals.cxx fullscreen.cxx gl_overlay.cxx \
+ glpuzzle.cxx hello.cxx iconize.cxx image.cxx input.cxx keyboard.cxx \
+ label.cxx list_visuals.cxx mandelbrot.cxx menubar.cxx message.cxx \
+ minimum.cxx navigation.cxx output.cxx overlay.cxx pixmap.cxx \
+ pixmap_browser.cxx radio.cxx resizebox.cxx scroll.cxx shape.cxx shiny.cxx \
+ subwindow.cxx symbols.cxx tabs.cxx tile.cxx valuators.cxx fast_slow.cxx \
+ resize.cxx pack.cxx inactive.cxx
ALL = adjuster arc ask bitmap boxtype browser button buttons checkers \
clock colbrowser color_chooser cube cursor curve demo doublebuffer \
@@ -49,57 +49,57 @@ include ../makeinclude
$(ALL): ../lib/$(LIBNAME)
-.SUFFIXES: .C .c .o .fl .H
+.SUFFIXES: .cxx .c .o .fl .H
-.C:
+.cxx:
@echo $@:
@$(CXX) -I.. $(CXXFLAGS) $< -L../lib -lfltk $(LDLIBS) -o $@
-.fl.C:
+.fl.cxx:
@echo $@:
@../fluid/fluid -c $<
.fl:
@echo $@:
@../fluid/fluid -c $<
- @$(CXX) -I.. $(CXXFLAGS) $@.C -L../lib -lfltk $(LDLIBS) -o $@
+ @$(CXX) -I.. $(CXXFLAGS) $@.cxx -L../lib -lfltk $(LDLIBS) -o $@
# Programs needing the OpenGL libraries:
-cube: cube.C
+cube: cube.cxx
@echo $@:
- @$(CXX) -I.. $(CXXFLAGS) cube.C -L../lib -lfltk $(GLDLIBS) -o $@
-fullscreen: fullscreen.C
+ @$(CXX) -I.. $(CXXFLAGS) cube.cxx -L../lib -lfltk $(GLDLIBS) -o $@
+fullscreen: fullscreen.cxx
@echo $@:
- @$(CXX) -I.. $(CXXFLAGS) fullscreen.C -L../lib -lfltk $(GLDLIBS) -o $@
-fractals: fractals.C
+ @$(CXX) -I.. $(CXXFLAGS) fullscreen.cxx -L../lib -lfltk $(GLDLIBS) -o $@
+fractals: fractals.cxx
@echo $@:
- @$(CXX) -I.. $(CXXFLAGS) fractals.C -L../lib -lfltk $(GLDLIBS) -o $@
-gl_overlay: gl_overlay.C
+ @$(CXX) -I.. $(CXXFLAGS) fractals.cxx -L../lib -lfltk $(GLDLIBS) -o $@
+gl_overlay: gl_overlay.cxx
@echo $@:
- @$(CXX) -I.. $(CXXFLAGS) gl_overlay.C -L../lib -lfltk $(GLDLIBS) -o $@
-glpuzzle: glpuzzle.C
+ @$(CXX) -I.. $(CXXFLAGS) gl_overlay.cxx -L../lib -lfltk $(GLDLIBS) -o $@
+glpuzzle: glpuzzle.cxx
@echo $@:
- @$(CXX) -I.. $(CXXFLAGS) glpuzzle.C -L../lib -lfltk $(GLDLIBS) -o $@
-shape: shape.C
+ @$(CXX) -I.. $(CXXFLAGS) glpuzzle.cxx -L../lib -lfltk $(GLDLIBS) -o $@
+shape: shape.cxx
@echo $@:
- @$(CXX) -I.. $(CXXFLAGS) shape.C -L../lib -lfltk $(GLDLIBS) -o $@
-shiny: shiny.C shiny_panel.C
+ @$(CXX) -I.. $(CXXFLAGS) shape.cxx -L../lib -lfltk $(GLDLIBS) -o $@
+shiny: shiny.cxx shiny_panel.cxx
@echo $@:
- @$(CXX) -I.. $(CXXFLAGS) shiny.C -L../lib -lfltk $(GLDLIBS) -o $@
+ @$(CXX) -I.. $(CXXFLAGS) shiny.cxx -L../lib -lfltk $(GLDLIBS) -o $@
# Other programs needing special "help"...
-keyboard: keyboard.C keyboard_ui.C
+keyboard: keyboard.cxx keyboard_ui.cxx
@echo $@:
- @$(CXX) -I.. $(CXXFLAGS) keyboard.C -L../lib -lfltk $(LDLIBS) -o $@
-mandelbrot: mandelbrot.C mandelbrot_ui.C
+ @$(CXX) -I.. $(CXXFLAGS) keyboard.cxx -L../lib -lfltk $(LDLIBS) -o $@
+mandelbrot: mandelbrot.cxx mandelbrot_ui.cxx
@echo $@:
- @$(CXX) -I.. $(CXXFLAGS) mandelbrot.C -L../lib -lfltk $(LDLIBS) -o $@
+ @$(CXX) -I.. $(CXXFLAGS) mandelbrot.cxx -L../lib -lfltk $(LDLIBS) -o $@
# If you have libjpeg installed, you might want to try this test program:
-jpeg_image: jpeg_image.C
+jpeg_image: jpeg_image.cxx
@echo $@:
- @$(CXX) -I.. $(CXXFLAGS) -I../../../local/jpeg-6b -L../../../local/jpeg-6b jpeg_image.C -L../lib -lfltk $(LDLIBS) -ljpeg -lXext -o $@
+ @$(CXX) -I.. $(CXXFLAGS) -I../../../local/jpeg-6b -L../../../local/jpeg-6b jpeg_image.cxx -L../lib -lfltk $(LDLIBS) -ljpeg -lXext -o $@
depend:
$(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) > makedepend
@@ -111,5 +111,5 @@ install:
@echo Nothing to install in test directory.
#
-# End of "$Id: Makefile,v 1.12 1998/12/02 15:39:38 mike Exp $".
+# End of "$Id: Makefile,v 1.13 1998/12/06 14:59:14 mike Exp $".
#