applied patch #933086: "scrollbar stops compilation due to missing header"

[wxWidgets.git] / samples / db / makefile.unx

diff --git a/samples/db/makefile.unx b/samples/db/makefile.unx
index 3c4142d09bc16459ce11f77f153e1b4bac5bb17d..816246660198bcacda1c6820ff2eb62ec8e57a8f 100644 (file)
--- a/samples/db/makefile.unx
+++ b/samples/db/makefile.unx
@@ -1,71 +1,35 @@
 #
-# File:                makefile.unx
-# Author:      Terry Tompkins
-# Created:     1998
+# File:                Makefile for samples
+# Author:      Robert Roebling
+# Created:     1999
 # Updated:     
-# Copyright:   (c) 1998, Remstar International
+# Copyright:   (c) 1998 Robert Roebling
+#
+# This makefile requires a Unix version of wxWindows
+# to be installed on your system. This is most often
+# done typing "make install" when using the complete
+# sources of wxWindows or by installing the two
+# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
+# under Linux.
 #
-# Makefile for wxDB (UNIX).
-
-OBJDIR=database
-OBJSUFF=.o
-SRCSUFF=.cpp
-WXDIR = $(WXWIN)
-
-# All common UNIX compiler flags and options are now in
-# this central makefile.
-include $(WXDIR)/src/make.env
-
-PROGRAM=database
-
-OBJECTS = $(OBJDIR)/$(PROGRAM).$(OBJSUFF) $(OBJDIR)/table.$(OBJSUFF) $(OBJDIR)/db.$(OBJSUFF) $(OBJDIR)/listdb.$(OBJSUFF)
-
-.SUFFIXES:
-
-all:    $(OBJDIR) $(PROGRAM)$(GUISUFFIX)
-
-wx:
-
-
-motif:
-       $(MAKE) -f makefile.unx GUISUFFIX=_motif GUI=-Dwx_motif GUISUFFIX=_motif OPT='$(OPT)' LDLIBS='$(MOTIFLDLIBS)' WXLIB=$(WXDIR)/lib/libwx_motif.a  OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)' XVIEW_LINK=
-
-xview:
-       cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx xview
-       $(MAKE) -f makefile.unx GUI=-Dwx_xview GUISUFFIX=_ol CC=$(CC) OPTIONS='$(OPTIONS)' DEBUG='$(DEBUG)' WARN='$(WARN)' XLIB='$(XLIB)' XINCLUDE='$(XINCLUDE)'
-
-hp:
-       cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx hp
-       $(MAKE) -f makefile.unx GUI=-Dwx_motif GUISUFFIX=_hp CC=CC DEBUG='$(DEBUG)' WARN='-w' \
-         XINCLUDE='$(HPXINCLUDE)' XLIB='$(HPXLIB)' XVIEW_LINK='' LDLIBS='$(HPLDLIBS)'
-
-$(OBJDIR):
-       mkdir $(OBJDIR)
-
-$(PROGRAM)$(GUISUFFIX):        $(DUMMYOBJ) $(DBLIBS) $(OBJECTS) $(WXLIB)
-       $(CC) $(LDFLAGS) -o $(PROGRAM)$(GUISUFFIX) $(OBJECTS) $(XVIEW_LINK) $(LDLIBS)
 
-$(OBJDIR)/$(PROGRAM).$(OBJSUFF):       $(PROGRAM).$(SRCSUFF)
-       $(CC) -c $(CPPFLAGS) -o $@ $(PROGRAM).$(SRCSUFF)
+PROGRAM = dbtest
 
-$(OBJDIR)/table.$(OBJSUFF):    table.$(SRCSUFF)
-       $(CC) -c $(CPPFLAGS) -o $@ table.$(SRCSUFF)
+CXX = $(shell wx-config --cxx)
 
-$(OBJDIR)/db.$(OBJSUFF):       db.$(SRCSUFF)
-       $(CC) -c $(CPPFLAGS) -o $@ db.$(SRCSUFF)
+OBJECTS = $(PROGRAM).o listdb.o
 
-$(OBJDIR)/listdb.$(OBJSUFF):   listdb.$(SRCSUFF)
-       $(CC) -c $(CPPFLAGS) -o $@ listdb.$(SRCSUFF)
+# implementation
 
-clean_motif:
-       $(MAKE) -f makefile.unx GUISUFFIX=_motif cleanany
+.SUFFIXES:     .o .cpp
 
-clean_ol:
-       $(MAKE) -f makefile.unx GUISUFFIX=_ol cleanany
+.cpp.o :
+       $(CXX) -c `wx-config --cxxflags` -o $@ $<
 
-clean_hp:
-       $(MAKE) -f makefile.unx GUISUFFIX=_hp cleanany
+all:    $(PROGRAM)
 
-cleanany:
-       rm -f $(OBJECTS) $(PROGRAM)$(GUISUFFIX) core
+$(PROGRAM):    $(OBJECTS)
+       $(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
 
+clean: 
+       rm -f *.o $(PROGRAM)