Merged in make system changes from Bob Kuehne <rpk@sgi.com>

[flightgear.git] / Controls / Makefile

diff --git a/Controls/Makefile b/Controls/Makefile
index 3173889c80beecb88bb8acc67ed7c68e0a86786c..3aa67ba74ea1765dbdc89772bc728bd19e5b90cb 100644 (file)
--- a/Controls/Makefile
+++ b/Controls/Makefile
@@ -23,73 +23,14 @@
 # (Log is kept at end of this file)
 #---------------------------------------------------------------------------
 
-
-TARGET = libControls.a
+ARLIBRARY = libControls.a
+TARGETS = $(ARLIBRARY)
 
 CFILES = controls.c
-HFILES = controls.h
-OFILES = $(CFILES:.c=.o)
-
-
-include ../make.inc
-
-
-CFLAGS = $(FG_CFLAGS)
-
-
-#---------------------------------------------------------------------------
-# Primary Targets
-#---------------------------------------------------------------------------
-
-$(TARGET): $(OFILES)
-       $(AR) rv $(TARGET) $(OFILES)
-       $(RANLIB) $(TARGET)
-
-all: $(TARGET)
-
-clean:
-       rm -f *.o $(TARGET) lib*.a *.os2 *~ core
-
-
-#---------------------------------------------------------------------------
-# Secondary Targets
-#---------------------------------------------------------------------------
+CXXFILES = 
 
-include depend
+LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)
 
-controls.o:
-       $(CC) $(CFLAGS) $(INCLUDES) -c controls.c -o $@
+include $(FG_ROOT_SRC)/commondefs
 
-
-#---------------------------------------------------------------------------
-# $Log$
-# Revision 1.10  1997/07/20 02:19:10  curt
-# First stab at a system to generate os2 makefiles automatically.
-#
-# Revision 1.9  1997/07/12 02:24:45  curt
-# Added ranlib.
-#
-# Revision 1.8  1997/06/27 21:38:03  curt
-# Working on Makefile structure.
-#
-# Revision 1.7  1997/06/27 20:03:33  curt
-# Working on Makefile structure.
-#
-# Revision 1.6  1997/06/26 19:08:29  curt
-# Restructuring make, adding automatic "make dep" support.
-#
-# Revision 1.5  1997/06/25 15:39:46  curt
-# Minor changes to compile with rsxnt/win32.
-#
-# Revision 1.4  1997/06/21 17:12:47  curt
-# Capitalized subdirectory names.
-#
-# Revision 1.3  1997/05/31 19:16:27  curt
-# Elevator trim added.
-#
-# Revision 1.2  1997/05/23 15:40:32  curt
-# Added GNU copyright headers.
-#
-# Revision 1.1  1997/05/16 15:59:47  curt
-# Initial revision.
-#
+include $(COMMONRULES)