]> Pileus Git - ~andy/gtk/blobdiff - gtk/makefile.mingw.in
Updates.
[~andy/gtk] / gtk / makefile.mingw.in
index 54a5ee687512c1373271ba58a433fd36c53815c3..c2770cdd8e6c991ca0020cf6587dba6bcad05301 100644 (file)
@@ -1,15 +1,13 @@
+####
+#### Out of order! Use autoconfiscation.
+####
+
 ## Makefile for building the GTK DLL with gcc on Win32
 ## Use: make -f makefile.mingw
 
 ## There is no install target, you have to decide where and 
 ## how to install for yourself.
 
-# This is the location of pthreads for Win32, 
-# see http://sourceware.cygnus.com/pthreads-win32/
-PTHREADS = ../../pthreads-snap-1999-05-30
-PTHREAD_LIB = -L $(PTHREADS) -lpthread
-PTHREAD_INC = -I $(PTHREADS)
-
 OPTIMIZE = -g
 
 TOP = ../..
@@ -34,151 +32,170 @@ AWK = awk
 
 INCLUDES = -I . -I .. -I ../gdk -I ../gdk-pixbuf
 DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS)
-DEFINES = -DGTK_DISABLE_COMPAT_H -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" -DGTK_VERSION=\"@GTK_VERSION@\"
-
-all :                                          \
-       ../config.h                             \
-       generated                               \
-       gtk-win32-$(GTK_VER).dll                \
-       testcalendar.exe                        \
-       testdnd.exe                             \
-       testgtk.exe                             \
-       testinput.exe                           \
-       testrgb.exe                             \
-       testselection.exe                       \
-       testtext.exe                            \
-       testtextbuffer.exe                      \
+DEFINES = -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" -DGTK_VERSION=\"@GTK_VERSION@\"
+
+GLIB_GENMARSHAL = $(GLIB)/gobject/glib-genmarshal.exe
+
+all :                          \
+       ../config.h             \
+       generated               \
+       gtk-win32-$(GTK_VER).dll\
+       testcalendar.exe        \
+       testdnd.exe             \
+       testgtk.exe             \
+       testinput.exe           \
+       testrgb.exe             \
+       testselection.exe       \
+       testtext.exe            \
+       testtextbuffer.exe      \
        simple.exe
 
-gtk_OBJECTS =                                  \
-       fnmatch.o                               \
-       gdk-pixbuf-loader.o                     \
-       gtkaccelgroup.o                         \
-       gtkaccellabel.o                         \
-       gtkadjustment.o                         \
-       gtkalignment.o                          \
-       gtkarg.o                                \
-       gtkarrow.o                              \
-       gtkaspectframe.o                        \
-       gtkbin.o                                \
-       gtkbindings.o                           \
-       gtkbbox.o                               \
-       gtkbox.o                                \
-       gtkbutton.o                             \
-       gtkcalendar.o                           \
-       gtkcheckbutton.o                        \
-       gtkcheckmenuitem.o                      \
-       gtkclipboard.o                          \
-       gtkclist.o                              \
-       gtkcolorsel.o                           \
-       gtkcolorseldialog.o                     \
-       gtkcombo.o                              \
-       gtkcontainer.o                          \
-       gtkctree.o                              \
-       gtkcurve.o                              \
-       gtkdata.o                               \
-       gtkdialog.o                             \
-       gtkdnd.o                                \
-       gtkdrawingarea.o                        \
-       gtkeditable.o                           \
-       gtkentry.o                              \
-       gtkeventbox.o                           \
-       gtkfilesel.o                            \
-       gtkfixed.o                              \
-       gtkfontsel.o                            \
-       gtkframe.o                              \
-       gtkgamma.o                              \
-       gtkgc.o                                 \
-       gtkhandlebox.o                          \
-       gtkhbbox.o                              \
-       gtkhbox.o                               \
-       gtkhpaned.o                             \
-       gtkhruler.o                             \
-       gtkhscale.o                             \
-       gtkhscrollbar.o                         \
-       gtkhseparator.o                         \
-       gtkhsv.o                                \
-       gtkiconfactory.o                        \
-       gtkimage.o                              \
-       gtkimcontext.o                          \
-       gtkimcontextsimple.o                    \
-       gtkimmulticontext.o                     \
-       gtkinputdialog.o                        \
-       gtkinvisible.o                          \
-       gtkitem.o                               \
-       gtkitemfactory.o                        \
-       gtklabel.o                              \
-       gtklayout.o                             \
-       gtklist.o                               \
-       gtklistitem.o                           \
-       gtkmain.o                               \
-       gtkmenu.o                               \
-       gtkmenubar.o                            \
-       gtkmenufactory.o                        \
-       gtkmenuitem.o                           \
-       gtkmenushell.o                          \
-       gtkmessagedialog.o                      \
-       gtkmisc.o                               \
-       gtknotebook.o                           \
-       gtkobject.o                             \
-       gtkoptionmenu.o                         \
-       gtkpacker.o                             \
-       gtkpaned.o                              \
-       gtkpixmap.o                             \
-       gtkplug.o                               \
-       gtkpreview.o                            \
-       gtkprogress.o                           \
-       gtkprogressbar.o                        \
-       gtkradiobutton.o                        \
-       gtkradiomenuitem.o                      \
-       gtkrange.o                              \
-       gtkrc.o                                 \
-       gtkruler.o                              \
-       gtkscale.o                              \
-       gtkscrollbar.o                          \
-       gtkscrolledwindow.o                     \
-       gtkselection.o                          \
-       gtkseparator.o                          \
-       gtksignal.o                             \
-       gtksocket.o                             \
-       gtkspinbutton.o                         \
-       gtkstyle.o                              \
-       gtkstatusbar.o                          \
-       gtkstock.o                              \
-       gtktable.o                              \
-       gtktearoffmenuitem.o                    \
-       gtktext.o                               \
-       gtktextbtree.o                          \
-       gtktextbuffer.o                         \
-       gtktextchild.o                          \
-       gtktextdisplay.o                        \
-       gtktextiter.o                           \
-       gtktextlayout.o                         \
-       gtktextmark.o                           \
-       gtktextsegment.o                        \
-       gtktexttag.o                            \
-       gtktexttagtable.o                       \
-       gtktexttypes.o                          \
-       gtktextview.o                           \
-       gtkthemes.o                             \
-       gtktipsquery.o                          \
-       gtktogglebutton.o                       \
-       gtktoolbar.o                            \
-       gtktooltips.o                           \
-       gtktree.o                               \
-       gtktreeitem.o                           \
-       gtktreemodel.o                          \
-       gtktypeutils.o                          \
-       gtkvbbox.o                              \
-       gtkvbox.o                               \
-       gtkviewport.o                           \
-       gtkvpaned.o                             \
-       gtkvruler.o                             \
-       gtkvscale.o                             \
-       gtkvscrollbar.o                         \
-       gtkvseparator.o                         \
-       gtkwidget.o                             \
-       gtkwindow.o
+gtk_OBJECTS =                  \
+       fnmatch.o               \
+       gtkaccelgroup.o         \
+       gtkaccellabel.o         \
+       gtkadjustment.o         \
+       gtkalignment.o          \
+       gtkarg.o                \
+       gtkarrow.o              \
+       gtkaspectframe.o        \
+       gtkbin.o                \
+       gtkbindings.o           \
+       gtkbbox.o               \
+       gtkbox.o                \
+       gtkbutton.o             \
+       gtkcalendar.o           \
+       gtkcellrenderer.o       \
+       gtkcellrenderertext.o   \
+       gtkcellrenderertextpixbuf.o     \
+       gtkcellrenderertoggle.o \
+       gtkcellrendererpixbuf.o \
+       gtkcheckbutton.o        \
+       gtkcheckmenuitem.o      \
+       gtkclipboard.o          \
+       gtkclist.o              \
+       gtkcolorsel.o           \
+       gtkcolorseldialog.o     \
+       gtkcombo.o              \
+       gtkcontainer.o          \
+       gtkctree.o              \
+       gtkcurve.o              \
+       gtkdialog.o             \
+       gtkdnd.o                \
+       gtkdrawingarea.o        \
+       gtkeditable.o           \
+       gtkentry.o              \
+       gtkeventbox.o           \
+       gtkfilesel.o            \
+       gtkfixed.o              \
+       gtkfontsel.o            \
+       gtkframe.o              \
+       gtkgamma.o              \
+       gtkgc.o                 \
+       gtkhandlebox.o          \
+       gtkhbbox.o              \
+       gtkhbox.o               \
+       gtkhpaned.o             \
+       gtkhruler.o             \
+       gtkhscale.o             \
+       gtkhscrollbar.o         \
+       gtkhseparator.o         \
+       gtkhsv.o                \
+       gtkiconfactory.o        \
+       gtkimage.o              \
+       gtkimagemenuitem.o      \
+       gtkimcontext.o          \
+       gtkimcontextsimple.o    \
+       gtkimmodule.o           \
+       gtkimmulticontext.o     \
+       gtkinputdialog.o        \
+       gtkinvisible.o          \
+       gtkitem.o               \
+       gtkitemfactory.o        \
+       gtklabel.o              \
+       gtklayout.o             \
+       gtklist.o               \
+       gtklistitem.o           \
+       gtkmain.o               \
+       gtkmenu.o               \
+       gtkmenubar.o            \
+       gtkmenufactory.o        \
+       gtkmenuitem.o           \
+       gtkmenushell.o          \
+       gtkmessagedialog.o      \
+       gtkmisc.o               \
+       gtknotebook.o           \
+       gtkobject.o             \
+       gtkoldeditable.o        \
+       gtkoptionmenu.o         \
+       gtkpacker.o             \
+       gtkpaned.o              \
+       gtkpixmap.o             \
+       gtkplug.o               \
+       gtkpreview.o            \
+       gtkprogress.o           \
+       gtkprogressbar.o        \
+       gtkradiobutton.o        \
+       gtkradiomenuitem.o      \
+       gtkrange.o              \
+       gtkrbtree.o             \
+       gtkrc.o                 \
+       gtkruler.o              \
+       gtkscale.o              \
+       gtkscrollbar.o          \
+       gtkscrolledwindow.o     \
+       gtkselection.o          \
+       gtkseparator.o          \
+       gtkseparatormenuitem.o  \
+       gtksettings.o           \
+       gtksignal.o             \
+       gtksocket.o             \
+       gtkspinbutton.o         \
+       gtkstyle.o              \
+       gtkstatusbar.o          \
+       gtkstock.o              \
+       gtktable.o              \
+       gtktearoffmenuitem.o    \
+       gtktext.o               \
+       gtktextbtree.o          \
+       gtktextbuffer.o         \
+       gtktextchild.o          \
+       gtktextdisplay.o        \
+       gtktextiter.o           \
+       gtktextlayout.o         \
+       gtktextmark.o           \
+       gtktextsegment.o        \
+       gtktexttag.o            \
+       gtktexttagtable.o       \
+       gtktexttypes.o          \
+       gtktextview.o           \
+       gtkthemes.o             \
+       gtktipsquery.o          \
+       gtktogglebutton.o       \
+       gtktoolbar.o            \
+       gtktooltips.o           \
+       gtktree.o               \
+       gtktreeitem.o           \
+       gtktreedatalist.o       \
+       gtktreednd.o            \
+       gtktreemodel.o          \
+       gtktreemodelsort.o      \
+       gtktreeselection.o      \
+       gtktreestore.o          \
+       gtktreeview.o           \
+       gtktreeviewcolumn.o     \
+       gtktypeutils.o          \
+       gtkvbbox.o              \
+       gtkvbox.o               \
+       gtkviewport.o           \
+       gtkvpaned.o             \
+       gtkvruler.o             \
+       gtkvscale.o             \
+       gtkvscrollbar.o         \
+       gtkvseparator.o         \
+       gtkwidget.o             \
+       gtkwindow.o             \
+       gtkwindow-decorate.o
 
 # Source headers which are non-autogenerated headers
 gtk_public_h_sources =         \
@@ -198,12 +215,12 @@ gtk_public_h_sources =            \
        gtkcalendar.h           \
        gtkcheckbutton.h        \
        gtkcheckmenuitem.h      \
+       gtkseparatormenuitem.h  \
        gtkclist.h              \
        gtkclipboard.h          \
        gtkcolorsel.h           \
        gtkcolorseldialog.h     \
        gtkcombo.h              \
-       gtkcompat.h             \
        gtkcontainer.h          \
        gtkctree.h              \
        gtkcurve.h              \
@@ -212,7 +229,6 @@ gtk_public_h_sources =              \
        gtkcellrenderertextpixbuf.h     \
        gtkcellrenderertoggle.h \
        gtkcellrendererpixbuf.h \
-       gtkdata.h               \
        gtkdebug.h              \
        gtkdialog.h             \
        gtkdnd.h                \
@@ -238,7 +254,9 @@ gtk_public_h_sources =              \
        gtkhsv.h                \
        gtkiconfactory.h        \
        gtkimage.h              \
+       gtkimagemenuitem.h      \
        gtkimcontext.h          \
+       gtkimmodule.h           \
        gtkimmulticontext.h     \
        gtkinputdialog.h        \
        gtkinvisible.h          \
@@ -257,13 +275,12 @@ gtk_public_h_sources =            \
        gtkmenushell.h          \
        gtkmessagedialog.h      \
        gtkmisc.h               \
-       gtkmodelsimple.h        \
        gtknotebook.h           \
+       gtkoldeditable.h        \
        gtkobject.h             \
        gtkoptionmenu.h         \
        gtkpacker.h             \
        gtkpaned.h              \
-       gdk-pixbuf-loader.h     \
        gtkpixmap.h             \
        gtkplug.h               \
        gtkpreview.h            \
@@ -280,6 +297,7 @@ gtk_public_h_sources =              \
        gtkscrolledwindow.h     \
        gtkselection.h          \
        gtkseparator.h          \
+       gtksettings.h           \
        gtksignal.h             \
        gtksocket.h             \
        gtkspinbutton.h         \
@@ -298,15 +316,17 @@ gtk_public_h_sources =            \
        gtktexttagtable.h       \
        gtktextview.h           \
        gtktext.h               \
-       gtkthemes.h             \
        gtktipsquery.h          \
        gtktogglebutton.h       \
        gtktoolbar.h            \
        gtktooltips.h           \
        gtktree.h               \
+       gtktreednd.h            \
        gtktreeitem.h           \
        gtktreemodel.h          \
+       gtktreemodelsort.h      \
        gtktreeselection.h      \
+       gtktreesortable.h       \
        gtktreestore.h          \
        gtktreeview.h           \
        gtktreeviewcolumn.h     \
@@ -324,7 +344,6 @@ gtk_public_h_sources =              \
 
 # More headers to use when autogenerating.
 gdk_headers =                  \
-       ../gdk/gdkcc.h          \
        ../gdk/gdkcolor.h       \
        ../gdk/gdkcursor.h      \
        ../gdk/gdkdnd.h         \
@@ -332,7 +351,6 @@ gdk_headers =                       \
        ../gdk/gdkevents.h      \
        ../gdk/gdkfont.h        \
        ../gdk/gdkgc.h          \
-       ../gdk/gdkim.h          \
        ../gdk/gdkimage.h       \
        ../gdk/gdkinput.h       \
        ../gdk/gdkpixmap.h      \
@@ -376,10 +394,10 @@ gtktypebuiltins_evals.c: makeenums.pl gtk.defs
        $(PERL) makeenums.pl arrays $(gtk_public_h_sources) $(gdk_headers) >gtktypebuiltins_evals.c
 
 gtkmarshal.h : gtkmarshal.list
-       glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --header >gtkmarshal.h
+       $(GLIB_GENMARSHAL) --prefix=gtk_marshal gtkmarshal.list --header >gtkmarshal.h
 
 gtkmarshal.c : gtkmarshal.list
-       glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --body >gtkmarshal.c
+       $(GLIB_GENMARSHAL) --prefix=gtk_marshal gtkmarshal.list --body >gtkmarshal.c
 
 #
 # Linking:
@@ -439,12 +457,6 @@ testtextbuffer.exe : testtextbuffer.o
 testtextbuffer.o : testtextbuffer.c
        $(CC) $(CFLAGS) -UGTK_COMPILATION -c -DG_LOG_DOMAIN=\"testtextbuffer\" testtextbuffer.c
 
-testthreads.exe : testthreads.o
-       $(CC) $(CFLAGS) -o $@  testthreads.o $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(PTHREAD_LIB) $(LDFLAGS)
-
-testthreads.o : testthreads.c
-       $(CC) $(CFLAGS) -I$(PTHREAD_INC) -UGTK_COMPILATION -c -DG_LOG_DOMAIN=\"testthreads\" -DUSE_PTHREADS=1 testthreads.c
-
 simple.exe : simple.o
        $(CC) $(CFLAGS) -o $@  simple.o $(GTK_LIBS) $(GDK_LIBS) $(GLIB_LIBS) $(LDFLAGS)