X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fmakefile.mingw.in;h=c2770cdd8e6c991ca0020cf6587dba6bcad05301;hb=06b4ef65174e56e766e4bde06e08e34c08788272;hp=8058cef55fce2042d4832c6a5ae079dadcf92105;hpb=2c2dbae19723cbba47f00504a24189152927eced;p=~andy%2Fgtk

diff --git a/gtk/makefile.mingw.in b/gtk/makefile.mingw.in
index 8058cef55..c2770cdd8 100644
--- a/gtk/makefile.mingw.in
+++ b/gtk/makefile.mingw.in
@@ -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,158 +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				\
-	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				\
-	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			\
-	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				\
-	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 =		\
@@ -205,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		\
@@ -219,7 +229,6 @@ gtk_public_h_sources =		\
 	gtkcellrenderertextpixbuf.h	\
 	gtkcellrenderertoggle.h	\
 	gtkcellrendererpixbuf.h	\
-	gtkdata.h		\
 	gtkdebug.h		\
 	gtkdialog.h		\
 	gtkdnd.h		\
@@ -245,6 +254,7 @@ gtk_public_h_sources =		\
 	gtkhsv.h		\
 	gtkiconfactory.h	\
 	gtkimage.h		\
+	gtkimagemenuitem.h	\
 	gtkimcontext.h		\
 	gtkimmodule.h		\
 	gtkimmulticontext.h	\
@@ -265,14 +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		\
@@ -289,6 +297,7 @@ gtk_public_h_sources =		\
 	gtkscrolledwindow.h	\
 	gtkselection.h		\
 	gtkseparator.h		\
+	gtksettings.h		\
 	gtksignal.h		\
 	gtksocket.h		\
 	gtkspinbutton.h		\
@@ -312,10 +321,12 @@ gtk_public_h_sources =		\
 	gtktoolbar.h		\
 	gtktooltips.h		\
 	gtktree.h		\
+	gtktreednd.h		\
 	gtktreeitem.h		\
 	gtktreemodel.h		\
 	gtktreemodelsort.h	\
 	gtktreeselection.h	\
+	gtktreesortable.h	\
 	gtktreestore.h		\
 	gtktreeview.h		\
 	gtktreeviewcolumn.h	\
@@ -333,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		\
@@ -341,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	\
@@ -385,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:
@@ -448,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)