Author: matt
Date: 2011-08-19 13:51:32 -0700 (Fri, 19 Aug 2011)
New Revision: 8987
Log:
Fluid3: makefile procedural changes
Modified:
branches/branch-3.0/fltk.flw
branches/branch-3.0/fluid/file_make.cxx
branches/branch-3.0/test/Makefile
Modified: branches/branch-3.0/fltk.flw
===================================================================
--- branches/branch-3.0/fltk.flw 2011-08-19 19:58:00 UTC (rev 8986)
+++ branches/branch-3.0/fltk.flw 2011-08-19 20:51:32 UTC (rev 8987)
@@ -2,7 +2,7 @@
version 3.0000
header_name {.h}
code_name {.cxx}
-workspace FLTK {open
+workspace FLTK {open selected
uuid_Xcode4_Root {2204C862-3EAB-44CD-B0A8-6DF16FFDC8F4}
uuid_Xcode4_ProductsGroup {A3B55F76-F5F9-4F9E-8A45-2778583213A1}
uuid_Xcode4_Group {341D2CD3-06FB-47E4-B35C-D1F9B51C7293}
@@ -12,6 +12,7 @@
uuid_Xcode4_ReleaseBuildConfiguration {C5259E66-FBF8-43A2-B30F-8D59BBE3CF16}
uuid_VC2008_Workspace {D21EA206-7BBC-4F5B-8518-A798E56EE0FC}
uuid_VC2010_Workspace {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
+ build_env 1
} {
folder Applications {open
uuid_Xcode4_Group {137F861A-5702-45AC-821B-A2C51A17F780}
@@ -6124,7 +6125,7 @@
target_path test
makefile_path test
} {
- file_ref {unittests.h} {selected
+ file_ref {unittests.h} {
uuid_Xcode4_BuildFileInSources {D7B3CC1A-179A-4010-87A5-840CEDC5B573}
uuid_Xcode4_FileRef {C3BAFC16-1409-4C23-90F1-BADA0CED49BC}
build_env 0
Modified: branches/branch-3.0/fluid/file_make.cxx
===================================================================
--- branches/branch-3.0/fluid/file_make.cxx 2011-08-19 19:58:00 UTC (rev
8986)
+++ branches/branch-3.0/fluid/file_make.cxx 2011-08-19 20:51:32 UTC (rev
8987)
@@ -2292,80 +2292,20 @@
write_header(out, "Test/example program makefile for the Fast Light Tool Kit
(FLTK).");
fprintf(out, "include ../makeinclude\n");
fprintf(out, "\n");
- fprintf(out, "CPPFILES =\\\n");
- fprintf(out, "\tunittests.cxx \\\n");
- fprintf(out, "\tadjuster.cxx \\\n");
- fprintf(out, "\tarc.cxx \\\n");
- fprintf(out, "\task.cxx \\\n");
- fprintf(out, "\tbitmap.cxx \\\n");
- fprintf(out, "\tblocks.cxx \\\n");
- fprintf(out, "\tboxtype.cxx \\\n");
- fprintf(out, "\tbrowser.cxx \\\n");
- fprintf(out, "\tbutton.cxx \\\n");
- fprintf(out, "\tbuttons.cxx \\\n");
- fprintf(out, "\tcheckers.cxx \\\n");
- fprintf(out, "\tclock.cxx \\\n");
- fprintf(out, "\tcolbrowser.cxx \\\n");
- fprintf(out, "\tcolor_chooser.cxx \\\n");
- fprintf(out, "\tcube.cxx \\\n");
- fprintf(out, "\tCubeMain.cxx \\\n");
- fprintf(out, "\tCubeView.cxx \\\n");
- fprintf(out, "\tcursor.cxx \\\n");
- fprintf(out, "\tcurve.cxx \\\n");
- fprintf(out, "\tdemo.cxx \\\n");
- fprintf(out, "\tdevice.cxx \\\n");
- fprintf(out, "\tdoublebuffer.cxx \\\n");
- fprintf(out, "\teditor.cxx \\\n");
- fprintf(out, "\tfast_slow.cxx \\\n");
- fprintf(out, "\tfile_chooser.cxx \\\n");
- fprintf(out, "\tfonts.cxx \\\n");
- fprintf(out, "\tfractals.cxx \\\n");
- fprintf(out, "\tfullscreen.cxx \\\n");
- fprintf(out, "\tgl_overlay.cxx \\\n");
- fprintf(out, "\tglpuzzle.cxx \\\n");
- fprintf(out, "\thello.cxx \\\n");
- fprintf(out, "\thelp.cxx \\\n");
- fprintf(out, "\ticonize.cxx \\\n");
- fprintf(out, "\timage.cxx \\\n");
- fprintf(out, "\tinactive.cxx \\\n");
- fprintf(out, "\tinput.cxx \\\n");
- fprintf(out, "\tinput_choice.cxx \\\n");
- fprintf(out, "\tkeyboard.cxx \\\n");
- fprintf(out, "\tlabel.cxx \\\n");
- fprintf(out, "\tline_style.cxx \\\n");
- fprintf(out, "\tlist_visuals.cxx \\\n");
- fprintf(out, "\tmandelbrot.cxx \\\n");
- fprintf(out, "\tmenubar.cxx \\\n");
- fprintf(out, "\tmessage.cxx \\\n");
- fprintf(out, "\tminimum.cxx \\\n");
- fprintf(out, "\tnative-filechooser.cxx \\\n");
- fprintf(out, "\tnavigation.cxx \\\n");
- fprintf(out, "\toutput.cxx \\\n");
- fprintf(out, "\toverlay.cxx \\\n");
- fprintf(out, "\tpack.cxx \\\n");
- fprintf(out, "\tpixmap_browser.cxx \\\n");
- fprintf(out, "\tpixmap.cxx \\\n");
- fprintf(out, "\tpreferences.cxx \\\n");
- fprintf(out, "\tdevice.cxx \\\n");
- fprintf(out, "\tradio.cxx \\\n");
- fprintf(out, "\tresizebox.cxx \\\n");
- fprintf(out, "\tresize.cxx \\\n");
- fprintf(out, "\trotated_text.cxx \\\n");
- fprintf(out, "\tscroll.cxx \\\n");
- fprintf(out, "\tshape.cxx \\\n");
- fprintf(out, "\tsubwindow.cxx \\\n");
- fprintf(out, "\tsudoku.cxx \\\n");
- fprintf(out, "\tsymbols.cxx \\\n");
- fprintf(out, "\ttable.cxx \\\n");
- fprintf(out, "\ttabs.cxx \\\n");
- fprintf(out, "\tthreads.cxx \\\n");
- fprintf(out, "\ttile.cxx \\\n");
- fprintf(out, "\ttiled_image.cxx \\\n");
- fprintf(out, "\ttree.cxx \\\n");
- fprintf(out, "\tvaluators.cxx \\\n");
- fprintf(out, "\tutf8.cxx\n");
- fprintf(out, "\n");
+ fprintf(out, "CPPFILES =");
+ for (tgt = first_target; tgt; tgt = tgt->next_target(workspace)) {
+ if (tgt->builds_in(FL_ENV_MAKE) && strcmp(tgt->makefile_path(), path)==0) {
+ for (file = Fl_File_Type::first_file(tgt); file; file =
file->next_file(tgt)) {
+ if (file->file_is_code()) {
+ fprintf(out, " \\\n\t");
+ write_file(out, file, base_dir, tgt_base);
+ }
+ }
+ }
+ }
+ fprintf(out, "\n\n");
+
fprintf(out, "ALL =");
for (tgt = first_target; tgt; tgt = tgt->next_target(workspace)) {
if (tgt->builds_in(FL_ENV_MAKE) && strcmp(tgt->makefile_path(), path)==0
&& !target_links_with(tgt, "fltk_gl")) {
@@ -2395,17 +2335,20 @@
fprintf(out, "clean:\n");
fprintf(out, "\t$(RM) $(ALL) $(GLALL) core\n");
fprintf(out, "\t$(RM) *.o core.* *~ *.bck *.bak\n");
- fprintf(out, "\t$(RM) CubeViewUI.cxx CubeViewUI.h\n");
- fprintf(out, "\t$(RM) fast_slow.cxx fast_slow.h\n");
- fprintf(out, "\t$(RM) inactive.cxx inactive.h\n");
- fprintf(out, "\t$(RM) keyboard_ui.cxx keyboard_ui.h\n");
- fprintf(out, "\t$(RM) mandelbrot_ui.cxx mandelbrot_ui.h\n");
- fprintf(out, "\t$(RM) preferences.cxx preferences.h\n");
- fprintf(out, "\t$(RM) radio.cxx radio.h\n");
- fprintf(out, "\t$(RM) resize.cxx resize.h\n");
- fprintf(out, "\t$(RM) tabs.cxx tabs.h\n");
- fprintf(out, "\t$(RM) tree.cxx tree.h\n");
- fprintf(out, "\t$(RM) valuators.cxx valuators.h\n");
+ // list all .fl based .cxx and .h files for removal
+ for (tgt = first_target; tgt; tgt = tgt->next_target(workspace)) {
+ if (tgt->builds_in(FL_ENV_MAKE) && strcmp(tgt->makefile_path(), path)==0) {
+ for (file = Fl_File_Type::first_file(tgt); file; file =
file->next_file(tgt)) {
+ if (file->builds_in(FL_ENV_MAKE) && file->file_is_fluid_ui()) {
+ fprintf(out, "\t$(RM) ");
+ write_file(out, file, base_dir, tgt_base, ".cxx");
+ fprintf(out, " ");
+ write_file(out, file, base_dir, tgt_base, ".h");
+ fprintf(out, "\n");
+ }
+ }
+ }
+ }
fprintf(out, "\t$(OSX_ONLY) $(RM)
blocks.app/Contents/MacOS/blocks$(EXEEXT)\n");
fprintf(out, "\t$(OSX_ONLY) $(RM)
checkers.app/Contents/MacOS/checkers$(EXEEXT)\n");
fprintf(out, "\t$(OSX_ONLY) $(RM)
sudoku.app/Contents/MacOS/sudoku$(EXEEXT)\n");
Modified: branches/branch-3.0/test/Makefile
===================================================================
--- branches/branch-3.0/test/Makefile 2011-08-19 19:58:00 UTC (rev 8986)
+++ branches/branch-3.0/test/Makefile 2011-08-19 20:51:32 UTC (rev 8987)
@@ -27,8 +27,8 @@
include ../makeinclude
-CPPFILES =\
- unittests.cxx \
+CPPFILES = \
+ demo.cxx \
adjuster.cxx \
arc.cxx \
ask.cxx \
@@ -43,18 +43,17 @@
colbrowser.cxx \
color_chooser.cxx \
cube.cxx \
+ CubeView.cxx \
CubeMain.cxx \
- CubeView.cxx \
cursor.cxx \
curve.cxx \
- demo.cxx \
device.cxx \
doublebuffer.cxx \
editor.cxx \
- fast_slow.cxx \
file_chooser.cxx \
fonts.cxx \
fractals.cxx \
+ fracviewer.cxx \
fullscreen.cxx \
gl_overlay.cxx \
glpuzzle.cxx \
@@ -62,7 +61,6 @@
help.cxx \
iconize.cxx \
image.cxx \
- inactive.cxx \
input.cxx \
input_choice.cxx \
keyboard.cxx \
@@ -73,18 +71,14 @@
menubar.cxx \
message.cxx \
minimum.cxx \
+ navigation.cxx \
native-filechooser.cxx \
- navigation.cxx \
output.cxx \
overlay.cxx \
pack.cxx \
pixmap_browser.cxx \
pixmap.cxx \
- preferences.cxx \
- device.cxx \
- radio.cxx \
resizebox.cxx \
- resize.cxx \
rotated_text.cxx \
scroll.cxx \
shape.cxx \
@@ -92,12 +86,19 @@
sudoku.cxx \
symbols.cxx \
table.cxx \
- tabs.cxx \
threads.cxx \
tile.cxx \
tiled_image.cxx \
- tree.cxx \
- valuators.cxx \
+ unittests.cxx \
+ unittest_about.cxx \
+ unittest_circles.cxx \
+ unittest_images.cxx \
+ unittest_lines.cxx \
+ unittest_points.cxx \
+ unittest_rects.cxx \
+ unittest_scrollbarsize.cxx \
+ unittest_text.cxx \
+ unittest_viewport.cxx \
utf8.cxx
ALL = \
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
