colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small configure.in and applet makefile cleanups

Browse Source 
- Consolidate Gnome/GTK deprecation defines
- Remove VERSION define from applet makefile, it's in config.h already


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2134 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2006-12-01 20:13:09 +00:00
parent 6edc3f81c8
commit fe19971638
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
configure.in
View File

@@ -14,6 +14,15 @@ AM_PROG_CC_C_O
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
dnl
dnl This doesn't depend on gnome support, only on gnome-common, autogen already
dnl uses gnome-autogen
dnl
GNOME_COMMON_INIT
GNOME_DEBUG_CHECK
GNOME_COMPILE_WARNINGS([maximum])
GNOME_MAINTAINER_MODE_DEFINES
dnl dnl
dnl Required headers dnl Required headers
dnl dnl

5
gnome/applet/Makefile.am
View File

@@ -24,11 +24,8 @@ nm_applet_CPPFLAGS = \
-DAUTOSTARTDIR=\""$(datadir)/gnome/autostart"\" \ -DAUTOSTARTDIR=\""$(datadir)/gnome/autostart"\" \
-DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\" \ -DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\" \
-DDBUS_API_SUBJECT_TO_CHANGE \ -DDBUS_API_SUBJECT_TO_CHANGE \
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DVERSION=\"$(VERSION)\" \ $(DISABLE_DEPRECATED) \
$(NULL) $(NULL)
if WITH_NOTIFY if WITH_NOTIFY