100 lines
3.0 KiB
Plaintext
100 lines
3.0 KiB
Plaintext
--- Makefile.in.orig Fri Jun 14 23:12:25 2002
|
|
+++ Makefile.in Sat May 22 16:29:40 2010
|
|
@@ -29,25 +29,25 @@ FLTKLIBDIR = @ac_fltk_libraries@
|
|
# Program options...
|
|
#
|
|
|
|
-ARFLAGS = crvs
|
|
+ARFLAGS = r
|
|
CFLAGS = -I. -I.. -I$(FLTKROOT)/include @CFLAGS@ @ac_fltk2@
|
|
CXXFLAGS = -I. -I.. -I$(FLTKROOT)/include @CXXFLAGS@ @ac_fltk2@
|
|
-LIBS = @ac_fltk_static@ -L$(FLTKROOT)/lib @LIBS@ -lXext -lX11 -lm -ljpeg -lpng @ac_fltk_dso@ $(GLLIB)
|
|
+LIBS = @ac_fltk_static@ -L$(FLTKROOT)/lib @LIBS@ -lXext -lX11 -lm -ljpeg -lpng -lz @ac_fltk_dso@ $(GLLIB)
|
|
LDFLAGS = @LDFLAGS@
|
|
|
|
#
|
|
# Rules...
|
|
#
|
|
|
|
-.SILENT:
|
|
-.SUFFIXES: .c .cxx .h .o
|
|
+#.SILENT:
|
|
+#.SUFFIXES: .c .cxx .h .o
|
|
.c.o:
|
|
- echo Compiling $<...
|
|
- $(CC) $(CFLAGS) -c $< -o $(<D)/$(basename $(<F)).o
|
|
+# echo Compiling $<...
|
|
+ $(CC) $(CFLAGS) -c $< -o $@
|
|
.cxx.o:
|
|
- echo Compiling $<...
|
|
- echo $(CXX) $(CXXFLAGS) -c $< -o $(<D)/$(basename $(<F)).o
|
|
- $(CXX) $(CXXFLAGS) -c $< -o $(<D)/$(basename $(<F)).o
|
|
+# echo Compiling $<...
|
|
+# echo $(CXX) $(CXXFLAGS) -c $< -o $(<D)/$(basename $(<F)).o
|
|
+ $(CXX) $(CXXFLAGS) -c $< -o $@
|
|
|
|
|
|
#
|
|
@@ -62,7 +62,7 @@ INCLUDEDEPS = FL/Fl_Editor.H FL/Fl_FancyEditor.H FL/Fl
|
|
# Make all targets...
|
|
#
|
|
|
|
-all: libfleditor.a $(DSONAME) test
|
|
+all: libfleditor.a $(DSONAME)
|
|
|
|
#
|
|
# Remove object and target files...
|
|
@@ -93,27 +93,32 @@ install: libfleditor.a
|
|
#
|
|
|
|
test: test/progress test/simple test/single test/status test/multiple
|
|
+ test/progress
|
|
+ test/simple
|
|
+ test/single
|
|
+ test/status
|
|
+ test/multiple
|
|
|
|
test/progress: test/progress.o
|
|
echo Building $@ test program
|
|
- echo $(CXX) $(LDFLAGS) $^ libfleditor.a $(LIBS) -o $@
|
|
- $(CXX) $(LDFLAGS) $^ libfleditor.a $(LIBS) -o $@
|
|
+ echo $(CXX) $(LDFLAGS) test/progress.o libfleditor.a $(LIBS) -o $@
|
|
+ $(CXX) $(LDFLAGS) test/progress.o -R. -L. -lfleditor $(LIBS) -o $@
|
|
|
|
test/simple: test/simple.o
|
|
echo Building $@ test program
|
|
- $(CXX) $(LDFLAGS) $^ libfleditor.a $(LIBS) -o $@
|
|
+ $(CXX) $(LDFLAGS) test/simple.o -R. -L. -lfleditor $(LIBS) -o $@
|
|
|
|
test/status: test/status.o
|
|
echo Building $@ test program
|
|
- $(CXX) $(LDFLAGS) $^ libfleditor.a $(LIBS) -o $@
|
|
+ $(CXX) $(LDFLAGS) test/status.o -R. -L. -lfleditor $(LIBS) -o $@
|
|
|
|
test/single: test/single.o
|
|
echo Building $@ test program
|
|
- $(CXX) $(LDFLAGS) $^ libfleditor.a $(LIBS) -o $@
|
|
+ $(CXX) $(LDFLAGS) test/single.o -R. -L. -lfleditor $(LIBS) -o $@
|
|
|
|
test/multiple: test/multiple.o test/multfunc.o
|
|
echo Building $@ test program
|
|
- $(CXX) $(LDFLAGS) $^ libfleditor.a $(LIBS) -o $@
|
|
+ $(CXX) $(LDFLAGS) test/multiple.o test/multfunc.o -R. -L. -lfleditor $(LIBS) -o $@
|
|
|
|
#
|
|
# Make the editor widget library.
|
|
@@ -124,12 +129,10 @@ EDITOR_OBJS = src/Fl_Editor.o src/Fl_FancyEditor.o src
|
|
src/editengine.o src/lists.o src/wstring.o
|
|
|
|
libfleditor.a: $(EDITOR_OBJS)
|
|
- echo Building library $@...
|
|
- $(RM) libfleditor.a
|
|
$(AR) $(ARFLAGS) libfleditor.a $(EDITOR_OBJS)
|
|
$(RANLIB) libfleditor.a
|
|
|
|
-libfleditor.so: $(EDITOR_OBJS)
|
|
+libfleditor.so.$(LIBfleditor_VERSION): $(EDITOR_OBJS)
|
|
echo Building library $@...
|
|
$(RM) libfleditor.so
|
|
@DSOCOMMAND@ @DSOLIBNAME@@DSOEXT@ $(EDITOR_OBJS)
|